Make theme selection sticky