Optimized theme structure