Version 2.1 in progress - Preferences to switch themes