Lots of theming improvements