theming and other updates