-Add more cases where current theme should not be cloned