Theme simplification and reorganization
Typography cleanup and consolidation