Merge pull request #7054 from illume/upstream-0054-secondary-theme-contrast