Added extra check of theme is enabled/disabled