Updated the css and theming layer
Add merge