Clean up of code & change of random colour

Random colour change now happens at every 5 seconds, logic was wrong before :)