Theming cleanup