Merge pull request #25786 from prssanna/website-theme-fixes