fix issue with themes