diff -Nru lubuntu-default-settings-0.45/debian/changelog lubuntu-default-settings-0.46/debian/changelog
--- lubuntu-default-settings-0.45/debian/changelog	2016-02-27 15:13:06.000000000 +0000
+++ lubuntu-default-settings-0.46/debian/changelog	2016-04-10 10:09:03.000000000 +0000
@@ -1,3 +1,15 @@
+lubuntu-default-settings (0.46) xenial; urgency=medium
+
+  * src/etc/xdg/lubuntu/menus/lxqt-applications.menu:
+   - Add some comments to the structure.
+   - Exclude Evince from Office menu, it's already in Graphics.
+   - Exclude Pcmanfm from System menu, already in Utility.
+  * src/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf:
+   - Re-add [desktop] item in pcmanfm.conf, to correctly load settings on first
+     start (LP: #1551446).
+
+ -- Julien Lavergne <gilir@ubuntu.com>  Sun, 10 Apr 2016 12:09:00 +0200
+
 lubuntu-default-settings (0.45) xenial; urgency=medium
 
   * src/etc/xdg/lubuntu/libfm/libfm.conf
@@ -6,8 +18,8 @@
    - Set lxterminal as the terminal by default, until
      lxsession-default-terminal is fixed (LP: #1434774).
   * src/etc/xdg/lubuntu/menus/lxqt-applications.menu
-   - Exclude synaptic-kde.desktop in LXQt menu, until OnlyShowIn is fixed in LXQt
-     (see bug #582). Thanks Ariszlo for the patch.
+   - Exclude synaptic-kde.desktop in LXQt menu, until OnlyShowIn is fixed in
+     LXQt (see bug #582). Thanks Ariszlo for the patch.
   * src/etc/xdg/pcmanfm/lubuntu/desktop-items-0.conf
   * src/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf
    - Update some pcmanfm default settings and activate mounted devices on the
diff -Nru lubuntu-default-settings-0.45/debian/lubuntu-extra-sessions.install lubuntu-default-settings-0.46/debian/lubuntu-extra-sessions.install
--- lubuntu-default-settings-0.45/debian/lubuntu-extra-sessions.install	2015-10-23 09:50:05.000000000 +0000
+++ lubuntu-default-settings-0.46/debian/lubuntu-extra-sessions.install	2016-04-09 19:44:06.000000000 +0000
@@ -1,6 +1,5 @@
 etc/xdg/lubuntu/menus/desktop-directories/lxqt-settings.directory
 etc/xdg/lubuntu/menus/lubuntu-nexus7-applications.menu
-etc/xdg/lubuntu/menus/lxqt-applications.menu
 etc/xdg/lxsession/Lubuntu-Nexus7/
 etc/xdg/lxsession/LX-Games/
 etc/xdg/lxsession/QLubuntu/
diff -Nru lubuntu-default-settings-0.45/src/etc/xdg/lubuntu/menus/lxde-applications.menu lubuntu-default-settings-0.46/src/etc/xdg/lubuntu/menus/lxde-applications.menu
--- lubuntu-default-settings-0.45/src/etc/xdg/lubuntu/menus/lxde-applications.menu	2015-10-23 09:50:05.000000000 +0000
+++ lubuntu-default-settings-0.46/src/etc/xdg/lubuntu/menus/lxde-applications.menu	2016-04-09 19:44:06.000000000 +0000
@@ -4,11 +4,16 @@
 <Menu>
     <Name>Applications</Name>
     
-    <DefaultAppDirs/>
-    <DefaultDirectoryDirs/>
-    <DefaultMergeDirs/>
+	<!-- Read standard .directory and .desktop file locations -->
+	<DefaultAppDirs/>
+	<DefaultDirectoryDirs/>
+
+	<!-- Read in overrides and child menus from applications-merged/ -->
+	<DefaultMergeDirs/>
 
 <!-- Applications Menu -->
+
+<!-- Accessories submenu -->
     <Menu>
         <Name>Accessories</Name>
         <Directory>lxde-utility.directory</Directory>
@@ -17,9 +22,9 @@
                 <Category>Utility</Category>
                 <Not><Category>Accessibility</Category></Not>
                 <Not><Category>System</Category></Not>
-		<Not><Category>AudioVideo</Category></Not>
-		<Not><Category>Audio</Category></Not>
-		<Not><Category>Video</Category></Not>
+                <Not><Category>AudioVideo</Category></Not>
+                <Not><Category>Audio</Category></Not>
+                <Not><Category>Video</Category></Not>
             </And>
                 <Or>
                     <Category>Core</Category>
@@ -27,7 +32,9 @@
                 </Or>
         </Include>
     </Menu>
+<!-- End Accessories -->
 
+<!-- Accessibility submenu -->
     <Menu>
         <Name>Universal Access</Name>
         <Directory>lxde-utility-accessibility.directory</Directory>
@@ -38,7 +45,9 @@
             </And>
         </Include>
     </Menu>
+<!-- End Accessibility -->
 
+<!-- Development Tools -->
     <Menu>
         <Name>Development</Name>
         <Directory>lxde-development.directory</Directory>
@@ -49,7 +58,9 @@
             <Filename>emacs.desktop</Filename>
         </Include>
     </Menu>
+<!-- End Development Tools -->
 
+<!-- Education -->
     <Menu>
         <Name>Education</Name>
         <Directory>lxde-education.directory</Directory>
@@ -63,7 +74,9 @@
             </And>
         </Include>
     </Menu> 
+<!-- End Education -->
 
+<!-- Electronics -->
     <Menu>
         <Name>Electronics</Name>
         <Directory>Electronics.directory</Directory>
@@ -71,7 +84,9 @@
             <Category>Electronics</Category>
         </Include>
     </Menu>
+<!-- End Electronics -->
 
+<!-- Games -->
     <Menu>
         <Name>Games</Name>
         <Directory>lxde-game.directory</Directory>
@@ -79,7 +94,9 @@
             <Category>Game</Category>
         </Include>
     </Menu>
+<!-- End Games -->
 
+<!-- Graphics -->
     <Menu>
         <Name>Graphics</Name>
         <Directory>lxde-graphics.directory</Directory>
@@ -90,7 +107,9 @@
             </And>
         </Include>
     </Menu>
+<!-- End Graphics -->
 
+<!-- Internet -->
     <Menu>
         <Name>Internet</Name>
         <Directory>lxde-network.directory</Directory>
@@ -98,7 +117,9 @@
             <Category>Network</Category>
         </Include>
     </Menu>
+<!-- End Internet -->
 
+<!-- Multimedia -->
     <Menu>
         <Name>Multimedia</Name>
         <Directory>lxde-audio-video.directory</Directory>
@@ -108,15 +129,22 @@
             <Category>AudioVideo</Category>
         </Include>
     </Menu>
+<!-- End Multimedia -->
 
+<!-- Office -->
     <Menu>
         <Name>Office</Name>
         <Directory>lxde-office.directory</Directory>
         <Include>
+            <And>
             <Category>Office</Category>
+            <Not><Category>Graphics</Category></Not>
+            </And>
         </Include>
     </Menu>
+<!-- End Office -->
 
+<!-- Other -->
     <Menu>
         <Name>Other</Name>
         <Directory>lxde-other.directory</Directory>
@@ -124,7 +152,15 @@
         <Include>
             <And/>
         </Include>
+        <Exclude>
+            <Or>
+                <Filename>debian-uxterm.desktop</Filename>
+                <Filename>debian-xterm.desktop</Filename>
+                <Filename>synaptic-kde.desktop</Filename>
+            </Or>
+        </Exclude>
     </Menu>
+<!-- End Other -->
 
 <!-- Administration Menu, to include in Layout section -->
     <Menu>
@@ -136,13 +172,17 @@
                 <Category>System</Category>
             </And>
             <Or>
+            <And>
                 <Category>System</Category>
+                <Not><Category>FileManager</Category></Not>
+            </And>
             </Or>
         </Include>
         <Exclude>
             <Or>
                 <Filename>debian-uxterm.desktop</Filename>
                 <Filename>debian-xterm.desktop</Filename>
+                <Filename>synaptic-kde.desktop</Filename>
             </Or>
         </Exclude>
     </Menu>
diff -Nru lubuntu-default-settings-0.45/src/etc/xdg/lubuntu/menus/lxqt-applications.menu lubuntu-default-settings-0.46/src/etc/xdg/lubuntu/menus/lxqt-applications.menu
--- lubuntu-default-settings-0.45/src/etc/xdg/lubuntu/menus/lxqt-applications.menu	2015-10-23 15:38:35.000000000 +0000
+++ lubuntu-default-settings-0.46/src/etc/xdg/lubuntu/menus/lxqt-applications.menu	1970-01-01 00:00:00.000000000 +0000
@@ -1,235 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
- "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-
-<Menu>
-
-	<Name>Applications</Name>
-	<Directory>lxde-menu-applications.directory</Directory>
-
-	<!-- Read standard .directory and .desktop file locations -->
-	<DefaultAppDirs/>
-	<DefaultDirectoryDirs/>
-
-	<!-- Read in overrides and child menus from applications-merged/ -->
-	<DefaultMergeDirs/>
-
-	<!-- Accessories submenu -->
-	<Menu>
-		<Name>Accessories</Name>
-		<Directory>lxde-utility.directory</Directory>
-		<Include>
-			<And>
-				<Category>Utility</Category>
-	<!-- Accessibility spec must have either the Utility or Settings
-			 category, and we display an accessibility submenu already for
-			 the ones that do not have Settings, so don't display accessibility
-			 applications here -->
-				<Not><Category>Accessibility</Category></Not>
-				<Not><Category>System</Category></Not>
-			</And>
-		</Include>
-	</Menu> <!-- End Accessories -->
-
-	<!-- Accessibility submenu -->
-	<Menu>
-		<Name>Universal Access</Name>
-		<Directory>lxde-utility-accessibility.directory</Directory>
-		<Include>
-			<And>
-				<Category>Accessibility</Category>
-				<Not><Category>Settings</Category></Not>
-			</And>
-		</Include>
-	</Menu> <!-- End Accessibility -->
-
-	<!-- Development Tools -->
-	<Menu>
-		<Name>Development</Name>
-		<Directory>lxde-development.directory</Directory>
-		<Include>
-			<And>
-				<Category>Development</Category>
-			</And>
-			<Filename>emacs.desktop</Filename>
-		</Include>
-	</Menu> <!-- End Development Tools -->
-
-	<!-- Education -->
-	<Menu>
-		<Name>Education</Name>
-		<Directory>lxde-education.directory</Directory>
-		<Include>
-			<And>
-				<Category>Education</Category>
-			</And>
-		</Include>
-	</Menu> <!-- End Education -->
-
-	<!-- Games -->
-	<Menu>
-		<Name>Games</Name>
-		<Directory>lxde-game.directory</Directory>
-		<Include>
-			<And>
-				<Category>Game</Category>
-			</And>
-		</Include>
-	</Menu> <!-- End Games -->
-
-	<!-- Graphics -->
-	<Menu>
-		<Name>Graphics</Name>
-		<Directory>lxde-graphics.directory</Directory>
-		<Include>
-			<And>
-				<Category>Graphics</Category>
-				<Not><Category>Utility</Category></Not>
-			</And>
-		</Include>
-	</Menu> <!-- End Graphics -->
-
-	<!-- Internet -->
-	<Menu>
-		<Name>Internet</Name>
-		<Directory>lxde-network.directory</Directory>
-		<Include>
-			<And>
-				<Category>Network</Category>
-			</And>
-		</Include>
-	</Menu>	 <!-- End Internet -->
-
-	<!-- LXQt-About -->
-	<Menu>
-		<Name>LXQt-About</Name>
-		<Include>
-		<Filename>lxqt-about.desktop</Filename>
-		</Include>
-	</Menu> <!-- End LXQt-About -->
-
-	<!-- Multimedia -->
-	<Menu>
-		<Name>Multimedia</Name>
-		<Directory>lxde-audio-video.directory</Directory>
-		<Include>
-			<And>
-				<Category>AudioVideo</Category>
-			</And>
-		</Include>
-	</Menu>	 <!-- End Multimedia -->
-
-	<!-- Office -->
-	<Menu>
-		<Name>Office</Name>
-		<Directory>lxde-office.directory</Directory>
-		<Include>
-			<And>
-				<Category>Office</Category>
-			</And>
-		</Include>
-	</Menu> <!-- End Office -->
-
-	<!-- System Tools-->
-	<Menu>
-		<Name>System</Name>
-		<Directory>lxde-system-tools.directory</Directory>
-		<Include>
-			<And>
-				<Category>System</Category>
-				<Not><Category>Settings</Category></Not>
-				<Not><Category>PackageManager</Category></Not>
-			</And>
-		</Include>
-	</Menu>	 <!-- End System Tools -->
-
-	<!-- Other -->
-	<Menu>
-		<Name>Other</Name>
-		<Directory>lxde-other.directory</Directory>
-		<OnlyUnallocated/>
-		<Include>
-			<And>
-				<Not><Category>Core</Category></Not>
-				<Not><Category>Settings</Category></Not>
-				<Not><Category>Screensaver</Category></Not>
-			</And>
-		</Include>
-		<Exclude>
-			<Filename>synaptic-kde.desktop</Filename>
-		</Exclude>
-		</Menu> <!-- End Other -->
-
-	<Menu>
-		<Name>DesktopSettings</Name>
-		<Directory>lxde-settings.directory</Directory>
-		<Menu>
-			<Name>LXQtSettings</Name>
-			<Directory>lxqt-settings.directory</Directory>
-			<Include>
-				<And>
-					<Category>LXQt</Category>
-					<Or>
-						<Category>Settings</Category>
-						<Category>PackageManager</Category>
-					</Or>
-				</And>
-				<!-- Include some optional components here -->
-				<Filename>obconf-qt.desktop</Filename>
-				<Filename>compton-conf.desktop</Filename>
-				<Filename>pcmanfm-qt-desktop-pref.desktop</Filename>
-			</Include>
-			<Layout>
-				<Filename>lxqt-config.desktop</Filename>
-				<Separator/>
-				<Merge type="menus"/>
-				<Merge type="files"/>
-			</Layout>
-		</Menu>
-		<OnlyUnallocated/>
-		<Include>
-			<Or>
-				<Category>Settings</Category>
-				<Category>PackageManager</Category>
-			</Or>
-		</Include>
-		<Exclude>
-			<Or>
-				<Filename>lxqt-config.desktop</Filename>
-                <Filename>synaptic-kde.desktop</Filename>
-			</Or>
-		</Exclude>
-		<Layout>
-			<Merge type="menus"/>
-			<Merge type="files"/>
-		</Layout>
-	</Menu> <!-- End Settings -->
-
-		<!-- Leave -->
-	<Menu>
-		<Name>X-Leave</Name>
-		<Directory>lxqt-leave.directory</Directory>
-		<Include>
-		<Filename>lubuntu-logout.desktop</Filename>
-		</Include>
-	</Menu> <!-- End Leave -->
-
-	<!-- Screensaver -->
-	<Menu>
-		<Name>Screensaver</Name>
-		<Include>
-		<Filename>lxqt-lockscreen.desktop</Filename>
-		</Include>
-	</Menu> <!-- End Screensaver -->
-
-	<Layout>
-		<Merge type="files"/>
-		<Merge type="menus"/>
-		<Separator/>
-		<Menuname>DesktopSettings</Menuname>
-		<Menuname show_empty="false" inline="true">LXQt-About</Menuname>
-		<Separator/>
-		<Menuname show_empty="false">X-Leave</Menuname>
-		<Menuname show_empty="false" inline="true">Screensaver</Menuname>
-	</Layout>
-
-</Menu> <!-- End Applications -->
diff -Nru lubuntu-default-settings-0.45/src/etc/xdg/lxsession/QLubuntu/desktop.conf lubuntu-default-settings-0.46/src/etc/xdg/lxsession/QLubuntu/desktop.conf
--- lubuntu-default-settings-0.45/src/etc/xdg/lxsession/QLubuntu/desktop.conf	2015-10-23 09:50:05.000000000 +0000
+++ lubuntu-default-settings-0.46/src/etc/xdg/lxsession/QLubuntu/desktop.conf	2016-04-09 19:44:06.000000000 +0000
@@ -86,7 +86,7 @@
 
 [Environment]
 type=lubuntu
-menu_prefix=lxqt-
+menu_prefix=lxde-
 
 [GTK]
 sNet/ThemeName=Lubuntu-default
diff -Nru lubuntu-default-settings-0.45/src/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf lubuntu-default-settings-0.46/src/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf
--- lubuntu-default-settings-0.45/src/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf	2015-10-23 16:04:50.000000000 +0000
+++ lubuntu-default-settings-0.46/src/etc/xdg/pcmanfm/lubuntu/pcmanfm.conf	2016-04-09 19:44:06.000000000 +0000
@@ -7,6 +7,21 @@
 mount_removable=1
 autorun=1
 
+[desktop]
+wallpaper_mode=center
+wallpaper_common=1
+wallpapers_configured=1
+wallpaper0=/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png
+wallpaper=/usr/share/lubuntu/wallpapers/lubuntu-default-wallpaper.png
+desktop_bg=#2e4060
+desktop_fg=#ffffff
+desktop_shadow=#000000
+desktop_font=Ubuntu 11
+sort=mtime;ascending;
+show_documents=0
+show_trash=1
+show_mounts=1
+
 [ui]
 always_show_tabs=0
 max_tab_chars=32
diff -Nru lubuntu-default-settings-0.45/src/usr/share/applications/po/hu.po lubuntu-default-settings-0.46/src/usr/share/applications/po/hu.po
--- lubuntu-default-settings-0.45/src/usr/share/applications/po/hu.po	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.46/src/usr/share/applications/po/hu.po	2016-04-09 19:44:06.000000000 +0000
@@ -0,0 +1,50 @@
+# Hungarian translation for lubuntu-default-settings
+# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
+# This file is distributed under the same license as the lubuntu-default-settings package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lubuntu-default-settings\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-10-27 18:02+0100\n"
+"PO-Revision-Date: 2016-04-03 16:02+0000\n"
+"Last-Translator: Gabor Kelemen <kelemeng@openscope.org>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2016-04-04 05:34+0000\n"
+"X-Generator: Launchpad (build 17972)\n"
+
+#: ../lubuntu-logout.desktop.in.h:1
+msgid "Shutdown"
+msgstr ""
+
+#: ../lubuntu-logout.desktop.in.h:2
+msgid "Shutdown or Reboot"
+msgstr ""
+
+#: ../lubuntu-nexus7-identica.desktop.in.h:1
+msgid "identi.ca"
+msgstr ""
+
+#: ../lubuntu-nexus7-identica.desktop.in.h:2
+msgid "Launching identi.ca"
+msgstr ""
+
+#: ../lubuntu-nexus7-rotate.desktop.in.h:1
+msgid "Rotate your screen"
+msgstr ""
+
+#: ../lubuntu-nexus7-rotate.desktop.in.h:2
+msgid "Rotate your screen using xrotate"
+msgstr "Képernyőforgatás xrotate segítségével"
+
+#: ../lubuntu-screenlock.desktop.in.h:1
+msgid "ScreenLock"
+msgstr "Képernyőzár"
+
+#: ../lubuntu-screenlock.desktop.in.h:2
+msgid "Lock your screen"
+msgstr ""
diff -Nru lubuntu-default-settings-0.45/src/usr/share/applications/po/lt.po lubuntu-default-settings-0.46/src/usr/share/applications/po/lt.po
--- lubuntu-default-settings-0.45/src/usr/share/applications/po/lt.po	1970-01-01 00:00:00.000000000 +0000
+++ lubuntu-default-settings-0.46/src/usr/share/applications/po/lt.po	2016-04-09 19:44:06.000000000 +0000
@@ -0,0 +1,50 @@
+# Lithuanian translation for lubuntu-default-settings
+# Copyright (c) 2016 Rosetta Contributors and Canonical Ltd 2016
+# This file is distributed under the same license as the lubuntu-default-settings package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: lubuntu-default-settings\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-10-27 18:02+0100\n"
+"PO-Revision-Date: 2016-03-16 19:56+0000\n"
+"Last-Translator: Moo <hazap@hotmail.com>\n"
+"Language-Team: Lithuanian <lt@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2016-03-17 05:49+0000\n"
+"X-Generator: Launchpad (build 17947)\n"
+
+#: ../lubuntu-logout.desktop.in.h:1
+msgid "Shutdown"
+msgstr "Išjungti"
+
+#: ../lubuntu-logout.desktop.in.h:2
+msgid "Shutdown or Reboot"
+msgstr "Išjungti ar paleisti iš naujo"
+
+#: ../lubuntu-nexus7-identica.desktop.in.h:1
+msgid "identi.ca"
+msgstr "identi.ca"
+
+#: ../lubuntu-nexus7-identica.desktop.in.h:2
+msgid "Launching identi.ca"
+msgstr "Paleidžiama identi.ca"
+
+#: ../lubuntu-nexus7-rotate.desktop.in.h:1
+msgid "Rotate your screen"
+msgstr "Pasukti ekraną"
+
+#: ../lubuntu-nexus7-rotate.desktop.in.h:2
+msgid "Rotate your screen using xrotate"
+msgstr "Pasukti ekraną, naudojant xrotate"
+
+#: ../lubuntu-screenlock.desktop.in.h:1
+msgid "ScreenLock"
+msgstr "Ekrano rakinimas"
+
+#: ../lubuntu-screenlock.desktop.in.h:2
+msgid "Lock your screen"
+msgstr "Užrakinti ekraną"