Themes: Tweaks and code cleanup