Theme removal bug fix