Simplified branch specific theming selectors, added default theme