[WIP] Simplifying CSS
#54, #56 General rewrite of the CSS code