WIP CSOL theming
Merge pull request #117 from mgballard/v2.0

[WIP] CSOL theming