Optimization.
Fixed hot theme switching.