update sort menu so current sort replaces 'sort' label
Merge remote-tracking branch 'theme-globals/master'