Theme simplification and reorganization