Theme saving fix