various theming fixes