modified css theme
fixed merge conflicts