Finished the colour scheme and transitions