Code cleanup and turn-on auto-switcher for moe-theme.