overhaul of theme
fix merge conflict