Colour changes and bug fixes