Theming improvements