electric window

ok i baught a universal window kit of ebay. to convert my manual windows to electric.  so i have looked round for a wireing diagram/pinout for the OEM window switches. and have found one.

so ive got it all wound up and installed and i test them pop the fuse goes and i realise ive been a tit and tryed to take the feed from where i took my central locking feed from and the fuse is only rated for 15 amp not 30. so i swap the live feed over to the line direct from teh battery that my amp takes.

so its all working and i test it yep the windows go up and down and down and up. turn my sterio on as im putting it all together and test the windows once more with the stereo on and the fuse pops so im like what now.

now i relaise that my amp wants to draw 30A and so does my electric windows. so i pop downt the road and buy a distroblock and a bigger fuse ( bad mistake)

so i now have a 60 A fuse supplying my amp and electric windows its all working so i forget abotu ti till yeasterday.

i goto drive my car and i get to where im going im just leaving so i goto wind my windows down and smoke starts comeing form the dash so im like doodie. pop the bonnet and disconect the fuse. then procede to rip apart the dash where my wireing was and remove as much as posible.

both my power and ground wires had melted together and shorted they had also started melting into my central locking wires so i pulled the fuse on my central locking just incase.

this is the wireing i used for the switches.

[IMG]https://i6.photobucket.com/albums/y242/warrmr/noggin.jpg[/IMG]

am i right in saying i should have done this

battery

60A fuse

distro

30A to amp and 30A to windows.