Colours + Refactor