Default theme cleanup and more