Fix theme behavior