added more experimental theme change logic