Add option to keep active theme