prepare for grammar selector feature with naming distinction
fix menu toggles