Colour changes and added more devices