menu-matches and menu-groups style changed
merging with remote