changed theme colours to be handled as a ressource
(to make it work in a jar---but still not working)
Merge remote-tracking branch 'origin/master'