Issue #1829308 by aspilicious: Convert variables in menu.inc to config and state.
Merge pull request #359 from hellomrcat/170-menu

Issue #1829308 by aspilicious: Convert variables in menu.inc to config and state.