bug fix with themes