Update theme, tweak templates to match