diff --git a/debian/changelog b/debian/changelog
index e90f456..ee724df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-lubuntu-default-settings (0.33) UNRELEASED; urgency=low
+lubuntu-default-settings (0.33) saucy; urgency=low
 
   * usr/share/lxpanel/Lubuntu
    - Enable xkb plugin by default for switching keyboard layout.
@@ -8,8 +8,12 @@ lubuntu-default-settings (0.33) UNRELEASED; urgency=low
    - Fix launch of razor-panel
   * etc/xdg/lubuntu/lightdm/lightdm-gtk-greeter.conf
    - Update with new upstream version. 
+  * /usr/share/lubuntu/openbox/*rc.xml
+   - lxsession-default lock instead of xscreensaver (LP: #1204052)
+  * etc/xdg/lxsession/*/conffiles.conf
+   - Fix terminal conffiles.
 
- -- Julien Lavergne <gilir@ubuntu.com>  Thu, 25 Jul 2013 23:55:16 +0200
+ -- Julien Lavergne <gilir@ubuntu.com>  Wed, 28 Aug 2013 22:51:39 +0200
 
 lubuntu-default-settings (0.32) saucy; urgency=low
 
diff --git a/usr/share/lubuntu/openbox/menu.xml b/usr/share/lubuntu/openbox/menu.xml
index ab902d2..2da9dac 100644
--- a/usr/share/lubuntu/openbox/menu.xml
+++ b/usr/share/lubuntu/openbox/menu.xml
@@ -5,7 +5,7 @@
 <menu id="apps-accessories-menu" label="Accessories">
   <item label="Calculator">
     <action name="Execute">
-      <command>lxsession-default calculator</command>
+      <command>galculator</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -13,7 +13,7 @@
   </item>
   <item label="Character Map">
     <action name="Execute">
-      <command>lxsession-default charmap</command>
+      <command>gucharmap</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -21,7 +21,7 @@
   </item>
   <item label="File Archiver">
     <action name="Execute">
-      <command>lxsession-default archive</command>
+      <command>file-roller</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -29,7 +29,7 @@
   </item>
   <item label="Leafpad">
     <action name="Execute">
-      <command>lxsession-default text-editor</command>
+      <command>leafpad</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -37,7 +37,7 @@
   </item>
   <item label="Image viewer">
     <action name="Execute">
-      <command>lxsession-default image-viewer</command>
+      <command>gpicview</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -45,7 +45,7 @@
   </item>
   <item label="Disk utility">
     <action name="Execute">
-      <command>lxsession-default disks-utlity</command>
+      <command>gnome-disks</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -53,7 +53,7 @@
   </item>
   <item label="Xpad">
     <action name="Execute">
-      <command>lxsession-default notes</command>
+      <command>xpad</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -64,7 +64,7 @@
 <menu id="apps-net-menu" label="Internet">
   <item label="Pidgin Instant Messenger">
     <action name="Execute">
-      <command>lxsession-default im1</command>
+      <command>pidgin</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -72,7 +72,7 @@
   </item>
   <item label="Sylpheed E-mail client">
     <action name="Execute">
-      <command>lxsession-default email</command>
+      <command>sylpheed</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -80,7 +80,7 @@
   </item>
   <item label="Transmission torrent client">
     <action name="Execute">
-      <command>lxsession-default bitorent</command>
+      <command>transmission-gtk</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -91,17 +91,17 @@
 <menu id="apps-office-menu" label="Office">
   <item label="Abiword">
     <action name="Execute">
-      <command>lxsession-default document</command>
+      <command>abiword</command>
     </action>
   </item>
   <item label="Gnumeric">
     <action name="Execute">
-      <command>lxsession-default spreadsheet</command>
+      <command>gnumeric</command>
     </action>
   </item>
   <item label="Evince">
     <action name="Execute">
-      <command>lxsession-default pdf</command>
+      <command>evince</command>
     </action>
   </item>
 </menu>
@@ -109,7 +109,7 @@
 <menu id="apps-multimedia-menu" label="Multimedia">
   <item label="Audacious">
     <action name="Execute">
-      <command>lxsession-default audio-viewer</command>
+      <command>audacious</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -117,7 +117,7 @@
   </item>
   <item label="Gnome-MPlayer">
     <action name="Execute">
