Move theme selection to separate menu