theme checker optimizations