Disable themes for GUI as well
Clean Up Some