theming improvements