Fix other themes