Tweaks to theme, more work on post 3