Themes bug fix.