Theme implementation
fix