Theme bug fix