Reset theme when showing desktop
Cleaning up code