changed theme name
fixed merge conflicts