theme bug fix