ThemeDialog fix