diff --git a/data/menu.xml b/data/menu.xml
index 39da04d..31a9f08 100644
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -5,23 +5,15 @@
 <menu id="apps-accessories-menu" label="Accessories">
   <item label="Calculator">
     <action name="Execute">
-      <command>gnome-calculator</command>
+      <command>galculator</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="Character Map">
+  <item label="Xarchiver File Archiver">
     <action name="Execute">
-      <command>gnome-character-map</command>
-      <startupnotify>
-        <enabled>yes</enabled>
-      </startupnotify>
-    </action>
-  </item>
-  <item label="Ark File Archiver">
-    <action name="Execute">
-      <command>ark</command>
+      <command>xarchiver</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -48,25 +40,9 @@
       </startupnotify>
     </action>
   </item>
-  <item label="GEdit">
+  <item label="L3afpad">
     <action name="Execute">
-      <command>gedit</command>
-      <startupnotify>
-        <enabled>yes</enabled>
-      </startupnotify>
-    </action>
-  </item>
-  <item label="Kate">
-    <action name="Execute">
-      <command>kate</command>
-      <startupnotify>
-        <enabled>yes</enabled>
-      </startupnotify>
-    </action>
-  </item>
-  <item label="Kwrite">
-    <action name="Execute">
-      <command>kwrite</command>
+      <command>l3afpad</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -80,25 +56,17 @@
       <command>urxvt</command>
     </action>
   </item>
-  <item label="Gnome Terminal">
-    <action name="Execute">
-      <command>gnome-terminal</command>
-      <startupnotify>
-        <enabled>yes</enabled>
-      </startupnotify>
-    </action>
-  </item>
-  <item label="Xfce Terminal">
+  <item label="Sakura">
     <action name="Execute">
-      <command>xfce4-terminal</command>
+      <command>sakura</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="Konsole">
+  <item label="St">
     <action name="Execute">
-      <command>konsole</command>
+      <command>st</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -110,35 +78,27 @@
 </menu>
 
 <menu id="apps-net-menu" label="Internet">
-  <item label="Firefox">
+  <item label="Iceweasel-UXP">
     <action name="Execute">
-      <command>firefox</command>
+      <command>iceweasel-uxp</command>
       <startupnotify>
         <enabled>yes</enabled>
-        <wmclass>Firefox</wmclass>
+        <wmclass>Iceweasel-UXP</wmclass>
       </startupnotify>
     </action>
   </item>
-  <item label="Opera">
+  <item label="Surf">
     <action name="Execute">
-      <command>opera</command>
+      <command>surf</command>
       <startupnotify>
         <enabled>yes</enabled>
-        <wmclass>Opera</wmclass>
+        <wmclass>otter-browser</wmclass>
       </startupnotify>
     </action>
   </item>
-  <item label="Konqueror">
+  <item label="Bad Wolf">
     <action name="Execute">
-      <command>konqueror</command>
-      <startupnotify>
-        <enabled>yes</enabled>
-      </startupnotify>
-    </action>
-  </item>
-  <item label="Epiphany">
-    <action name="Execute">
-      <command>epiphany</command>
+      <command>badwolf</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -152,17 +112,17 @@
       </startupnotify>
     </action>
   </item>
-  <item label="Kopete Instant Messenger">
+  <item label="Pidgin Instant Messenger">
     <action name="Execute">
-      <command>kopete</command>
+      <command>pidgin</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="XChat">
+  <item label="Hexchat">
     <action name="Execute">
-      <command>xchat</command>
+      <command>hexchat</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -171,80 +131,75 @@
 </menu>
 
 <menu id="apps-office-menu" label="Office">
-  <item label="OpenOffice Base">
-    <action name="Execute">
-      <command>ooffice -base</command>
-    </action>
-  </item>
-  <item label="OpenOffice Calc">
+  <item label="LibreOffice Base">
     <action name="Execute">
-      <command>ooffice -calc</command>
+      <command>loffice --base</command>
     </action>
   </item>
-  <item label="OpenOffice Draw">
+  <item label="LibreOffice Calc">
     <action name="Execute">
-      <command>ooffice -draw</command>
+      <command>loffice --calc</command>
     </action>
   </item>
-  <item label="OpenOffice Impress">
+  <item label="LibreOffice Draw">
     <action name="Execute">
-      <command>ooffice -impress</command>
+      <command>loffice --draw</command>
     </action>
   </item>
-  <item label="OpenOffice Math">
+  <item label="LibreOffice Impress">
     <action name="Execute">
