Improved theme select/go back feature