Fixes #6585
Merge pull request #6606 from dotCMS/issue-6585-changing-theme-designed-template

Fixes #6585
fixes #6599