Theming support added for PB & Switch
Removed bs vars
4r83.14
Merge branches 'master' and 'recover'