Rebuilt themes and other reorganizations