* More refactoring

* Put the colour options in a seperate menu