Changed switch, added some more widgets and tweaked toolbars
Chnaged gkt 2 colours slightly to match Gtk 3