Speed improvements
Optimized theme loading