various theming amends