Enhance defaultTheme style