Reworked Configuration Menus and Application Categary Menu.
Merge branch 'stable'