Updated again.
Forks are now Manitou Splices.
Hayes MX2 cable disc on the front.
Handlebars are Easton EA30.
Woodman stem (possibly putting the Raceface back on)
Next to change:
Changing the DX levers and V-brake for edit: XT levers (black and silver) and a Cane Creek Direct Curve 3 (black).
And I know the front brake cable in the 1st pic isn't attached but in the 2nd pic it's a new Jagwire silver braided cable outer. The rear one will match when I change the brake over.