New theme

Merge to get the new simplified theme.