Improved theming engine headers