diff --git a/.mlvwm/MenuBar b/.mlvwm/MenuBar
index 977c1a4..f1191e9 100644
--- a/.mlvwm/MenuBar
+++ b/.mlvwm/MenuBar
@@ -1,4 +1,4 @@
-Menu def-File, Label "File", Left
+Menu Default-File, Label "File", Left
 "New Folder" NonSelect, Gray, Action Nop
 "Open" NonSelect, Gray, Action Nop
 "Print" NonSelect, Gray, Action Nop
@@ -14,7 +14,7 @@ Menu def-File, Label "File", Left
 "Print Desktop..." NonSelect, Gray, Action Nop
 END
 
-Menu def-Edit, Label "Edit"
+Menu Default-Edit, Label "Edit"
 "Undo" NonSelect, Gray, Action Nop
 "" NonSelect
 "Cut" NonSelect, Gray
@@ -26,7 +26,7 @@ Menu def-Edit, Label "Edit"
 "Show Clipboard" NonSelect, Gray
 END
 
-Menu def-View, Label "View"
+Menu Default-View, Label "View"
 "by Small Icon" NonSelect, Gray
 "by Icon" NonSelect, Gray
 "by Name" NonSelect, Gray
@@ -36,7 +36,7 @@ Menu def-View, Label "View"
 "by Version" NonSelect, Gray
 END
 
-Menu def-Label, Label "Label"
+Menu Default-Label, Label "Label"
 "None" NonSelect, Gray
 "" NonSelect
 "Essential" NonSelect, Gray
@@ -53,7 +53,7 @@ Menu restart-sub
 "Start fvwm" Action Restart fvwm
 END
 
-Menu def-Special, Label "Special"
+Menu Default-Special, Label "Special"
 "Clean Up Desktop" Action Refresh
 "Empty Trash" NonSelect, Gray
 "" NonSelect
@@ -65,7 +65,7 @@ Menu def-Special, Label "Special"
 "Shut down" Action Exit
 END
 
-Menu def-Window
+Menu Default-Window
 "Move" Action MoveWindow
 "Resize" Action ResizeWindow
 "Toggle Scroll" Action ToggleScroll
@@ -75,12 +75,12 @@ END
 
 # Definition MenuBar
 MenuBar default
-def-File
-def-Edit
-def-View
-def-Label
-def-Special
-def-Window
+Default-File
+Default-Edit
+Default-View
+Default-Label
+Default-Special
+Default-Window
 END
 
 # Menu Extras
diff --git a/.mlvwm/apps/BasiliskII b/.mlvwm/apps/BasiliskII
index 71f459b..7d5c155 100644
--- a/.mlvwm/apps/BasiliskII
+++ b/.mlvwm/apps/BasiliskII
@@ -3,7 +3,7 @@ END
 
 MenuBar BasiliskII
 BasiliskII-File
-def-Edit
+Default-Edit
 END
 
 Style
diff --git a/.mlvwm/apps/chrome b/.mlvwm/apps/chrome
index d7c8b09..98a00ab 100644
--- a/.mlvwm/apps/chrome
+++ b/.mlvwm/apps/chrome
@@ -50,7 +50,7 @@ END
 
 MenuBar Chrome
 Chrome-File
-def-Edit
+Default-Edit
 Chrome-View
 Chrome-History
 Chrome-Bookmarks
diff --git a/.mlvwm/apps/meld b/.mlvwm/apps/meld
index 5809a91..8ddd9d7 100644
--- a/.mlvwm/apps/meld
+++ b/.mlvwm/apps/meld
@@ -20,7 +20,7 @@ END
 
 MenuBar Meld
 Meld-File
-def-Edit
+Default-Edit
 Meld-Changes
 Meld-View
 END
diff --git a/.mlvwm/apps/retroarch b/.mlvwm/apps/retroarch
index ae7288c..882f6bd 100644
--- a/.mlvwm/apps/retroarch
+++ b/.mlvwm/apps/retroarch
@@ -4,7 +4,7 @@ END
 
 MenuBar RetroArch
 RetroArch-File
-def-Edit
+Default-Edit
 END
 
 Style
diff --git a/.mlvwm/apps/scummvm b/.mlvwm/apps/scummvm
index 94d3afe..956af03 100644
--- a/.mlvwm/apps/scummvm
+++ b/.mlvwm/apps/scummvm
@@ -21,7 +21,7 @@ END
 
 MenuBar ScummVM
 ScummVM-File
-def-Edit
+Default-Edit
 ScummVM-View
 ScummVM-Audio
 END
diff --git a/.mlvwm/apps/vlc b/.mlvwm/apps/vlc
index 69c17d8..a46d1ee 100644
--- a/.mlvwm/apps/vlc
+++ b/.mlvwm/apps/vlc
@@ -33,7 +33,7 @@ END
 
 MenuBar VLC
 VLC-File
-def-Edit
+Default-Edit
 VLC-Playback
 VLC-Tools
 END
diff --git a/.mlvwm/apps/xcalc b/.mlvwm/apps/xcalc
index e48535a..ad35327 100644
--- a/.mlvwm/apps/xcalc
+++ b/.mlvwm/apps/xcalc
@@ -3,7 +3,7 @@ END
 
 MenuBar Xcalc
 Xcalc-File
-def-Edit
+Default-Edit
 END
 
 Style
diff --git a/.mlvwm/apps/xmag b/.mlvwm/apps/xmag
index db372b1..709720c 100644
--- a/.mlvwm/apps/xmag
+++ b/.mlvwm/apps/xmag
@@ -4,7 +4,7 @@ END
 
 MenuBar xmag
 xmag-file
-def-Edit
+Default-Edit
 END
 
 Style
diff --git a/.mlvwm/apps/xterm b/.mlvwm/apps/xterm
index c45f944..dbdf320 100644
--- a/.mlvwm/apps/xterm
+++ b/.mlvwm/apps/xterm
@@ -6,7 +6,7 @@ END
 
 MenuBar xterm
 xterm-file
-def-Edit
+Default-Edit
 END
 
 Style