Fix themes compatibility stuff