Cpu fan wires messed up (no fan control)

Hi,
i have an hp dx2200 MT with a changed stock fan and the wires are connected by hand and i don't think they are connected right cuz when my CPU overheats (70C) the case fan goes crazy (about 4k/rpm) but the CPU fan stays at ~2k/rpm although before the change it was going faster then usual when overheating too but now i can't even change the speed manualy so heres a picture were it shows current situation and if u know what should i change to make it work properly please post the answer here i would be very,very thankful,

THE Picture#1: http://www.part.lt/perziura/e293d8c24a9cf0daa27d1b57d05...
THE Picture#2: http://www.part.lt/perziura/f966f6ba4c67cb670aad4909d2a...
THE Picture#3: http://www.part.lt/perziura/e6fd37805f592fb63552ca9d723...
THE Picture in words:Fan has 4 wires(black,red,yellow and blackyellow) they are connected to the pin that is connected to the motherboard the pin also has 4 wires(green,blue,black and yellow) and the wires are connected in this order(from fan to pin)black-black,red-yellow,yellow-green and yellowblack-blue.

Thank You,

J.K.

P.s

PC Spec:

Hp dx2200 MT
Ati Xpress 200 Chipset
Intel Pentium 4 HT 524 3.06Ghz
1.5Gb RAm pc2-5300 667Mhz
Nvidia Sparkle Gt220 1GB vRam
160Gb samsung HDD SATA 3.5`