GPII-162: Reworked focus on prefs for themes