trying to fix more themes