theme-related changes