Improvements to Sol and Luna themes

Hey @bling

I have made some changes to to improve the colour highlights, have a look and feel free to merge them !

Thanks ! :smile: