diff --git a/etc/xdg/lubuntu/libfm/libfm.conf b/etc/xdg/lubuntu/libfm/libfm.conf
index 8e97586..9504526 100644
--- a/etc/xdg/lubuntu/libfm/libfm.conf
+++ b/etc/xdg/lubuntu/libfm/libfm.conf
@@ -2,7 +2,7 @@
 single_click=0
 use_trash=1
 confirm_del=1
-terminal=lxterminal %s
+terminal=lubuntu-default terminal %s
 thumbnail_local=1
 thumbnail_max=2048
 
diff --git a/etc/xdg/lxsession/Lubuntu/autostart b/etc/xdg/lxsession/Lubuntu/autostart
index a37d6de..e69de29 100644
--- a/etc/xdg/lxsession/Lubuntu/autostart
+++ b/etc/xdg/lxsession/Lubuntu/autostart
@@ -1,5 +0,0 @@
-@lxpanel --profile Lubuntu
-@xscreensaver -no-splash
-@xfce4-power-manager
-@pcmanfm --desktop --profile lubuntu
-@/usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
diff --git a/etc/xdg/lxsession/Lubuntu/desktop.conf b/etc/xdg/lxsession/Lubuntu/desktop.conf
index 762fb8a..81c1286 100644
--- a/etc/xdg/lxsession/Lubuntu/desktop.conf
+++ b/etc/xdg/lxsession/Lubuntu/desktop.conf
@@ -1,5 +1,76 @@
 [Session]
-window_manager=openbox-lubuntu
+window_manager/program=openbox
+window_manager/session=Lubuntu
+window_manager/extras=
+
+panel/program=lxpanel
+panel/session=Lubuntu
+
+screensaver/program=
+
+power-manager/program=auto
+
+file-manager/program=pcmanfm
+file-manager/session=Lubuntu
+file-manager/extras=
+
+polkit=lxpolkit
+
+network_gui=auto
+
+audio_manager=alsamixer
+
+quit_manager/command=lxsession-logout
+quit_manager/image=/usr/share/lubuntu/images/logout-banner.png
+quit_maanger/layout=top
+
+workspace_manager=obconf
+
+launcher_manager=lxpanelctl
+
+terminal_manager=x-terminal-emulator
+
+screenshot_manager=scrot
+
+upgrades_manager=update-manager
+
+clipboard=lxclipboard
+
+composite_manager/command=
+composite_manager/autostart=true
+
+disable_autostart=config-only
+
+webbrowser/command=x-www-browser
+webbrowser/desktop=
+
+[State]
+laptop_mode=unknown
+
+[Dbus]
+lxde=true
+gnome=false
+
+[Keymap]
+mode=system
+model=
+layout=
+variant=
+options=
+
+[XRandr]
+mode=
+command=
+
+[Security]
+keyring=no
+
+[a11y]
+activate=no
+type=
+
+[Updates]
+activate=true
 
 [GTK]
 sNet/ThemeName=Lubuntu-default
diff --git a/usr/share/lubuntu/openbox/menu.xml b/usr/share/lubuntu/openbox/menu.xml
index 7028b2a..ab5ff8a 100644
--- a/usr/share/lubuntu/openbox/menu.xml
+++ b/usr/share/lubuntu/openbox/menu.xml
@@ -175,7 +175,7 @@
   </item>
   <item label="Terminal" icon="/usr/share/pixmaps/lxterminal.png">
     <action name="Execute">
-      <command>xterm</command>
+      <command>lxsession-default terminal</command>
       <startupnotify>
         <enabled>yes</enabled>
       </startupnotify>
@@ -199,7 +199,7 @@
   <separator />
   <item label="Log Out">
     <action name="Execute">
-      <command>lubuntu-logout</command>
+      <command>lxsession-default quit</command>
     </action>
   </item>
 </menu>
diff --git a/usr/share/lubuntu/openbox/rc.xml b/usr/share/lubuntu/openbox/rc.xml
index c142331..59b4457 100644
--- a/usr/share/lubuntu/openbox/rc.xml
+++ b/usr/share/lubuntu/openbox/rc.xml
@@ -267,7 +267,7 @@
     <!-- Take a screenshot of the current window with scrot when Alt+Print are pressed -->
     <keybind key="A-Print">
       <action name="Execute">
-        <command>scrot -u -b</command>
+        <command>lxsession-default screenshot window</command>
       </action>
     </keybind>
     <!-- Keybindings for window switching -->
@@ -404,7 +404,7 @@
     <!-- Launch a terminal on Ctrl + Alt + T-->
     <keybind key="C-A-T">
       <action name="Execute">
-        <command>x-terminal-emulator</command>
+        <command>lxsession-default terminal</command>
       </action>
     </keybind>
     <!-- Launch a filemanager on Ctrl + Alt + D-->
@@ -442,12 +442,12 @@
     <!-- Keybinding for terminal button-->
     <keybind key="XF86WWW">
       <action name="Execute">
-        <command>x-terminal-emulator</command>
+        <command>lxsession-default terminal</command>
       </action>
     </keybind>
     <keybind key="XF86Terminal">
       <action name="Execute">
-        <command>x-terminal-emulator</command>
+        <command>lxsession-default terminal</command>
       </action>
     </keybind>
     <!-- Keybinding for calculator button-->
@@ -481,13 +481,13 @@
     <!-- Launch scrot when Print is pressed -->
     <keybind key="Print">
       <action name="Execute">
-        <command>scrot</command>
+        <command>lxsession-default screenshot</command>
       </action>
     </keybind>
     <!-- Launch logout when push on the shutdown button -->
     <keybind key="XF86PowerOff">
       <action name="Execute">
-        <command>lubuntu-logout</command>
+        <command>lxsession-default quit</command>
       </action>
     </keybind>
   </keyboard>
diff --git a/usr/share/lubuntu/pcmanfm/main.lubuntu b/usr/share/lubuntu/pcmanfm/main.lubuntu
index f6a75e7..e432b33 100644
--- a/usr/share/lubuntu/pcmanfm/main.lubuntu
+++ b/usr/share/lubuntu/pcmanfm/main.lubuntu
@@ -1,5 +1,5 @@
 [General]
-terminal=lxterminal
+terminal=lxsession-default terminal
 
 [Desktop]
 show_wallpaper=1