ThemeResource, more design-time, build changes