Updated default colours.
Tidied up the code a bit.