Refactor out branding servlet from red hat theme and refactor how the theme enables branding