Tweaks to make theme work