diff --git a/freedesktop b/freedesktop
index a81d6bd..76da498 160000
--- a/freedesktop
+++ b/freedesktop
@@ -1 +1 @@
-Subproject commit a81d6bdc7da07b9a7bfb9012fc9ebcb6bb893076
+Subproject commit 76da49886064f1df87b30f9fe969af9704745132
diff --git a/lain b/lain
index fdb6e41..d5fb632 160000
--- a/lain
+++ b/lain
@@ -1 +1 @@
-Subproject commit fdb6e412a05acae3f4ad92f5f21a821c6f69a6a7
+Subproject commit d5fb6326d2e48d7a1b00d8acf9e37f9174322bb2
diff --git a/rc.lua.blackburn b/rc.lua.blackburn
index df07ec0..974c9f3 100644
--- a/rc.lua.blackburn
+++ b/rc.lua.blackburn
@@ -15,6 +15,7 @@ local beautiful     = require("beautiful")
 local naughty       = require("naughty")
 local lain          = require("lain")
 --local menubar       = require("menubar")
+local freedesktop   = require"(freedesktop")
 local hotkeys_popup = require("awful.hotkeys_popup").widget
 -- }}}
 
@@ -105,11 +106,14 @@ myawesomemenu = {
     { "restart", awesome.restart },
     { "quit", function() awesome.quit() end }
 }
-mymainmenu = awful.menu({
-    items = {
-        { "awesome", myawesomemenu, beautiful.awesome_icon },
-        { "applications", require("freedesktop").menu.build() },
-        { "open terminal", terminal },
+mymainmenu = freedesktop.menu.build({
+    before = {
+        { "Awesome", myawesomemenu, beautiful.awesome_icon },
+        -- other triads can be put here
+    },
+    after = {
+        { "Open terminal", terminal },
+        -- other triads can be put here
     }
 })
 --menubar.utils.terminal = terminal -- Set the Menubar terminal for applications that require it
diff --git a/rc.lua.copland b/rc.lua.copland
index 9fe7ff5..d2edc83 100644
--- a/rc.lua.copland
+++ b/rc.lua.copland
@@ -17,6 +17,7 @@ local lain          = require("lain")
 local eminent       = require("eminent")
 local shape         = require("gears.shape")
 --local menubar       = require("menubar")
+local freedesktop   = require("freedesktop")
 local hotkeys_popup = require("awful.hotkeys_popup").widget
 -- }}}
 
@@ -107,11 +108,14 @@ myawesomemenu = {
     { "restart", awesome.restart },
     { "quit", function() awesome.quit() end }
 }
-mymainmenu = awful.menu({
-    items = {
-        { "awesome", myawesomemenu, beautiful.awesome_icon },
-        { "applications", require("freedesktop").menu.build() },
-        { "open terminal", terminal },
+mymainmenu = freedesktop.menu.build({
+    before = {
+        { "Awesome", myawesomemenu, beautiful.awesome_icon },
+        -- other triads can be put here
+    },
+    after = {
+        { "Open terminal", terminal },
+        -- other triads can be put here
     }
 })
 --menubar.utils.terminal = terminal -- Set the Menubar terminal for applications that require it
diff --git a/rc.lua.dremora b/rc.lua.dremora
index 152f6ce..732c9a1 100644
--- a/rc.lua.dremora
+++ b/rc.lua.dremora
@@ -15,6 +15,7 @@ local beautiful     = require("beautiful")
 local naughty       = require("naughty")
 local lain          = require("lain")
 --local menubar       = require("menubar")
+local freedesktop   = require("freedesktop")
 local hotkeys_popup = require("awful.hotkeys_popup").widget
 -- }}}
 
@@ -105,11 +106,14 @@ myawesomemenu = {
     { "restart", awesome.restart },
     { "quit", function() awesome.quit() end }
 }
-mymainmenu = awful.menu({
-    items = {
-        { "awesome", myawesomemenu, beautiful.awesome_icon },
-        { "applications", require("freedesktop").menu.build() },
-        { "open terminal", terminal },
+mymainmenu = freedesktop.menu.build({
+    before = {
+        { "Awesome", myawesomemenu, beautiful.awesome_icon },
+        -- other triads can be put here
+    },
+    after = {
+        { "Open terminal", terminal },
+        -- other triads can be put here
     }
 })
 --menubar.utils.terminal = terminal -- Set the Menubar terminal for applications that require it
diff --git a/rc.lua.multicolor b/rc.lua.multicolor
index 4fbbb39..f170b46 100644
--- a/rc.lua.multicolor
+++ b/rc.lua.multicolor
@@ -15,6 +15,7 @@ local beautiful     = require("beautiful")
 local naughty       = require("naughty")
 local lain          = require("lain")
 --local menubar       = require("menubar")
+local freedesktop   = require("freedesktop")
 local hotkeys_popup = require("awful.hotkeys_popup").widget
 -- }}}
 
@@ -105,11 +106,14 @@ myawesomemenu = {
     { "restart", awesome.restart },
     { "quit", function() awesome.quit() end }
 }
-mymainmenu = awful.menu({
-    items = {
-        { "awesome", myawesomemenu, beautiful.awesome_icon },
-        { "applications", require("freedesktop").menu.build() },
-        { "open terminal", terminal },
+mymainmenu = freedesktop.menu.build({
+    before = {
+        { "Awesome", myawesomemenu, beautiful.awesome_icon },
+        -- other triads can be put here
+    },
+    after = {
+        { "Open terminal", terminal },
+        -- other triads can be put here
     }
 })
 --menubar.utils.terminal = terminal -- Set the Menubar terminal for applications that require it