Integrates changes to theme handling
Merge branch 'themeUpdate'