Revert theme chooser etc. back to jb-mr2