Improve colours in light theme - #22