Add option to keep active theme

I also removed trailing spaces and tabs....