-      <command>lxsession-default video-viewer</command>
+      <command>gnome-mplayer</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -125,7 +125,7 @@
   </item>
   <item label="Xfburn">
     <action name="Execute">
-      <command>lxsession-default burn</command>
+      <command>xfburn</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -133,7 +133,7 @@
   </item>
   <item label="Webcam">
     <action name="Execute">
-      <command>lxsession-default webcam</command>
+      <command>guvcview</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -144,13 +144,13 @@
 <menu id="system-menu" label="System">
   <item label="Desktop Settings">
     <action name="Execute">
-      <command>lxsession-default desktop settings</command>
+      <command>pcmanfm --desktop-pref</command>
       <startupnotify><enabled>yes</enabled></startupnotify>
     </action>
   </item>
   <item label="Openbox Configuration Manager">
     <action name="Execute">
-      <command>lxsession-default window-manager settings</command>
+      <command>obconf</command>
       <startupnotify><enabled>yes</enabled></startupnotify>
     </action>
   </item>
@@ -183,7 +183,7 @@
   </item>
   <item label="Internet" icon="/usr/share/icons/lubuntu/apps/48/apps/web-browser.svg">
     <action name="Execute">
-      <command>lxsession-default webbrowser</command>
+      <command>x-www-browser</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
diff --git a/usr/share/lubuntu/openbox/nexus-rc.xml b/usr/share/lubuntu/openbox/nexus-rc.xml
index cc45cc7..07cafc6 100644
--- a/usr/share/lubuntu/openbox/nexus-rc.xml
+++ b/usr/share/lubuntu/openbox/nexus-rc.xml
@@ -364,31 +364,31 @@
       <action name="Execute">
         <startupnotify>
           <enabled>true</enabled>
-          <name>Files manager</name>
+          <name>PCManFM</name>
         </startupnotify>
-        <command>lxsession-default filemanager</command>
+        <command>pcmanfm</command>
       </action>
     </keybind>
     <!-- Keybindings for running Run menu from Lxpanel on Home + R-->
     <keybind key="W-r">
       <action name="Execute">
-        <command>lxsession-default panel menu</command>
+        <command>lxpanelctl run</command>
       </action>
     </keybind>
     <keybind key="A-F2">
       <action name="Execute">
-        <command>lxsession-default launcher</command>
+        <command>lxpanelctl run</command>
       </action>
     </keybind>
     <!-- Keybindings for running Menu from Lxpanel -->
     <keybind key="A-F1">
       <action name="Execute">
-        <command>lxsession-default panel menu</command>
+        <command>lxpanelctl menu</command>
       </action>
     </keybind>
     <keybind key="C-Escape">
       <action name="Execute">
-        <command>lxsession-default panel menu</command>
+        <command>lxpanelctl menu</command>
       </action>
     </keybind>
     <!-- Keybindings to toggle fullscreen -->
@@ -398,13 +398,13 @@
     <!-- Launch task manager on Ctrl + Alt + Del-->
     <keybind key="C-A-Delete">
       <action name="Execute">
-        <command>lxsession-default tasks</command>
+        <command>lxtask</command>
       </action>
     </keybind>
     <!-- Launch a terminal on Ctrl + Alt + T-->
     <keybind key="C-A-T">
       <action name="Execute">
-        <command>lxsession-default-terminal</command>
+        <command>x-terminal-emulator</command>
       </action>
     </keybind>
     <!-- Launch a filemanager on Ctrl + Alt + D-->
@@ -412,15 +412,15 @@
       <action name="Execute">
         <startupnotify>
           <enabled>true</enabled>
-          <name>Files manager</name>
+          <name>PCManFM</name>
         </startupnotify>
-        <command>lxsession-default filemanager</command>
+        <command>pcmanfm</command>
       </action>
     </keybind>
     <!-- Lock the screen on Ctrl + Alt + l-->
     <keybind key="C-A-l">
       <action name="Execute">
-        <command>lxsession-default lock</command>
+        <command>xscreensaver-command -lock</command>
       </action>
     </keybind>
     <!-- Keybinding for Volume management -->
@@ -442,24 +442,24 @@
     <!-- Keybinding for terminal button-->
     <keybind key="XF86WWW">
       <action name="Execute">
-        <command>lxsession-default-terminal</command>
+        <command>x-terminal-emulator</command>
       </action>
     </keybind>
     <keybind key="XF86Terminal">
       <action name="Execute">
