diff -uNr ion-3ds-20061029.orig/etc/cfg_ioncore.lua ion-3ds-20061029/etc/cfg_ioncore.lua
--- ion-3ds-20061029.orig/etc/cfg_ioncore.lua	2006-12-14 17:08:00 +0300
+++ ion-3ds-20061029/etc/cfg_ioncore.lua	2006-12-14 17:07:54 +0300
@@ -63,8 +63,8 @@
     kpress(META.."F9", "ioncore.create_ws(_)"),
     
     bdoc("Display the main menu."),
-    kpress(ALTMETA.."F12", "mod_query.query_menu(_, 'mainmenu', 'Main menu: ')"),
-    --kpress(ALTMETA.."F12", "mod_menu.menu(_, _sub, 'mainmenu', {big=true})"),
+    --kpress(ALTMETA.."F12", "mod_query.query_menu(_, 'mainmenu', 'Main menu: ')"),
+    kpress(ALTMETA.."F12", "mod_menu.menu(_, _sub, 'mainmenu', {big=false})"),
     mpress("Button3", "mod_menu.pmenu(_, _sub, 'mainmenu')"),
     
     bdoc("Display the window list menu."),
@@ -317,7 +317,6 @@
 -- Menu definitions
 --
 
-
 -- Main menu
 defmenu("mainmenu", {
     submenu("Programs",         "appmenu"),
@@ -328,7 +327,14 @@
     submenu("Session",          "sessionmenu"),
 })
 
+-- User menu
+if dopath("cfg_usermenu", "false") and usermenu then
+    for i = 1, #usermenu, 1 do
+	table.insert(ioncore.getmenu("mainmenu"), i, usermenu[i])
+    end
+end
 
+if not dopath("cfg_appmenu", "false") then
 -- Application menu
 defmenu("appmenu", {
     menuentry("XTerm",          "ioncore.exec_on(_, 'xterm')"),
@@ -340,7 +346,7 @@
     menuentry("Dillo",          "ioncore.exec_on(_, 'dillo')"),
     menuentry("Run...",         "mod_query.query_exec(_)"),
 })
-
+end
 
 -- Session control menu
 defmenu("sessionmenu", {