theme-related fixes