diff -pruN 0.5.0-4/debian/changelog 0.5.0-4ubuntu3/debian/changelog
--- 0.5.0-4/debian/changelog	2010-06-02 06:59:43.000000000 +0100
+++ 0.5.0-4ubuntu3/debian/changelog	2011-04-04 20:13:53.000000000 +0100
@@ -1,3 +1,36 @@
+lxde-common (0.5.0-4ubuntu3) natty; urgency=low
+
+  * debian/control:
+   - Bump depends on lxsession >= 0.4.4-2, first version without HAL need.
+   - Drop recommends on HAL, not needed with new versions of pcmanfm and
+     lxsession (Closes: #589234, #615236).
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Mon, 04 Apr 2011 21:10:24 +0200
+
+lxde-common (0.5.0-4ubuntu2) natty; urgency=low
+
+  * debian/patches/04_pcmanfm0.9.patch:
+   - Update with correct location.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Mon, 06 Dec 2010 01:21:24 +0100
+
+lxde-common (0.5.0-4ubuntu1) natty; urgency=low
+
+  * Merge with Debian unstable.
+  * Ubuntu remaining changes:
+   - debian/control:
+    + Recommends lxdm over gdm for lxde to provide the display manager.
+    + Bump pcmanfm to >= 0.9.8 for the new settings location.
+    + Add Recommends on galculator, amixer and scrot, for the new openbox
+      keybindings.
+   - debian/patches/04_pcmanfm0.9.patch
+    + Refresh with new location of pcmanfm >= 0.9.8 settings (LP: #684796)
+   - debian/14_more_openbox_keybindings.patch:
+    + Add more openbox keybindings to manage volume, screenshots and
+      calculator (LP: #577957).
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 05 Dec 2010 20:55:26 +0100
+
 lxde-common (0.5.0-4) unstable; urgency=low
 
   [ Andrew Lee (李健秋) ]
@@ -48,6 +81,87 @@ lxde-common (0.5.0-4) unstable; urgency=
 
  -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 02 Jun 2010 00:24:55 +0800
 
+lxde-common (0.5.0-3ubuntu3) maverick; urgency=low
+
+  * Merge from Debian git.
+  * Ubuntu remaining changes:
+   - debian/control:
+    + Recommends lxdm over gdm for lxde to provide the display manager.
+
+  [ Andrew Lee (李健秋) ]
+  * debian/README.Debian:
+    - Update README.Debian for 'startx' users. (Closes:#570083)
+    - Document default hotkeys for default openbox-lxde WM
+  * Added freedesktop.org's specification required type keys to 
+    lxde-logout.desktop and lxde-screenlock.desktop (Closes:#570135)
+  * Convert dpatch to quilt
+  * Update autostart file to support pcmanfm 0.9 series. (Closes:#583146)
+  * Set default terminal to x-terminal-emulator. (Closes:#563221)
+  * debian/control:
+    - Use LXDE Packaging Team address
+    - Bumped Standard-version to 3.8.4
+    - Updated Homepage url
+    - Added Vcs-Git and Vcs-Browser tags
+    - Update lxde-common depends on lxsession (>= 0.4.4)
+    - Update lxde-core depends on pcmanfm (>=0.9.5), lxpanel (>= 0.5.5)
+    - Drop recommends on hal
+    - Recommends on chromium-browser | iceweasel | www-browser (Closes:#570176)
+  * Correct watch file. (Closes:#582670)
+  * debian/patches:
+    - 04_pcmanfm0.9.patch: install default config file for pcmanfm 0.9 series
+  * Switch to DH7
+  * Switch to dpkg-source 3.0 (quilt) format
+
+  [ Julien Lavergne ]
+  * debian/patches:
+   - 10_ensure-dbus-launch.patch: From upstream, launch dbus when it's needed.
+   - 11_ensure-desktop-folder.patch: From upstream, create the desktop folder
+     if it doesn't exist.
+   - 12_autostart-gnome-polkit.patch:
+     Autostart polkit-gnome-authentication-agent-1 to make polkit working on
+     LXDE session. 
+   - 13_ensure-menu-prefix.patch: From upstream, ensure that the menu prefix is
+     properly set.
+  * debian/control:
+   - Recommends xserver-xorg for lxde, to install by default a xserver.
+   - Recommends policykit-1-gnome for polkit support.
+   - Recommends gksu for support in pcmanfm.
+   - Wrap depends and build-depends.
+   - Build-depends on debhelper (>= 7.0.50) for overrides support.
+   - Add ${misc:Depends} to lxde-core and lxde.
+  * debian/rules:
+   - Add --fail-missing to dh_install. 
+  * debian/lxde-common.install:
+   - Install etc/ and usr/
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Wed, 02 Jun 2010 01:32:53 +0200
+
+lxde-common (0.5.0-3ubuntu2) lucid; urgency=low
+
+  * 12-autostart-gnome-polkit.dpatch: 
+    Autostart polkit-gnome-authentication-agent-1 to make polkit working on 
+    LXDE session. 
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 28 Mar 2010 22:20:34 +0200
+
+lxde-common (0.5.0-3ubuntu1) lucid; urgency=low
+
+  * Merge from Debian (LP: #529560)
+  * Ubuntu remaining changes : 
+   - 10-ensure-dbus-launch.dpatch: From upstream, launch dbus when it's needed.
+   - 11-ensure-desktop-folder.dpatch: From upstream, create the desktop folder
+     if it doesn't exist.
+   - debian/control: 
+    + Recommends lxdm over gdm for lxde to provide the display manager.
+    + Recommends xorg for lxde-core and lxde, to install by default a xserver
+      (LP: #509060).
+  * Ubuntu changes dropped :
+   - Drop lxde-icon-theme, provide by another source package.
+   - Drop default applications, provided by lubuntu-default-settings for
+     Lubuntu.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 28 Feb 2010 18:39:17 +0100
+
 lxde-common (0.5.0-3) unstable; urgency=low
 
   * debian/control:
@@ -86,6 +200,27 @@ lxde-common (0.5.0-1) unstable; urgency=
 
  -- Andrew Lee (李健秋) <ajqlee@debian.org>  Fri, 18 Dec 2009 15:48:43 +0800
 
+lxde-common (0.4.2-3ubuntu2) lucid; urgency=low
+
+  * debian/04-lxsession-update.dpatch: Update to lxsession 0.4.1 by passing
+    -e LXDE to lxsession. 
+  * debian/control: Update lxsession depends to >= 0.4.1.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 13 Dec 2009 01:09:10 +0100
+
+lxde-common (0.4.2-3ubuntu1) lucid; urgency=low
+
+  * Merge from Debian testing.
+  * Ubuntu remaining changes :
+   - Split icon theme into lxde-icon-theme binary.
+   - Use lxde-common.install and lxde-icon-theme.install.
+   - Install also desktop.conf for lxsession >= 0.4
+   - Add default applications and MIME associations for LXDE and Lubuntu 
+     with mimeinfo.cache, defaults.list and 03-default-applications.dpatch.
+   - 02-new-gdm-workaround.dpatch: Set correct number of desktops.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Tue, 08 Dec 2009 23:48:43 +0100
+
 lxde-common (0.4.2-3) unstable; urgency=low
 
   * Added desktop.conf for the built-in settings daemon in lxsession (>=0.4)
@@ -102,6 +237,40 @@ lxde-common (0.4.2-2) unstable; urgency=
 
  -- Andrew Lee (李健秋) <ajqlee@debian.org>  Sun, 15 Nov 2009 23:48:37 +0800
 
+lxde-common (0.4.2-1ubuntu3) karmic; urgency=low
+
+  * Add default applications and MIME associations for LXDE and Lubuntu:
+   - debian/defaults.list & debian/mimeinfo.cache: Config files for default 
+     applications and MIME associations. 
+   - debian/lxde-common.install: Install config files.
+   - debian/03-default-applications.dpatch: Copy config files if they doesn't
+     exist.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Mon, 21 Sep 2009 23:07:16 +0200
+
+lxde-common (0.4.2-1ubuntu2) karmic; urgency=low
+
+  * Sync GDM workaround with upstream:
+   - debian/patches/02-new-gdm-workaround.dpatch: Update
+   - debian/control: Remove wmctrl and gawk and add x11-utils to depends.
+  * Split icon theme into lxde-icon-theme binary:
+   - debian/control: Add lxde-icon-theme binary and let's lxde depends on it.
+  * Add lxterminal as default terminal for pcmanfm:
+   - debian/patches/01_default-config.dpatch: Updated.
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sat, 19 Sep 2009 02:16:19 +0200
+
+lxde-common (0.4.2-1ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable (LP: #410852)
+   - x-display-manager is now an alternative for gdm (LP: #330217)
+  * debian/patches/02-new-gdm-workaround.dpatch
+   - From Fedora, properly set the number of desktops at login.
+  * debian/control:
+   - Add wmctrl and gawk as depends of lxde for 02-new-gdm-workaround.dpatch.
+
+ -- Julien Lavergne <julien.lavergne@gmail.com>  Tue, 18 Aug 2009 00:50:58 +0200
+
 lxde-common (0.4.2-1) unstable; urgency=low
 
   * New upstream release
diff -pruN 0.5.0-4/debian/control 0.5.0-4ubuntu3/debian/control
--- 0.5.0-4/debian/control	2010-06-11 10:32:14.000000000 +0100
+++ 0.5.0-4ubuntu3/debian/control	2011-04-04 20:07:48.000000000 +0100
@@ -1,7 +1,8 @@
 Source: lxde-common
 Section: x11
 Priority: optional
-Maintainer: Debian LXDE Packaging Team <pkg-lxde-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian LXDE Packaging Team <pkg-lxde-maintainers@lists.alioth.debian.org>
 Uploaders: Andrew Lee (李健秋) <ajqlee@debian.org>
 Build-Depends: debhelper (>= 7.0.50),
                autotools-dev,
@@ -18,7 +19,7 @@ Package: lxde-common
 Architecture: all
 Depends: ${shlibs:Depends}, 
          ${misc:Depends},
-         lxsession (>= 0.4.4)
+         lxsession (>= 0.4.4-2)
 Recommends: lxde-core (>= ${source:Version})
 Suggests: lxlauncher
 Description: the Lightweight X11 Desktop Environment configuration data
@@ -43,7 +44,7 @@ Package: lxde-core
 Architecture: all
 Depends: ${misc:Depends},
          lxde-common (>= ${source:Version}),
-         pcmanfm (>=0.9.5),
+         pcmanfm (>= 0.9.8),
          lxpanel (>= 0.5.5),
          openbox (>= 3.4.6.1)
 Recommends: xscreensaver,
@@ -77,13 +78,15 @@ Depends: ${misc:Depends},
          lxrandr,
          obconf,
          lxde-icon-theme
-Recommends: gdm | x-display-manager,
-            hal,
+Recommends: lxdm | x-display-manager,
             chromium-browser | iceweasel | www-browser,
             lxmusic,
             menu-xdg,
             xserver-xorg,
-            policykit-1-gnome
+            policykit-1-gnome,
+            galculator,
+            amixer,
+            scrot
 Suggests: lxlauncher,
           lxtask
 Description: Meta-package for the Lightweight X11 Desktop Environment
diff -pruN 0.5.0-4/debian/patches/04_pcmanfm0.9.patch 0.5.0-4ubuntu3/debian/patches/04_pcmanfm0.9.patch
--- 0.5.0-4/debian/patches/04_pcmanfm0.9.patch	2010-05-27 19:27:15.000000000 +0100
+++ 0.5.0-4ubuntu3/debian/patches/04_pcmanfm0.9.patch	2010-12-06 00:26:51.000000000 +0000
@@ -1,12 +1,16 @@
---- a/autostart
-+++ b/autostart
+Index: lxde-common-0.5.0/autostart
+===================================================================
+--- lxde-common-0.5.0.orig/autostart	2010-12-06 01:26:04.000000000 +0100
++++ lxde-common-0.5.0/autostart	2010-12-06 01:26:25.000000000 +0100
 @@ -1,3 +1,3 @@
  @xscreensaver -no-splash
  @lxpanel --profile LXDE
 -@pcmanfm -d
 +@pcmanfm --desktop --profile LXDE
---- a/configure
-+++ b/configure
+Index: lxde-common-0.5.0/configure
+===================================================================
+--- lxde-common-0.5.0.orig/configure	2010-12-06 01:26:04.000000000 +0100
++++ lxde-common-0.5.0/configure	2010-12-06 01:26:25.000000000 +0100
 @@ -2385,7 +2385,7 @@
  fi
  
@@ -25,8 +29,10 @@
      "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
  
    *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
---- a/configure.ac
-+++ b/configure.ac
+Index: lxde-common-0.5.0/configure.ac
+===================================================================
+--- lxde-common-0.5.0.orig/configure.ac	2010-12-06 01:26:04.000000000 +0100
++++ lxde-common-0.5.0/configure.ac	2010-12-06 01:26:25.000000000 +0100
 @@ -48,7 +48,7 @@
    lxpanel/panel
    openbox/rc.xml
@@ -36,8 +42,10 @@
    man/Makefile
  ])
  
---- /dev/null
-+++ b/pcmanfm/LXDE.conf.in
+Index: lxde-common-0.5.0/pcmanfm/LXDE.conf.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ lxde-common-0.5.0/pcmanfm/LXDE.conf.in	2010-12-06 01:26:25.000000000 +0100
 @@ -0,0 +1,21 @@
 +[config]
 +bm_open_method=0
@@ -60,22 +68,28 @@
 +sort_type=0
 +sort_by=0
 +
---- a/startlxde.in
-+++ b/startlxde.in
-@@ -8,9 +8,9 @@
+Index: lxde-common-0.5.0/startlxde.in
+===================================================================
+--- lxde-common-0.5.0.orig/startlxde.in	2010-12-06 01:26:04.000000000 +0100
++++ lxde-common-0.5.0/startlxde.in	2010-12-06 01:26:25.000000000 +0100
+@@ -7,10 +7,10 @@
+ fi
  
  # Ensure the existance of pcmanfm config file
- PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
+-PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
 -if [ ! -f "$PCMANFM_CONF_DIR/main.lxde" ]; then
-+if [ ! -f "$PCMANFM_CONF_DIR/LXDE.conf" ]; then
++PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/LXDE"
++if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
      mkdir -p "$PCMANFM_CONF_DIR"
 -    cp @prefix@/share/lxde/pcmanfm/main.lxde "$PCMANFM_CONF_DIR/main.lxde"
-+    cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/LXDE.conf"
++    cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
  fi
  
  # Ensure the existance of openbox config file
---- a/openbox/menu.xml
-+++ b/openbox/menu.xml
+Index: lxde-common-0.5.0/openbox/menu.xml
+===================================================================
+--- lxde-common-0.5.0.orig/openbox/menu.xml	2010-12-06 01:26:04.000000000 +0100
++++ lxde-common-0.5.0/openbox/menu.xml	2010-12-06 01:26:25.000000000 +0100
 @@ -25,7 +25,7 @@
    <item label="Desktop Settings">
      <action name="Execute">
@@ -92,8 +106,10 @@
 -</openbox_menu>
 \ No newline at end of file
 +</openbox_menu>
---- a/Makefile.am
-+++ b/Makefile.am
+Index: lxde-common-0.5.0/Makefile.am
+===================================================================
+--- lxde-common-0.5.0.orig/Makefile.am	2010-12-06 01:26:04.000000000 +0100
++++ lxde-common-0.5.0/Makefile.am	2010-12-06 01:26:25.000000000 +0100
 @@ -33,7 +33,7 @@
  
  pcmanfmdir=$(datadir)/lxde/pcmanfm
@@ -112,8 +128,10 @@
  	$(lxpanel_DATA) \
  	lxpanel/panel.in
  
---- a/Makefile.in
-+++ b/Makefile.in
+Index: lxde-common-0.5.0/Makefile.in
+===================================================================
+--- lxde-common-0.5.0.orig/Makefile.in	2010-12-06 01:26:04.000000000 +0100
++++ lxde-common-0.5.0/Makefile.in	2010-12-06 01:26:25.000000000 +0100
 @@ -40,7 +40,7 @@
  	$(srcdir)/openbox-lxde.in $(srcdir)/startlxde.in \
  	$(top_srcdir)/configure $(top_srcdir)/lxpanel/panel.in \
diff -pruN 0.5.0-4/debian/patches/14_more_openbox_keybindings.patch 0.5.0-4ubuntu3/debian/patches/14_more_openbox_keybindings.patch
--- 0.5.0-4/debian/patches/14_more_openbox_keybindings.patch	1970-01-01 01:00:00.000000000 +0100
+++ 0.5.0-4ubuntu3/debian/patches/14_more_openbox_keybindings.patch	2010-12-05 18:30:41.000000000 +0000
@@ -0,0 +1,84 @@
+Index: lxde-common-0.5.0/openbox/rc.xml.in
+===================================================================
+--- lxde-common-0.5.0.orig/openbox/rc.xml.in	2010-12-05 19:29:49.000000000 +0100
++++ lxde-common-0.5.0/openbox/rc.xml.in	2010-12-05 19:30:35.000000000 +0100
+@@ -287,6 +287,79 @@
+           <command>lxtask</command>
+       </action>
+   </keybind>
++    <!-- Fast access to Terminal -->
++    <keybind key="C-A-T">
++      <action name="Execute">
++        <command>lxterminal</command>
++      </action>
++    </keybind>
++
++   <!-- Fast access to filemanager --> 
++   <keybind key="C-A-D">
++      <action name="Execute">
++        <startupnotify>
++          <enabled>true</enabled>
++          <name>PCManFM</name>
++        </startupnotify>
++        <command>pcmanfm</command>
++      </action>
++    </keybind>
++
++   <!-- Keybinding for PrintScreen Key -->
++    <keybind key="Print">
++      <action name="Execute">
++       <execute>scrot</execute>
++      </action>
++    </keybind>
++
++    <keybind key="A-Print">
++      <action name="Execute">
++       <execute>scrot -s</execute>
++      </action>
++    </keybind> 
++
++    <!-- Keybinding for Volume management -->
++    <keybind key="XF86AudioRaiseVolume">
++      <action name="Execute">
++          <command>amixer -q sset Master 3%+</command>
++      </action>
++    </keybind>
++
++    <keybind key="XF86AudioLowerVolume">
++      <action name="Execute">
++          <command>amixer -q sset Master 3%-</command>
++      </action>
++    </keybind>
++
++    <keybind key="XF86AudioMute">
++      <action name="Execute">
++          <command>amixer -q sset Master toggle</command>
++      </action>
++    </keybind>
++
++    <keybind key="XF86WWW">
++      <action name="Execute">
++          <command>x-terminal-emulator</command>
++      </action>
++    </keybind>
++
++    <keybind key="XF86Calculator">
++      <action name="Execute">
++          <command>galculator</command>
++      </action>
++    </keybind>
++
++    <keybind key="XF86MyComputer">
++      <action name="Execute">
++          <command>pcmanfm</command>
++      </action>
++    </keybind>
++
++    <keybind key="XF86Terminal">
++      <action name="Execute">
++          <command>x-terminal-emulator</command>
++      </action>
++    </keybind>
+ 
+ </keyboard>
+ 
diff -pruN 0.5.0-4/debian/patches/series 0.5.0-4ubuntu3/debian/patches/series
--- 0.5.0-4/debian/patches/series	2010-06-11 10:18:07.000000000 +0100
+++ 0.5.0-4ubuntu3/debian/patches/series	2010-12-06 00:26:19.000000000 +0000
@@ -7,3 +7,4 @@
 11_ensure-desktop-folder.patch
 12_autostart-gnome-polkit.patch
 13_ensure-menu-prefix.patch
+14_more_openbox_keybindings.patch
diff -pruN 0.5.0-4/openbox/rc.xml.in 0.5.0-4ubuntu3/openbox/rc.xml.in
--- 0.5.0-4/openbox/rc.xml.in	2008-04-26 03:32:26.000000000 +0100
+++ 0.5.0-4ubuntu3/openbox/rc.xml.in	2011-04-04 22:44:50.000000000 +0100
@@ -287,6 +287,79 @@
           <command>lxtask</command>
       </action>
   </keybind>
+    <!-- Fast access to Terminal -->
+    <keybind key="C-A-T">
+      <action name="Execute">
+        <command>lxterminal</command>
+      </action>
+    </keybind>
+
+   <!-- Fast access to filemanager --> 
+   <keybind key="C-A-D">
+      <action name="Execute">
+        <startupnotify>
+          <enabled>true</enabled>
+          <name>PCManFM</name>
+        </startupnotify>
+        <command>pcmanfm</command>
+      </action>
+    </keybind>
+
+   <!-- Keybinding for PrintScreen Key -->
+    <keybind key="Print">
+      <action name="Execute">
+       <execute>scrot</execute>
+      </action>
+    </keybind>
+
+    <keybind key="A-Print">
+      <action name="Execute">
+       <execute>scrot -s</execute>
+      </action>
+    </keybind> 
+
+    <!-- Keybinding for Volume management -->
+    <keybind key="XF86AudioRaiseVolume">
+      <action name="Execute">
+          <command>amixer -q sset Master 3%+</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86AudioLowerVolume">
+      <action name="Execute">
+          <command>amixer -q sset Master 3%-</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86AudioMute">
+      <action name="Execute">
+          <command>amixer -q sset Master toggle</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86WWW">
+      <action name="Execute">
+          <command>x-terminal-emulator</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86Calculator">
+      <action name="Execute">
+          <command>galculator</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86MyComputer">
+      <action name="Execute">
+          <command>pcmanfm</command>
+      </action>
+    </keybind>
+
+    <keybind key="XF86Terminal">
+      <action name="Execute">
+          <command>x-terminal-emulator</command>
+      </action>
+    </keybind>
 
 </keyboard>
 
diff -pruN 0.5.0-4/.pc/10_ensure-dbus-launch.patch/startlxde.in 0.5.0-4ubuntu3/.pc/10_ensure-dbus-launch.patch/startlxde.in
--- 0.5.0-4/.pc/10_ensure-dbus-launch.patch/startlxde.in	2011-04-04 22:49:25.000000000 +0100
+++ 0.5.0-4ubuntu3/.pc/10_ensure-dbus-launch.patch/startlxde.in	2011-04-04 22:44:50.000000000 +0100
@@ -7,10 +7,10 @@ if [ -z "$XDG_CONFIG_HOME" ]; then
 fi
 
 # Ensure the existance of pcmanfm config file
-PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
-if [ ! -f "$PCMANFM_CONF_DIR/LXDE.conf" ]; then
+PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/LXDE"
+if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
     mkdir -p "$PCMANFM_CONF_DIR"
-    cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/LXDE.conf"
+    cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
 fi
 
 # Ensure the existance of openbox config file
diff -pruN 0.5.0-4/.pc/11_ensure-desktop-folder.patch/startlxde.in 0.5.0-4ubuntu3/.pc/11_ensure-desktop-folder.patch/startlxde.in
--- 0.5.0-4/.pc/11_ensure-desktop-folder.patch/startlxde.in	2011-04-04 22:49:25.000000000 +0100
+++ 0.5.0-4ubuntu3/.pc/11_ensure-desktop-folder.patch/startlxde.in	2011-04-04 22:44:50.000000000 +0100
@@ -7,10 +7,10 @@ if [ -z "$XDG_CONFIG_HOME" ]; then
 fi
 
 # Ensure the existance of pcmanfm config file
-PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
-if [ ! -f "$PCMANFM_CONF_DIR/LXDE.conf" ]; then
+PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/LXDE"
+if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
     mkdir -p "$PCMANFM_CONF_DIR"
-    cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/LXDE.conf"
+    cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
 fi
 
 # Ensure the existance of openbox config file
diff -pruN 0.5.0-4/.pc/13_ensure-menu-prefix.patch/startlxde.in 0.5.0-4ubuntu3/.pc/13_ensure-menu-prefix.patch/startlxde.in
--- 0.5.0-4/.pc/13_ensure-menu-prefix.patch/startlxde.in	2011-04-04 22:49:25.000000000 +0100
+++ 0.5.0-4ubuntu3/.pc/13_ensure-menu-prefix.patch/startlxde.in	2011-04-04 22:44:50.000000000 +0100
@@ -7,10 +7,10 @@ if [ -z "$XDG_CONFIG_HOME" ]; then
 fi
 
 # Ensure the existance of pcmanfm config file
-PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
-if [ ! -f "$PCMANFM_CONF_DIR/LXDE.conf" ]; then
+PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/LXDE"
+if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
     mkdir -p "$PCMANFM_CONF_DIR"
-    cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/LXDE.conf"
+    cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
 fi
 
 # Ensure the existance of openbox config file
diff -pruN 0.5.0-4/.pc/14_more_openbox_keybindings.patch/openbox/rc.xml.in 0.5.0-4ubuntu3/.pc/14_more_openbox_keybindings.patch/openbox/rc.xml.in
--- 0.5.0-4/.pc/14_more_openbox_keybindings.patch/openbox/rc.xml.in	1970-01-01 01:00:00.000000000 +0100
+++ 0.5.0-4ubuntu3/.pc/14_more_openbox_keybindings.patch/openbox/rc.xml.in	2008-04-26 03:32:26.000000000 +0100
@@ -0,0 +1,731 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- Do not edit this file, it will be overwritten on install.
+        Copy the file to $HOME/.config/openbox/ instead. -->
+
+<openbox_config xmlns="http://openbox.org/3.4/rc">
+
+<resistance>
+  <strength>10</strength>
+  <screen_edge_strength>20</screen_edge_strength>
+</resistance>
+
+<focus>
+  <focusNew>yes</focusNew>
+  <!-- always try to focus new windows when they appear. other rules do
+       apply -->
+  <followMouse>no</followMouse>
+  <!-- move focus to a window when you move the mouse into it -->
+  <focusLast>yes</focusLast>
+  <!-- focus the last used window when changing desktops, instead of the one
+       under the mouse pointer. when followMouse is enabled -->
+  <underMouse>no</underMouse>
+  <!-- move focus under the mouse, even when the mouse is not moving -->
+  <focusDelay>200</focusDelay>
+  <!-- when followMouse is enabled, the mouse must be inside the window for
+       this many milliseconds (1000 = 1 sec) before moving focus to it -->
+  <raiseOnFocus>no</raiseOnFocus>
+  <!-- when followMouse is enabled, and a window is given focus by moving the
+       mouse into it, also raise the window -->
+</focus>
+
+<placement>
+  <policy>Smart</policy>
+  <!-- 'Smart' or 'UnderMouse' -->
+  <center>yes</center>
+  <!-- whether to place windows in the center of the free area found or
+       the top left corner -->
+  <monitor>Any</monitor>
+  <!-- with Smart placement on a multi-monitor system, try to place new windows
+       on: 'Any' - any monitor, 'Mouse' - where the mouse is, 'Active' - where
+       the active window is -->
+</placement>
+
+<theme>
+  <name>Onyx</name>
+  <titleLayout>NLIMC</titleLayout>
+  <!--
+      available characters are NDSLIMC, each can occur at most once.
+      N: window icon
+      L: window label (AKA title).
+      I: iconify
+      M: maximize
+      C: close
+      S: shade (roll up/down)
+      D: omnipresent (on all desktops).
+  -->
+  <keepBorder>yes</keepBorder>
+  <animateIconify>yes</animateIconify>
+  <font place="ActiveWindow">
+    <name>sans</name>
+    <size>10</size>
+    <!-- font size in points -->
+    <weight>bold</weight>
+    <!-- 'bold' or 'normal' -->
+    <slant>normal</slant>
+    <!-- 'italic' or 'normal' -->
+  </font>
+  <font place="InactiveWindow">
+    <name>sans</name>
+    <size>10</size>
+    <!-- font size in points -->
+    <weight>bold</weight>
+    <!-- 'bold' or 'normal' -->
+    <slant>normal</slant>
+    <!-- 'italic' or 'normal' -->
+  </font>
+  <font place="MenuHeader">
+    <name>sans</name>
+    <size>10</size>
+    <!-- font size in points -->
+    <weight>normal</weight>
+    <!-- 'bold' or 'normal' -->
+    <slant>normal</slant>
+    <!-- 'italic' or 'normal' -->
+  </font>
+  <font place="MenuItem">
+    <name>sans</name>
+    <size>10</size>
+    <!-- font size in points -->
+    <weight>normal</weight>
+    <!-- 'bold' or 'normal' -->
+    <slant>normal</slant>
+    <!-- 'italic' or 'normal' -->
+  </font>
+  <font place="OnScreenDisplay">
+    <name>sans</name>
+    <size>10</size>
+    <!-- font size in points -->
+    <weight>bold</weight>
+    <!-- 'bold' or 'normal' -->
+    <slant>normal</slant>
+    <!-- 'italic' or 'normal' -->
+  </font>
+</theme>
+
+<desktops>
+  <!-- this stuff is only used at startup, pagers allow you to change them
+       during a session
+
+       these are default values to use when other ones are not already set
+       by other applications, or saved in your session
+
+       use obconf if you want to change these without having to log out
+       and back in -->
+  <number>2</number>
+  <firstdesk>1</firstdesk>
+  <names>
+    <!-- set names up here if you want to, like this:
+    <name>desktop 1</name>
+    <name>desktop 2</name>
+    -->
+  </names>
+  <popupTime>875</popupTime>
+  <!-- The number of milliseconds to show the popup for when switching
+       desktops.  Set this to 0 to disable the popup. -->
+</desktops>
+
+<resize>
+  <drawContents>yes</drawContents>
+  <popupShow>Nonpixel</popupShow>
+  <!-- 'Always', 'Never', or 'Nonpixel' (xterms and such) -->
+  <popupPosition>Center</popupPosition>
+  <!-- 'Center', 'Top', or 'Fixed' -->
+  <popupFixedPosition>
+    <!-- these are used if popupPosition is set to 'Fixed' -->
+
+    <x>10</x>
+    <!-- positive number for distance from left edge, negative number for
+         distance from right edge, or 'Center' -->
+    <y>10</y>
+    <!-- positive number for distance from top edge, negative number for
+         distance from bottom edge, or 'Center' -->
+  </popupFixedPosition>
+</resize>
+
+<!-- You can reserve a portion of your screen where windows will not cover when
+     they are maximized, or when they are initially placed.
+     Many programs reserve space automatically, but you can use this in other
+     cases. -->
+<margins>
+  <top>0</top>
+  <bottom>0</bottom>
+  <left>0</left>
+  <right>0</right>
+</margins>
+
+<dock>
+  <position>TopLeft</position>
+  <!-- (Top|Bottom)(Left|Right|)|Top|Bottom|Left|Right|Floating -->
+  <floatingX>0</floatingX>
+  <floatingY>0</floatingY>
+  <noStrut>no</noStrut>
+  <stacking>Above</stacking>
+  <!-- 'Above', 'Normal', or 'Below' -->
+  <direction>Vertical</direction>
+  <!-- 'Vertical' or 'Horizontal' -->
+  <autoHide>no</autoHide>
+  <hideDelay>300</hideDelay>
+  <!-- in milliseconds (1000 = 1 second) -->
+  <showDelay>300</showDelay>
+  <!-- in milliseconds (1000 = 1 second) -->
+  <moveButton>Middle</moveButton>
+  <!-- 'Left', 'Middle', 'Right' -->
+</dock>
+
+<keyboard>
+  <chainQuitKey>C-g</chainQuitKey>
+
+  <!-- Keybindings for desktop switching -->
+  <keybind key="C-A-Left">
+    <action name="DesktopLeft"><dialog>no</dialog><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="C-A-Right">
+    <action name="DesktopRight"><dialog>no</dialog><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="C-A-Up">
+    <action name="DesktopUp"><dialog>no</dialog><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="C-A-Down">
+    <action name="DesktopDown"><dialog>no</dialog><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="S-A-Left">
+    <action name="SendToDesktopLeft"><dialog>no</dialog><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="S-A-Right">
+    <action name="SendToDesktopRight"><dialog>no</dialog><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="S-A-Up">
+    <action name="SendToDesktopUp"><dialog>no</dialog><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="S-A-Down">
+    <action name="SendToDesktopDown"><dialog>no</dialog><wrap>no</wrap></action>
+  </keybind>
+  <keybind key="W-F1">
+    <action name="Desktop"><desktop>1</desktop></action>
+  </keybind>
+  <keybind key="W-F2">
+    <action name="Desktop"><desktop>2</desktop></action>
+  </keybind>
+  <keybind key="W-F3">
+    <action name="Desktop"><desktop>3</desktop></action>
+  </keybind>
+  <keybind key="W-F4">
+    <action name="Desktop"><desktop>4</desktop></action>
+  </keybind>
+  <keybind key="W-d">
+    <action name="ToggleShowDesktop"/>
+  </keybind>
+
+  <keybind key="C-A-d">
+    <action name="ToggleShowDesktop"/>
+  </keybind>
+
+  <!-- Keybindings for windows -->
+  <keybind key="A-F4">
+    <action name="Close"/>
+  </keybind>
+  <keybind key="A-Escape">
+    <action name="Lower"/>
+    <action name="FocusToBottom"/>
+    <action name="Unfocus"/>
+  </keybind>
+  <keybind key="A-space">
+    <action name="ShowMenu"><menu>client-menu</menu></action>
+  </keybind>
+
+  <!-- Keybindings for window switching -->
+  <keybind key="A-Tab">
+    <action name="NextWindow"/>
+  </keybind>
+  <keybind key="A-S-Tab">
+    <action name="PreviousWindow"/>
+  </keybind>
+  <keybind key="C-A-Tab">
+    <action name="NextWindow">
+      <panels>yes</panels><desktop>yes</desktop>
+    </action>
+  </keybind>
+
+  <!-- Keybindings for running applications -->
+  <keybind key="W-e">
+    <action name="Execute">
+      <startupnotify>
+        <enabled>true</enabled>
+        <name>PCManFM</name>
+      </startupnotify>
+      <command>pcmanfm</command>
+    </action>
+  </keybind>
+
+  <!--keybindings for LXPanel -->
+  <keybind key="W-r">
+      <action name="Execute">
+        <command>lxpanelctl run</command>
+      </action>
+  </keybind>
+
+  <keybind key="A-F2">
+      <action name="Execute">
+          <command>lxpanelctl run</command>
+      </action>
+  </keybind>
+
+  <keybind key="C-Escape">
+      <action name="Execute">
+          <command>lxpanelctl menu</command>
+      </action>
+  </keybind>
+
+  <keybind key="F11">
+     <action name="ToggleFullscreen"/>
+  </keybind>
+
+  <!-- Launch Task Manager with Ctrl+Alt+Del -->
+  <keybind key="A-C-Delete">
+      <action name="Execute">
+          <command>lxtask</command>
+      </action>
+  </keybind>
+
+</keyboard>
+
+
+<mouse>
+  <dragThreshold>8</dragThreshold>
+  <!-- number of pixels the mouse must move before a drag begins -->
+  <doubleClickTime>200</doubleClickTime>
+  <!-- in milliseconds (1000 = 1 second) -->
+  <screenEdgeWarpTime>400</screenEdgeWarpTime>
+  <!-- Time before changing desktops when the pointer touches the edge of the
+       screen while moving a window, in milliseconds (1000 = 1 second).
+       Set this to 0 to disable warping -->
+
+  <context name="Frame">
+    <mousebind button="A-Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="A-Left" action="Click">
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="A-Left" action="Drag">
+      <action name="Move"/>
+    </mousebind>
+
+    <mousebind button="A-Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="A-Right" action="Drag">
+      <action name="Resize"/>
+    </mousebind>
+
+    <mousebind button="A-Middle" action="Press">
+      <action name="Lower"/>
+      <action name="FocusToBottom"/>
+      <action name="Unfocus"/>
+    </mousebind>
+
+    <mousebind button="A-Up" action="Click">
+      <action name="DesktopPrevious"/>
+    </mousebind>
+    <mousebind button="A-Down" action="Click">
+      <action name="DesktopNext"/>
+    </mousebind>
+    <mousebind button="C-A-Up" action="Click">
+      <action name="DesktopPrevious"/>
+    </mousebind>
+    <mousebind button="C-A-Down" action="Click">
+      <action name="DesktopNext"/>
+    </mousebind>
+    <mousebind button="A-S-Up" action="Click">
+      <action name="SendToDesktopPrevious"/>
+    </mousebind>
+    <mousebind button="A-S-Down" action="Click">
+      <action name="SendToDesktopNext"/>
+    </mousebind>
+  </context>
+
+  <context name="Titlebar">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Left" action="Drag">
+      <action name="Move"/>
+    </mousebind>
+    <mousebind button="Left" action="DoubleClick">
+      <action name="ToggleMaximizeFull"/>
+    </mousebind>
+
+    <mousebind button="Middle" action="Press">
+      <action name="Lower"/>
+      <action name="FocusToBottom"/>
+      <action name="Unfocus"/>
+    </mousebind>
+
+    <mousebind button="Up" action="Click">
+      <action name="Shade"/>
+      <action name="FocusToBottom"/>
+      <action name="Unfocus"/>
+      <action name="Lower"/>
+    </mousebind>
+    <mousebind button="Down" action="Click">
+      <action name="Unshade"/>
+      <action name="Raise"/>
+    </mousebind>
+
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="ShowMenu"><menu>client-menu</menu></action>
+    </mousebind>
+  </context>
+
+  <context name="Top">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Left" action="Drag">
+      <action name="Resize"><edge>top</edge></action>
+    </mousebind>
+  </context>
+
+  <context name="Left">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Left" action="Drag">
+      <action name="Resize"><edge>left</edge></action>
+    </mousebind>
+  </context>
+
+  <context name="Right">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Left" action="Drag">
+      <action name="Resize"><edge>right</edge></action>
+    </mousebind>
+  </context>
+
+  <context name="Bottom">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Left" action="Drag">
+      <action name="Resize"><edge>bottom</edge></action>
+    </mousebind>
+
+    <mousebind button="Middle" action="Press">
+      <action name="Lower"/>
+      <action name="FocusToBottom"/>
+      <action name="Unfocus"/>
+    </mousebind>
+
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="ShowMenu"><menu>client-menu</menu></action>
+    </mousebind>
+  </context>
+
+  <context name="BLCorner">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Left" action="Drag">
+      <action name="Resize"/>
+    </mousebind>
+  </context>
+
+  <context name="BRCorner">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Left" action="Drag">
+      <action name="Resize"/>
+    </mousebind>
+  </context>
+
+  <context name="TLCorner">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Left" action="Drag">
+      <action name="Resize"/>
+    </mousebind>
+  </context>
+
+  <context name="TRCorner">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Left" action="Drag">
+      <action name="Resize"/>
+    </mousebind>
+  </context>
+
+  <context name="Client">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Middle" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+  </context>
+
+  <context name="Icon">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+      <action name="ShowMenu"><menu>client-menu</menu></action>
+    </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="ShowMenu"><menu>client-menu</menu></action>
+    </mousebind>
+  </context>
+
+  <context name="AllDesktops">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Left" action="Click">
+      <action name="ToggleOmnipresent"/>
+    </mousebind>
+  </context>
+
+  <context name="Shade">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Left" action="Click">
+      <action name="ToggleShade"/>
+    </mousebind>
+  </context>
+
+  <context name="Iconify">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Left" action="Click">
+      <action name="Iconify"/>
+    </mousebind>
+  </context>
+
+  <context name="Maximize">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Middle" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Left" action="Click">
+      <action name="ToggleMaximizeFull"/>
+    </mousebind>
+    <mousebind button="Middle" action="Click">
+      <action name="ToggleMaximizeVert"/>
+    </mousebind>
+    <mousebind button="Right" action="Click">
+      <action name="ToggleMaximizeHorz"/>
+    </mousebind>
+  </context>
+
+  <context name="Close">
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+      <action name="Unshade"/>
+    </mousebind>
+    <mousebind button="Left" action="Click">
+      <action name="Close"/>
+    </mousebind>
+  </context>
+
+  <context name="Desktop">
+    <mousebind button="Up" action="Click">
+      <action name="DesktopPrevious"/>
+    </mousebind>
+    <mousebind button="Down" action="Click">
+      <action name="DesktopNext"/>
+    </mousebind>
+
+    <mousebind button="A-Up" action="Click">
+      <action name="DesktopPrevious"/>
+    </mousebind>
+    <mousebind button="A-Down" action="Click">
+      <action name="DesktopNext"/>
+    </mousebind>
+    <mousebind button="C-A-Up" action="Click">
+      <action name="DesktopPrevious"/>
+    </mousebind>
+    <mousebind button="C-A-Down" action="Click">
+      <action name="DesktopNext"/>
+    </mousebind>
+
+    <mousebind button="Left" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="Focus"/>
+      <action name="Raise"/>
+    </mousebind>
+  </context>
+
+  <context name="Root">
+    <!-- Menus -->
+    <mousebind button="Middle" action="Press">
+      <action name="ShowMenu"><menu>client-list-combined-menu</menu></action>
+    </mousebind>
+    <mousebind button="Right" action="Press">
+      <action name="ShowMenu"><menu>root-menu</menu></action>
+    </mousebind>
+  </context>
+
+  <context name="MoveResize">
+    <mousebind button="Up" action="Click">
+      <action name="DesktopPrevious"/>
+    </mousebind>
+    <mousebind button="Down" action="Click">
+      <action name="DesktopNext"/>
+    </mousebind>
+    <mousebind button="A-Up" action="Click">
+      <action name="DesktopPrevious"/>
+    </mousebind>
+    <mousebind button="A-Down" action="Click">
+      <action name="DesktopNext"/>
+    </mousebind>
+  </context>
+</mouse>
+
+<menu>
+  <!-- You can specify more than one menu file in here and they are all loaded,
+       just don't make menu ids clash or, well, it'll be kind of pointless -->
+
+  <!-- default menu file (or custom one in $HOME/.config/openbox/) -->
+  <file>@prefix@/share/lxde/openbox/menu.xml</file>
+  <hideDelay>200</hideDelay>
+  <!-- if a press-release lasts longer than this setting (in milliseconds), the
+       menu is hidden again -->
+  <middle>no</middle>
+  <!-- center submenus vertically about the parent entry -->
+  <submenuShowDelay>100</submenuShowDelay>
+  <!-- this one is easy, time to delay before showing a submenu after hovering
+       over the parent entry -->
+  <applicationIcons>yes</applicationIcons>
+  <!-- controls if icons appear in the client-list-(combined-)menu -->
+  <manageDesktops>yes</manageDesktops>
+  <!-- show the manage desktops section in the client-list-(combined-)menu -->
+</menu>
+
+<applications>
+<!--
+  # this is an example with comments through out. use these to make your
+  # own rules, but without the comments of course.
+
+  <application name="first element of window's WM_CLASS property (see xprop)"
+              class="second element of window's WM_CLASS property (see xprop)"
+               role="the window's WM_WINDOW_ROLE property (see xprop)">
+  # the name or the class can be set, or both. this is used to match
+  # windows when they appear. role can optionally be set as well, to
+  # further restrict your matches.
+
+  # the name, class, and role use simple wildcard matching such as those
+  # used by a shell. you can use * to match any characters and ? to match
+  # any single character.
+
+  # when multiple rules match a window, they will all be applied, in the
+  # order that they appear in this list
+
+
+    # each element can be left out or set to 'default' to specify to not
+    # change that attribute of the window
+
+    <decor>yes</decor>
+    # enable or disable window decorations
+
+    <shade>no</shade>
+    # make the window shaded when it appears, or not
+
+    <position>
+      # the position is only used if both an x and y coordinate are provided
+      # (and not set to 'default')
+      <x>center</x>
+      # a number like 50, or 'center' to center on screen. use a negative number
+      # to start from the right (or bottom for <y>), ie -50 is 50 pixels from the
+      # right edge (or bottom).
+      <y>200</y>
+      <monitor>1</monitor>
+      # specifies the monitor in a xinerama setup.
+      # 1 is the first head, or 'mouse' for wherever the mouse is
+    </position>
+
+    <focus>yes</focus>
+    # if the window should try be given focus when it appears. if this is set
+    # to yes it doesn't guarantee the window will be given focus. some
+    # restrictions may apply, but Openbox will try to
+
+    <desktop>1</desktop>
+    # 1 is the first desktop, 'all' for all desktops
+
+    <layer>normal</layer>
+    # 'above', 'normal', or 'below'
+
+    <iconic>no</iconic>
+    # make the window iconified when it appears, or not
+
+    <skip_pager>no</skip_pager>
+    # asks to not be shown in pagers
+
+    <skip_taskbar>no</skip_taskbar>
+    # asks to not be shown in taskbars. window cycling actions will also
+    # skip past such windows
+
+    <fullscreen>yes</fullscreen>
+    # make the window in fullscreen mode when it appears
+
+    <maximized>true</maximized>
+    # 'Horizontal', 'Vertical' or boolean (yes/no)
+  </application>
+
+  # end of the example
+-->
+</applications>
+
+</openbox_config>
diff -pruN 0.5.0-4/.pc/applied-patches 0.5.0-4ubuntu3/.pc/applied-patches
--- 0.5.0-4/.pc/applied-patches	2011-04-04 22:49:25.000000000 +0100
+++ 0.5.0-4ubuntu3/.pc/applied-patches	2011-04-04 22:44:50.000000000 +0100
@@ -7,3 +7,4 @@
 11_ensure-desktop-folder.patch
 12_autostart-gnome-polkit.patch
 13_ensure-menu-prefix.patch
+14_more_openbox_keybindings.patch
diff -pruN 0.5.0-4/startlxde.in 0.5.0-4ubuntu3/startlxde.in
--- 0.5.0-4/startlxde.in	2011-04-04 22:49:25.000000000 +0100
+++ 0.5.0-4ubuntu3/startlxde.in	2011-04-04 22:44:50.000000000 +0100
@@ -7,10 +7,10 @@ if [ -z "$XDG_CONFIG_HOME" ]; then
 fi
 
 # Ensure the existance of pcmanfm config file
-PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm"
-if [ ! -f "$PCMANFM_CONF_DIR/LXDE.conf" ]; then
+PCMANFM_CONF_DIR="$XDG_CONFIG_HOME/pcmanfm/LXDE"
+if [ ! -f "$PCMANFM_CONF_DIR/pcmanfm.conf" ]; then
     mkdir -p "$PCMANFM_CONF_DIR"
-    cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/LXDE.conf"
+    cp @prefix@/share/lxde/pcmanfm/LXDE.conf "$PCMANFM_CONF_DIR/pcmanfm.conf"
 fi
 
 # Ensure the existance of openbox config file