Merged custom and theme css in theme.css and add comments for every section