Added ColourPropertyComponent and some bugfixes