2 files changed, 23 insertions, 21 deletions

diff --git a/data/init.in b/data/init.in
index 60c5a52..e98d3b0 100644
--- a/data/init.in
+++ b/data/init.in
@@ -1,7 +1,7 @@
-! If you're looking for settings to configure, they won't be saved here until
-! you change something in the fluxbox configuration menu.
+-- If you're looking for settings to configure, they won't be saved here until
+-- you change something in the fluxbox configuration menu.
 
-session.menuFile:       ~/.@pkgprefix@fluxbox@pkgsuffix@/menu
-session.keyFile: ~/.@pkgprefix@fluxbox@pkgsuffix@/keys
-session.styleFile: @default_style@
-session.configVersion:  13
+session.menuFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/menu2'
+session.keyFile = '~/.@pkgprefix@fluxbox@pkgsuffix@/keys'
+session.styleFile = '@default_style@'
+session.configVersion = 14
diff --git a/data/windowmenu b/data/windowmenu
index d867b64..fd779f6 100644
--- a/data/windowmenu
+++ b/data/windowmenu
@@ -1,15 +1,17 @@
-[begin]
-  [shade]
-  [stick]
-  [maximize]
-  [iconify]
-  [raise]
-  [lower]
-  [settitledialog]
-  [sendto]
-  [layer]
-  [alpha]
-  [extramenus]
-  [separator]
-  [close]
-[end]
+return {
+    type = "menu";
+
+    { type = "shade" };
+    { type = "stick" };
+    { type = "maximize" };
+    { type = "iconify" };
+    { type = "raise" };
+    { type = "lower" };
+    { type = "settitledialog" };
+    { type = "sendto" };
+    { type = "layer" };
+    { type = "alpha" };
+    { type = "extramenus" };
+    { type = "separator" };
+    { type = "close" };
+}