Some renaming
Colour picker update