bug fix to ensure theme layout name change is safe