Update cmb
Couple methods to help clean up theme switcher and add inline comments for stated switcher goals