fix for themes