Fixed the code that was lost somewhere

Needs @diamantlefou to go through and make pretty again though. The colours are all wrong IIRC.