Changed color scheme and tidied up the color section