diff --git a/etc/xdg/lubuntu/libfm/libfm.conf b/etc/xdg/lubuntu/libfm/libfm.conf
index 0c5ebb1..3476119 100644
--- a/etc/xdg/lubuntu/libfm/libfm.conf
+++ b/etc/xdg/lubuntu/libfm/libfm.conf
@@ -16,7 +16,7 @@ template_type_once=0
 auto_selection_delay=600
 drop_default_action=0
 show_internal_volumes=0
-terminal=lubuntu-default terminal %s
+terminal=lubuntu-default-terminal %s
 thumbnail_local=1
 thumbnail_max=2048
 
diff --git a/etc/xdg/lxsession/LX-Games/desktop.conf b/etc/xdg/lxsession/LX-Games/desktop.conf
index 5ba41f7..067553d 100644
--- a/etc/xdg/lxsession/LX-Games/desktop.conf
+++ b/etc/xdg/lxsession/LX-Games/desktop.conf
@@ -1,25 +1,25 @@
 [Session]
-window_manager/program=openbox
-window_manager/session=Lubuntu
-window_manager/extras=
+windows_manager/command=openbox
+windows_manager/session=Lubuntu
+windows_manager/extras=
 
 panel/program=lxpanel
 panel/session=Lubuntu
 
-screensaver/program=
+screensaver/command=
 
-power-manager/program=auto
+power_manager/command=auto
 
-file-manager/program=pcmanfm
-file-manager/session=lubuntu
-file-manager/extras=
+file_manager/command=pcmanfm
+file_manager/session=lubuntu
+file_manager/extras=
 
-desktop-manager/command=lxlauncher
-desktop-manager/wallpaper=
+desktop_manager/command=lxlauncher
+desktop_manager/wallpaper=
 
-polkit=lxpolkit
+polkit/command=lxpolkit
 
-network_gui=auto
+network_gui/command=auto
 
 audio_manager=alsamixer
 
diff --git a/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf b/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
index fcd0591..46de0bc 100644
--- a/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
+++ b/etc/xdg/lxsession/Lubuntu-Netbook/desktop.conf
@@ -1,25 +1,25 @@
 [Session]
-window_manager/program=openbox
-window_manager/session=Lubuntu
-window_manager/extras=
+windows_manager/command=openbox
+windows_manager/session=Lubuntu
+windows_manager/extras=
 
 panel/program=lxpanel
 panel/session=Lubuntu
 
-screensaver/program=
+screensaver/command=
 
-power-manager/program=auto
+power_manager/command=auto
 
-file-manager/program=pcmanfm
-file-manager/session=lubuntu
-file-manager/extras=
+file_manager/command=pcmanfm
+file_manager/session=lubuntu
+file_manager/extras=
 
-desktop-manager/command=lxlauncher
-desktop-manager/wallpaper=
+desktop_manager/command=lxlauncher
+desktop_manager/wallpaper=
 
-polkit=lxpolkit
+polkit/command=lxpolkit
 
-network_gui=auto
+network_gui/command=auto
 
 audio_manager=alsamixer
 
diff --git a/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf b/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf
index d7b07c1..4ed652f 100644
--- a/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf
+++ b/etc/xdg/lxsession/Lubuntu-Nexus7/desktop.conf
@@ -1,25 +1,25 @@
 [Session]
-window_manager/program=openbox
-window_manager/session=Lubuntu
-window_manager/extras=
+windows_manager/command=openbox
+windows_manager/session=Lubuntu
+windows_manager/extras=
 
 panel/program=lxpanel
 panel/session=Lubuntu-Nexus7
 
-screensaver/program=
+screensaver/command=
 
-power-manager/program=auto
+power_manager/command=auto
 
-file-manager/program=pcmanfm
-file-manager/session=lubuntu
-file-manager/extras=
+file_manager/command=pcmanfm
+file_manager/session=lubuntu
+file_manager/extras=
 
-desktop-manager/command=lxlauncher
-desktop-manager/wallpaper=
+desktop_manager/command=lxlauncher
+desktop_manager/wallpaper=
 
-polkit=lxpolkit
+polkit/command=lxpolkit
 
-network_gui=auto
+network_gui/command=auto
 
 audio_manager=alsamixer
 
diff --git a/etc/xdg/lxsession/Lubuntu/desktop.conf b/etc/xdg/lxsession/Lubuntu/desktop.conf
index 6385f0e..e415a17 100644
--- a/etc/xdg/lxsession/Lubuntu/desktop.conf
+++ b/etc/xdg/lxsession/Lubuntu/desktop.conf
@@ -1,25 +1,25 @@
 [Session]
-window_manager/program=openbox
-window_manager/session=Lubuntu
-window_manager/extras=
+windows_manager/command=openbox
+windows_manager/session=Lubuntu
+windows_manager/extras=
 
 panel/program=lxpanel
 panel/session=Lubuntu
 
-screensaver/program=
+screensaver/command=
 
-power-manager/program=auto
+power_manager/command=auto
 
-file-manager/program=pcmanfm
-file-manager/session=lubuntu
-file-manager/extras=
+file_manager/command=pcmanfm
+file_manager/session=lubuntu
+file_manager/extras=
 
-desktop-manager/command=filemanager
-desktop-manager/wallpaper=
+desktop_manager/command=filemanager
+desktop_manager/wallpaper=
 
-polkit=lxpolkit
+polkit/command=lxpolkit
 
-network_gui=auto
+network_gui/command=auto
 
 audio_manager=alsamixer
 
diff --git a/etc/xdg/lxsession/QLubuntu/desktop.conf b/etc/xdg/lxsession/QLubuntu/desktop.conf
index 664dc06..9e29660 100644
--- a/etc/xdg/lxsession/QLubuntu/desktop.conf
+++ b/etc/xdg/lxsession/QLubuntu/desktop.conf
@@ -1,25 +1,25 @@
 [Session]
-window_manager/program=openbox
-window_manager/session=Lubuntu
-window_manager/extras=
+windows_manager/command=openbox
+windows_manager/session=Lubuntu
+windows_manager/extras=
 
 panel/program=qtpanel
 panel/session=
 
-screensaver/program=
+screensaver/command=
 
-power-manager/program=auto
+power_manager/command=auto
 
-file-manager/program=pcmanfm
-file-manager/session=lubuntu
-file-manager/extras=
+file_manager/command=pcmanfm
+file_manager/session=lubuntu
+file_manager/extras=
 
-desktop-manager/command=lxlauncher
-desktop-manager/wallpaper=
+desktop_manager/command=lxlauncher
+desktop_manager/wallpaper=
 
-polkit=razor-policykit-agent
+polkit/command=razor-policykit-agent
 
-network_gui=auto
+network_gui/command=auto
 
 audio_manager=alsamixer
 
diff --git a/usr/share/lubuntu/openbox/menu.xml b/usr/share/lubuntu/openbox/menu.xml
index 129464a..886d8c7 100644
--- a/usr/share/lubuntu/openbox/menu.xml
+++ b/usr/share/lubuntu/openbox/menu.xml
@@ -167,7 +167,7 @@
   <separator label="Shortcuts" />
   <item label="PCMan File Manager" icon="/usr/share/icons/gnome/48x48/apps/system-file-manager.png">
     <action name="Execute">
-      <command>pcmanfm</command>
+      <command>lxsession-default filemanager</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>