Moved all branding into core config
Merged debranding changes