-        <command>lxsession-default-terminal</command>
+        <command>x-terminal-emulator</command>
       </action>
     </keybind>
     <!-- Keybinding for calculator button-->
     <keybind key="XF86Calculator">
       <action name="Execute">
-        <command>lxsession-default calculator</command>
+        <command>galculator</command>
       </action>
     </keybind>
     <!-- Keybinding for computer button-->
     <keybind key="XF86MyComputer">
       <action name="Execute">
-        <command>lxsession-default filemanager</command>
+        <command>pcmanfm</command>
       </action>
     </keybind>
     <!-- Keybindings for Multimedia Keys and LCD Backlight (alternative when not using gnome-power-manager or xfce4-volumed) -->
@@ -481,13 +481,13 @@
     <!-- Launch scrot when Print is pressed -->
     <keybind key="Print">
       <action name="Execute">
-        <command>lxsession-default screenshot</command>
+        <command>scrot</command>
       </action>
     </keybind>
     <!-- Launch logout when push on the shutdown button -->
     <keybind key="XF86PowerOff">
       <action name="Execute">
-        <command>lxsession-default quit</command>
+        <command>lubuntu-logout</command>
       </action>
     </keybind>
   </keyboard>
diff --git a/usr/share/lubuntu/openbox/rc.xml b/usr/share/lubuntu/openbox/rc.xml
index 015d2f4..59b4457 100644
--- a/usr/share/lubuntu/openbox/rc.xml
+++ b/usr/share/lubuntu/openbox/rc.xml
@@ -364,31 +364,31 @@
       <action name="Execute">
         <startupnotify>
           <enabled>true</enabled>
-          <name>Files manager</name>
+          <name>PCManFM</name>
         </startupnotify>
-        <command>lxsession-default filemanager</command>
+        <command>pcmanfm</command>
       </action>
     </keybind>
     <!-- Keybindings for running Run menu from Lxpanel on Home + R-->
     <keybind key="W-r">
       <action name="Execute">
-        <command>lxsession-default launcher</command>
+        <command>lxpanelctl run</command>
       </action>
     </keybind>
     <keybind key="A-F2">
       <action name="Execute">
-        <command>lxsession-default launcher</command>
+        <command>lxpanelctl run</command>
       </action>
     </keybind>
     <!-- Keybindings for running Menu from Lxpanel -->
     <keybind key="A-F1">
       <action name="Execute">
-        <command>lxsession-default panel menu</command>
+        <command>lxpanelctl menu</command>
       </action>
     </keybind>
     <keybind key="C-Escape">
       <action name="Execute">
-        <command>lxsession-default panel menu</command>
+        <command>lxpanelctl menu</command>
       </action>
     </keybind>
     <!-- Keybindings to toggle fullscreen -->
@@ -398,7 +398,7 @@
     <!-- Launch task manager on Ctrl + Alt + Del-->
     <keybind key="C-A-Delete">
       <action name="Execute">
-        <command>lxsession-default tasks</command>
+        <command>lxtask</command>
       </action>
     </keybind>
     <!-- Launch a terminal on Ctrl + Alt + T-->
@@ -412,15 +412,15 @@
       <action name="Execute">
         <startupnotify>
           <enabled>true</enabled>
-          <name>Files manager</name>
+          <name>PCManFM</name>
         </startupnotify>
-        <command>lxsession-default filemanager</command>
+        <command>pcmanfm</command>
       </action>
     </keybind>
     <!-- Lock the screen on Ctrl + Alt + l-->
     <keybind key="C-A-l">
       <action name="Execute">
-        <command>lxsession-default lock</command>
+        <command>xscreensaver-command -lock</command>
       </action>
     </keybind>
     <!-- Keybinding for Volume management -->
@@ -453,13 +453,13 @@
     <!-- Keybinding for calculator button-->
     <keybind key="XF86Calculator">
       <action name="Execute">
-        <command>lxsession-default calculator</command>
+        <command>galculator</command>
       </action>
     </keybind>
     <!-- Keybinding for computer button-->
     <keybind key="XF86MyComputer">
       <action name="Execute">
-        <command>lxsession-default filemanager</command>
+        <command>pcmanfm</command>
       </action>
     </keybind>
     <!-- Keybindings for Multimedia Keys and LCD Backlight (alternative when not using gnome-power-manager or xfce4-volumed) -->