Fold & Unfold bug resolved for themes hierarchy