-      <command>ooffice -math</command>
+      <command>loffice --impress</command>
     </action>
   </item>
-  <item label="OpenOffice Printer Administration">
+  <item label="LibreOffice Math">
     <action name="Execute">
-      <command>ooffice-printeradmin</command>
+      <command>loffice --math</command>
     </action>
   </item>
-  <item label="OpenOffice Writer">
+  <item label="LibreOffice Writer">
     <action name="Execute">
-      <command>ooffice -writer</command>
+      <command>loffice --writer</command>
     </action>
   </item>
 </menu>
 
 <menu id="apps-multimedia-menu" label="Multimedia">
-  <item label="Amarok">
+  <item label="Audacious">
     <action name="Execute">
-      <command>amarok</command>
+      <command>audacious</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="Rhythmbox">
+  <item label="Deadbeef">
     <action name="Execute">
-      <command>rhythmbox</command>
+      <command>deadbeef</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="K3b">
+  <item label="MPlayer">
     <action name="Execute">
-      <command>k3b</command>
+      <command>mplayer</command>
       <startupnotify>
         <enabled>yes</enabled>
+        <wmclass>MPlayer</wmclass>
       </startupnotify>
     </action>
   </item>
-  <item label="MPlayer">
+  <item label="MPV">
     <action name="Execute">
-      <command>gmplayer</command>
+      <command>mpv</command>
       <startupnotify>
         <enabled>yes</enabled>
-        <wmclass>MPlayer</wmclass>
       </startupnotify>
     </action>
   </item>
-  <item label="Totem">
+  <item label="SMPlayer">
     <action name="Execute">
-      <command>totem</command>
+      <command>smplayer</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -253,25 +208,25 @@
 </menu>
 
 <menu id="apps-fileman-menu" label="File Managers">
-  <item label="Nautilus">
+  <item label="Xfe">
     <action name="Execute">
-      <command>nautilus --no-desktop --browser</command>
+      <command>xfe</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="Thunar">
+  <item label="Spacefm">
     <action name="Execute">
-      <command>Thunar</command>
+      <command>spacefm</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
     </action>
   </item>
-  <item label="KDE File Manager">
+  <item label="MC">
     <action name="Execute">
-      <command>kfmclient openURL ~</command>
+      <command>mc</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -286,9 +241,9 @@
       </startupnotify>
     </action>
   </item>
-  <item label="PCMan File Manager">
+  <item label="CliFM">
     <action name="Execute">
-      <command>pcmanfm</command>
+      <command>clifm</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -305,9 +260,9 @@
       </startupnotify>
     </action>
   </item>
-  <item label="Gwenview">
+  <item label="Krita">
     <action name="Execute">
-      <command>gwenview</command>
+      <command>krita</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -338,24 +293,6 @@
       <startupnotify><enabled>yes</enabled></startupnotify>
     </action>
   </item>
-  <item label="Gnome Control Center">
-    <action name="Execute">
-      <command>gnome-control-center</command>
-      <startupnotify><enabled>yes</enabled></startupnotify>
-    </action>
-  </item>
-  <item label="KDE Control Center">
-    <action name="Execute">
-      <command>kcontrol</command>
-      <startupnotify><enabled>yes</enabled></startupnotify>
-    </action>
-  </item>
-  <item label="Xfce Settings">
-    <action name="Execute">
-      <command>xfce-setting-show</command>
-      <startupnotify><enabled>yes</enabled></startupnotify>
-    </action>
-  </item>
   <item label="Manage Cups Printers">
     <action name="Execute">
       <command>xdg-open http://localhost:631/</command>
diff --git a/openbox/session.c b/openbox/session.c
index d6c6f76..8cc54d8 100644
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -659,7 +659,7 @@ static gboolean session_state_cmp(ObSessionState *s, ObClient *c)
                 !strcmp(s->class, c->class) &&
                 !strcmp(s->role, c->role) &&
                 /* the check for type is to catch broken clients, like
-                   firefox, which open a different window on startup
+                   iceweasel-uxp, which open a different window on startup
                    with the same info as the one we saved. only do this
                    check for old windows that dont use xsmp, others should
                    know better ! */
@@ -800,7 +800,7 @@ static void session_load_file(const gchar *path)
 
     /* Remove any duplicates.  This means that if two windows (or more) are
        saved with the same session state, we won't restore a session for any
-       of them because we don't know what window to put what on. AHEM FIREFOX.
+       of them because we don't know what window to put what on. AHEM ICEWEASEL-UXP.
 
        This is going to be an O(2^n) kind of operation unfortunately.
     */