Additional XDG compliance fixes.

27 files changed, 176 insertions, 176 deletions

diff --git a/systemsettings/HACKING b/systemsettings/HACKING
index 06ebba6..45d9449 100644
--- a/systemsettings/HACKING
+++ b/systemsettings/HACKING
@@ -17,7 +17,7 @@ kcmultiwidget - A basterdized kcmultidialog from tdelibs/kutil that provides inf
 
 To install a new menu you have to install three files.
 
-(if you have debian, if you have another system use locate to determine where kde-system.* is installed and install in the same place.
+(if you have debian, if you have another system use locate to determine where tde-system.* is installed and install in the same place.
 
 -/etc/xdg/menus/system-settings.menu
 -/etc/xdg/menus/applications-merged/system-settings-merge.menu
diff --git a/systemsettings/kcmodulemenu.h b/systemsettings/kcmodulemenu.h
index 7fbf706..d6b61c0 100644
--- a/systemsettings/kcmodulemenu.h
+++ b/systemsettings/kcmodulemenu.h
@@ -52,7 +52,7 @@ class KCModuleMenuPrivate;
  * \endcode
  *
  * example.directory should be installed in share/desktop-directories/ where files
- * such as kde-system.directory reside.  It is important that it have X-TDE-BaseGroup
+ * such as tde-system.directory reside.  It is important that it have X-TDE-BaseGroup
  * as this value is the class constructor argument.
  * 
  * \code
diff --git a/systemsettings/menu/Makefile.am b/systemsettings/menu/Makefile.am
index 926a135..30ffdf8 100644
--- a/systemsettings/menu/Makefile.am
+++ b/systemsettings/menu/Makefile.am
@@ -7,29 +7,29 @@ xdg_mergedmenu_DATA = system-settings-merge.menu
 xdg_mergedmenudir = $(xdg_menudir)/applications-merged
 
 xdg_directory_DATA = \
-kde-settings-accessibility_ss.directory \
-kde-settings-advanced.directory \
-kde-settings-advancedusersettings.directory \
-kde-settings-appearance.directory \
-kde-settings-computeradministration.directory \
-kde-settings-defaultapplications.directory \
-kde-settings-general.directory \
-kde-settings-keyboardmouse.directory \
-kde-settings-laptops.directory \
-kde-settings-looknfeel2.directory \
-kde-settings-networkconnections.directory \
-kde-settings-networkconnectivity.directory \
-kde-settings-networksettings.directory \
-kde-settings-notifications.directory \
-kde-settings-panel.directory \
-kde-settings-personal.directory \
-kde-settings-power.directory \
-kde-settings-regional.directory \
-kde-settings-sharing.directory \
-kde-settings-splashscreen.directory \
-kde-settings-system.directory \
-kde-settings-useraccount.directory \
-kde-settings-windowbehavior.directory \
+tde-settings-accessibility_ss.directory \
+tde-settings-advanced.directory \
+tde-settings-advancedusersettings.directory \
+tde-settings-appearance.directory \
+tde-settings-computeradministration.directory \
+tde-settings-defaultapplications.directory \
+tde-settings-general.directory \
+tde-settings-keyboardmouse.directory \
+tde-settings-laptops.directory \
+tde-settings-looknfeel2.directory \
+tde-settings-networkconnections.directory \
+tde-settings-networkconnectivity.directory \
+tde-settings-networksettings.directory \
+tde-settings-notifications.directory \
+tde-settings-panel.directory \
+tde-settings-personal.directory \
+tde-settings-power.directory \
+tde-settings-regional.directory \
+tde-settings-sharing.directory \
+tde-settings-splashscreen.directory \
+tde-settings-system.directory \
+tde-settings-useraccount.directory \
+tde-settings-windowbehavior.directory \
 system-settings.directory
 
 #install-data-local:
diff --git a/systemsettings/menu/system-settings.menu b/systemsettings/menu/system-settings.menu
index a9b5a3b..26879df 100644
--- a/systemsettings/menu/system-settings.menu
+++ b/systemsettings/menu/system-settings.menu
@@ -18,7 +18,7 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 	<!-- General page -->
 	<Menu>
 		<Name>General</Name>
-		<Directory>kde-settings-general.directory</Directory>
+		<Directory>tde-settings-general.directory</Directory>
 
 		<Layout>
 			<Menuname>Personal</Menuname>
@@ -33,8 +33,8 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 		<!-- Personal -->
 		<Menu>
 			<Name>Personal</Name>
-			<Directory>kde-settings-personal.directory</Directory>
-		
+			<Directory>tde-settings-personal.directory</Directory>
+
 			<Layout>
 				<Menuname>User Account</Menuname>
 				<Menuname>Regional</Menuname>
@@ -49,15 +49,15 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 			<!-- User Account -->
 			<Menu>
 				<Name>User Account</Name>
-				<Directory>kde-settings-useraccount.directory</Directory>
+				<Directory>tde-settings-useraccount.directory</Directory>
 				<Layout>
-					<Filename>kde-kcm_useraccount.desktop</Filename>
-					<Filename>kde-desktoppath.desktop</Filename>
+					<Filename>tde-kcm_useraccount.desktop</Filename>
+					<Filename>tde-desktoppath.desktop</Filename>
 					<Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-kcm_useraccount.desktop</Filename>
-					<Filename>kde-desktoppath.desktop</Filename>
+					<Filename>tde-kcm_useraccount.desktop</Filename>
+					<Filename>tde-desktoppath.desktop</Filename>
 					<Category>X-TDE-systemsettings-personal-useraccount</Category>
 				</Include>
 			</Menu>
@@ -65,17 +65,17 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 			<!-- Regional -->
 			<Menu>
 				<Name>Regional</Name>
-				<Directory>kde-settings-regional.directory</Directory>
+				<Directory>tde-settings-regional.directory</Directory>
 				<Layout>
-					<Filename>kde-language.desktop</Filename>
-					<Filename>kde-spellchecking.desktop</Filename>
-					<Filename>kde-keyboard_layout.desktop</Filename>
+					<Filename>tde-language.desktop</Filename>
+					<Filename>tde-spellchecking.desktop</Filename>
+					<Filename>tde-keyboard_layout.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-language.desktop</Filename>
-					<Filename>kde-spellchecking.desktop</Filename>
-					<Filename>kde-keyboard_layout.desktop</Filename>
+					<Filename>tde-language.desktop</Filename>
+					<Filename>tde-spellchecking.desktop</Filename>
+					<Filename>tde-keyboard_layout.desktop</Filename>
 					<Category>X-TDE-systemsettings-personal-regional</Category>
 				</Include>
 			</Menu>
@@ -83,15 +83,15 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 			<!-- Accessibility -->
 			<Menu>
 				<Name>Accessibility</Name>
-				<Directory>kde-settings-accessibility_ss.directory</Directory>
+				<Directory>tde-settings-accessibility_ss.directory</Directory>
 				<Layout>
-					<Filename>kde-kcmaccess.desktop</Filename>
-					<Filename>kde-khotkeys.desktop</Filename>
+					<Filename>tde-kcmaccess.desktop</Filename>
+					<Filename>tde-khotkeys.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-kcmaccess.desktop</Filename>
-					<Filename>kde-khotkeys.desktop</Filename>
+					<Filename>tde-kcmaccess.desktop</Filename>
+					<Filename>tde-khotkeys.desktop</Filename>
 					<Category>X-TDE-systemsettings-personal-accessibility</Category>
 				</Include>
 			</Menu>
@@ -99,100 +99,100 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 			<!-- Default Applications -->
 			<Menu>
 				<Name>Default Applications</Name>
-				<Directory>kde-settings-defaultapplications.directory</Directory>
+				<Directory>tde-settings-defaultapplications.directory</Directory>
 				<Layout>
-					<Filename>kde-defaultapplication.desktop</Filename>
-					<Filename>kde-filetypes.desktop</Filename>
+					<Filename>tde-defaultapplication.desktop</Filename>
+					<Filename>tde-filetypes.desktop</Filename>
 					<Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-defaultapplication.desktop</Filename>
-					<Filename>kde-filetypes.desktop</Filename>
+					<Filename>tde-defaultapplication.desktop</Filename>
+					<Filename>tde-filetypes.desktop</Filename>
 					<Category>X-TDE-systemsettings-personal</Category>
 				</Include>
 			</Menu>
 
 		</Menu>
 
-	
+
 		<!-- Look and Feel -->
 		<Menu>
 			<Name>Look and Feel</Name>
-			<Directory>kde-settings-looknfeel2.directory</Directory>
+			<Directory>tde-settings-looknfeel2.directory</Directory>
 			<Layout>
 				<Menuname>Appearance</Menuname>
 				<Menuname>Desktop</Menuname>
-				<Filename>kde-ksplashthememgr.desktop</Filename>
+				<Filename>tde-ksplashthememgr.desktop</Filename>
 				<Menuname>Window Behavior</Menuname>
 				<Menuname>Notifications</Menuname>
 				<Merge type="files" />
 			</Layout>
 			<Include>
-				<Filename>kde-ksplashthememgr.desktop</Filename>
+				<Filename>tde-ksplashthememgr.desktop</Filename>
 				<Category>X-TDE-systemsettings-lookandfeel</Category>
 			</Include>
-	
+
 			<!-- Appearance -->
 			<Menu>
 				<Name>Appearance</Name>
-				<Directory>kde-settings-appearance.directory</Directory>
+				<Directory>tde-settings-appearance.directory</Directory>
 				<Layout>
-					<Filename>kde-colors.desktop</Filename>
-					<Filename>kde-fonts.desktop</Filename>
+					<Filename>tde-colors.desktop</Filename>
+					<Filename>tde-fonts.desktop</Filename>
 					<Filename>kcmgtk-xdg.desktop</Filename>
-					<Filename>kde-kcmfontinst.desktop</Filename>
-					<Filename>kde-icons.desktop</Filename>
-					<Filename>kde-style.desktop</Filename>
-					<Filename>kde-twindecoration.desktop</Filename>
+					<Filename>tde-kcmfontinst.desktop</Filename>
+					<Filename>tde-icons.desktop</Filename>
+					<Filename>tde-style.desktop</Filename>
+					<Filename>tde-twindecoration.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-colors.desktop</Filename>
-					<Filename>kde-fonts.desktop</Filename>
+					<Filename>tde-colors.desktop</Filename>
+					<Filename>tde-fonts.desktop</Filename>
 					<Filename>kcmgtk-xdg.desktop</Filename>
-					<Filename>kde-kcmfontinst.desktop</Filename>
-					<Filename>kde-icons.desktop</Filename>
-					<Filename>kde-style.desktop</Filename>
-					<Filename>kde-twindecoration.desktop</Filename>
+					<Filename>tde-kcmfontinst.desktop</Filename>
+					<Filename>tde-icons.desktop</Filename>
+					<Filename>tde-style.desktop</Filename>
+					<Filename>tde-twindecoration.desktop</Filename>
 					<Category>X-TDE-systemsettings-lookandfeel-appearance</Category>
 				</Include>
 			</Menu>
-	
+
 			<!-- Desktop -->
 			<Menu>
 				<Name>Desktop</Name>
-				<Directory>kde-settings-desktop.directory</Directory>
-	
+				<Directory>tde-settings-desktop.directory</Directory>
+
 				<Layout>
-					<Filename>kde-background.desktop</Filename>
-					<Filename>kde-screensaver.desktop</Filename>
-					<Filename>kde-desktopbehavior.desktop</Filename>
-					<Filename>kde-desktop.desktop</Filename>
+					<Filename>tde-background.desktop</Filename>
+					<Filename>tde-screensaver.desktop</Filename>
+					<Filename>tde-desktopbehavior.desktop</Filename>
+					<Filename>tde-desktop.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
-	
+
 				<Include>
-					<Filename>kde-background.desktop</Filename>
-					<Filename>kde-screensaver.desktop</Filename>
-					<Filename>kde-desktopbehavior.desktop</Filename>
-					<Filename>kde-desktop.desktop</Filename>
+					<Filename>tde-background.desktop</Filename>
+					<Filename>tde-screensaver.desktop</Filename>
+					<Filename>tde-desktopbehavior.desktop</Filename>
+					<Filename>tde-desktop.desktop</Filename>
 					<Category>X-TDE-systemsettings-lookandfeel-desktop</Category>
 				</Include>
 			</Menu>
-	
+
 			<!-- Window Behavior -->
 			<Menu>
 				<Name>Window Behavior</Name>
-				<Directory>kde-settings-windowbehavior.directory</Directory>
-	
+				<Directory>tde-settings-windowbehavior.directory</Directory>
+
 				<Layout>
-					<Filename>kde-twinoptions.desktop</Filename>
-					<Filename>kde-twinrules.desktop</Filename>
+					<Filename>tde-twinoptions.desktop</Filename>
+					<Filename>tde-twinrules.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-twinoptions.desktop</Filename>
-					<Filename>kde-twinrules.desktop</Filename>
+					<Filename>tde-twinoptions.desktop</Filename>
+					<Filename>tde-twinrules.desktop</Filename>
 					<Category>X-TDE-systemsettings-lookandfeel-windowbehavior</Category>
 				</Include>
 			</Menu>
@@ -200,80 +200,80 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 			<!-- Notifications -->
 			<Menu>
 				<Name>Notifications</Name>
-				<Directory>kde-settings-notifications.directory</Directory>
-	
+				<Directory>tde-settings-notifications.directory</Directory>
+
 				<Layout>
-					<Filename>kde-kcmnotify.desktop</Filename>
-					<Filename>kde-bell.desktop</Filename>
-					<Filename>kde-medianotifications.desktop</Filename>
+					<Filename>tde-kcmnotify.desktop</Filename>
+					<Filename>tde-bell.desktop</Filename>
+					<Filename>tde-medianotifications.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-kcmnotify.desktop</Filename>
-					<Filename>kde-bell.desktop</Filename>
-					<Filename>kde-medianotifications.desktop</Filename>
+					<Filename>tde-kcmnotify.desktop</Filename>
+					<Filename>tde-bell.desktop</Filename>
+					<Filename>tde-medianotifications.desktop</Filename>
 					<Category>X-TDE-systemsettings-lookandfeel-notifications</Category>
 				</Include>
 			</Menu>
-	
+
 		</Menu>
-	
+
 		<!-- Computer Administration -->
 		<Menu>
 			<Name>Computer Administration</Name>
-			<Directory>kde-settings-computeradministration.directory</Directory>
-	
+			<Directory>tde-settings-computeradministration.directory</Directory>
+
 			<Layout>
-				<Filename>kde-clock.desktop</Filename>
+				<Filename>tde-clock.desktop</Filename>
 				<Menuname>Keyboard and Mouse</Menuname>
-				<Filename>kde-displayconfig.desktop</Filename>
-				<Filename>kde-arts.desktop</Filename>
-				<Filename>kde-printers.desktop</Filename>
-<!--				<Filename>kde-laptoppowermanagement.desktop</Filename>-->
-	<!--			<Filename>kde-thinkpad.desktop</Filename>
-				<Filename>kde-kvaio.desktop</Filename>-->
-				<Filename>kde-userconfig.desktop</Filename>
+				<Filename>tde-displayconfig.desktop</Filename>
+				<Filename>tde-arts.desktop</Filename>
+				<Filename>tde-printers.desktop</Filename>
+<!--				<Filename>tde-laptoppowermanagement.desktop</Filename>-->
+	<!--			<Filename>tde-thinkpad.desktop</Filename>
+				<Filename>tde-kvaio.desktop</Filename>-->
+				<Filename>tde-userconfig.desktop</Filename>
 				<Merge type="files" />
 			</Layout>
 			<Include>
-				<Filename>kde-clock.desktop</Filename>
-				<Filename>kde-displayconfig.desktop</Filename>
-				<Filename>kde-arts.desktop</Filename>
-				<Filename>kde-printers.desktop</Filename>
-<!--				<Filename>kde-laptoppowermanagement.desktop</Filename>-->
-	<!--			<Filename>kde-thinkpad.desktop</Filename>
-				<Filename>kde-kvaio.desktop</Filename>-->
-				<Filename>kde-userconfig.desktop</Filename>
+				<Filename>tde-clock.desktop</Filename>
+				<Filename>tde-displayconfig.desktop</Filename>
+				<Filename>tde-arts.desktop</Filename>
+				<Filename>tde-printers.desktop</Filename>
+<!--				<Filename>tde-laptoppowermanagement.desktop</Filename>-->
+	<!--			<Filename>tde-thinkpad.desktop</Filename>
+				<Filename>tde-kvaio.desktop</Filename>-->
+				<Filename>tde-userconfig.desktop</Filename>
 				<Category>X-TDE-systemsettings-administration</Category>
 			</Include>
-	
+
 			<!-- Keyboard and Mouse -->
 			<Menu>
 				<Name>Keyboard and Mouse</Name>
-				<Directory>kde-settings-keyboardmouse.directory</Directory>
+				<Directory>tde-settings-keyboardmouse.directory</Directory>
 				<Layout>
-					<Filename>kde-keyboard.desktop</Filename>
-					<Filename>kde-keys.desktop</Filename>
-					<Filename>kde-mouse.desktop</Filename>
-					<Filename>kde-joystick.desktop</Filename>
+					<Filename>tde-keyboard.desktop</Filename>
+					<Filename>tde-keys.desktop</Filename>
+					<Filename>tde-mouse.desktop</Filename>
+					<Filename>tde-joystick.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
 				<Include>
-					<Filename>kde-keyboard.desktop</Filename>
-					<Filename>kde-keys.desktop</Filename>
-					<Filename>kde-mouse.desktop</Filename>
-					<Filename>kde-joystick.desktop</Filename>
+					<Filename>tde-keyboard.desktop</Filename>
+					<Filename>tde-keys.desktop</Filename>
+					<Filename>tde-mouse.desktop</Filename>
+					<Filename>tde-joystick.desktop</Filename>
 					<Category>X-TDE-systemsettings-administration-keyboardmouse</Category>
 				</Include>
 			</Menu>
-	
+
 		</Menu>
-	
+
 		<!-- Network and Connectivity -->
 		<Menu>
 			<Name>Network and Connectivity</Name>
-			<Directory>kde-settings-networkconnectivity.directory</Directory>
-			
+			<Directory>tde-settings-networkconnectivity.directory</Directory>
+
 			<Layout>
 				<Menuname>Network Settings</Menuname>
 				<Menuname>Sharing</Menuname>
@@ -283,45 +283,45 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 			<Include>
 				<Category>X-TDE-systemsettings-network</Category>
 			</Include>
-	
+
 			<!-- Network Settings -->
 			<Menu>
 				<Name>Network Settings</Name>
-				<Directory>kde-settings-networksettings.directory</Directory>
-			
+				<Directory>tde-settings-networksettings.directory</Directory>
+
 				<Layout>
-					<Filename>kde-kcm_knetworkconfmodule_ss.desktop</Filename>
-					<Filename>kde-proxy.desktop</Filename>
-					<Filename>kde-netpref.desktop</Filename>
-					<Filename>kde-kcm_kdnssd.desktop</Filename>
+					<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename>
+					<Filename>tde-proxy.desktop</Filename>
+					<Filename>tde-netpref.desktop</Filename>
+					<Filename>tde-kcm_kdnssd.desktop</Filename>
                                         <Merge type="files" />
-				</Layout>		
-	
+				</Layout>
+
 				<Include>
-					<Filename>kde-kcm_knetworkconfmodule_ss.desktop</Filename>
-					<Filename>kde-proxy.desktop</Filename>
-					<Filename>kde-netpref.desktop</Filename>
-					<Filename>kde-kcm_kdnssd.desktop</Filename>
+					<Filename>tde-kcm_knetworkconfmodule_ss.desktop</Filename>
+					<Filename>tde-proxy.desktop</Filename>
+					<Filename>tde-netpref.desktop</Filename>
+					<Filename>tde-kcm_kdnssd.desktop</Filename>
 					<Category>X-TDE-systemsettings-network-networksettings</Category>
 				</Include>
 			</Menu>
-	
+
 			<!-- Sharing -->
 			<Menu>
 				<Name>Sharing</Name>
-				<Directory>kde-settings-sharing.directory</Directory>
-	
+				<Directory>tde-settings-sharing.directory</Directory>
+
 				<Layout>
-					<Filename>kde-kcmkrfb.desktop</Filename>
-					<Filename>kde-fileshare.desktop</Filename>
-					<Filename>kde-lanbrowser.desktop</Filename>
+					<Filename>tde-kcmkrfb.desktop</Filename>
+					<Filename>tde-fileshare.desktop</Filename>
+					<Filename>tde-lanbrowser.desktop</Filename>
                                         <Merge type="files" />
 				</Layout>
-				
+
 				<Include>
-					<Filename>kde-kcmkrfb.desktop</Filename>
-					<Filename>kde-fileshare.desktop</Filename>
-					<Filename>kde-lanbrowser.desktop</Filename>
+					<Filename>tde-kcmkrfb.desktop</Filename>
+					<Filename>tde-fileshare.desktop</Filename>
+					<Filename>tde-lanbrowser.desktop</Filename>
 					<Category>X-TDE-systemsettings-network-sharing</Category>
 				</Include>
 			</Menu>
@@ -329,10 +329,10 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 	</Menu>
 
 	<!-- Advanced -->
-	<Menu>	
+	<Menu>
 		<Name>Advanced</Name>
 
-		<Directory>kde-settings-advanced.directory</Directory>
+		<Directory>tde-settings-advanced.directory</Directory>
 		<Layout>
 			<Menuname>System</Menuname>
 			<Separator/>
@@ -342,44 +342,44 @@ https://wiki.kubuntu.org/KubuntuSystemSettingsUsability
 		<!-- System Administration -->
 		<Menu>
 			<Name>System</Name>
-			<Directory>kde-settings-system.directory</Directory>
-	
+			<Directory>tde-settings-system.directory</Directory>
+
 			<Layout>
-				<Filename>kde-mountconfig.desktop</Filename>
-				<Filename>kde-serviceconfig.desktop</Filename>
-				<Filename>kde-tdm.desktop</Filename>
+				<Filename>tde-mountconfig.desktop</Filename>
+				<Filename>tde-serviceconfig.desktop</Filename>
+				<Filename>tde-tdm.desktop</Filename>
 				<Merge type="files" />
 			</Layout>
-	
+
 			<Include>
-				<Filename>kde-mountconfig.desktop</Filename>
-				<Filename>kde-serviceconfig.desktop</Filename>
-				<Filename>kde-tdm.desktop</Filename>
+				<Filename>tde-mountconfig.desktop</Filename>
+				<Filename>tde-serviceconfig.desktop</Filename>
+				<Filename>tde-tdm.desktop</Filename>
 				<Category>X-TDE-systemsettings-advancedadministration</Category>
 			</Include>
 		</Menu>
-	
+
 		<!-- Advanced User Settings -->
 		<Menu>
 			<Name>Advanced User Settings</Name>
-			<Directory>kde-settings-advancedusersettings.directory</Directory>
-	
+			<Directory>tde-settings-advancedusersettings.directory</Directory>
+
 			<Layout>
-				<Filename>kde-audioencoding.desktop</Filename>
-				<Filename>kde-kresources.desktop</Filename>
-				<Filename>kde-kcmkded.desktop</Filename>
-				<Filename>kde-kcmsmserver.desktop</Filename>
+				<Filename>tde-audioencoding.desktop</Filename>
+				<Filename>tde-kresources.desktop</Filename>
+				<Filename>tde-kcmkded.desktop</Filename>
+				<Filename>tde-kcmsmserver.desktop</Filename>
 				<Merge type="files" />
 			</Layout>
-	
+
 			<Include>
-				<Filename>kde-audioencoding.desktop</Filename>
-				<Filename>kde-kresources.desktop</Filename>
-				<Filename>kde-kcmkded.desktop</Filename>
-				<Filename>kde-kcmsmserver.desktop</Filename>
+				<Filename>tde-audioencoding.desktop</Filename>
+				<Filename>tde-kresources.desktop</Filename>
+				<Filename>tde-kcmkded.desktop</Filename>
+				<Filename>tde-kcmsmserver.desktop</Filename>
 				<Category>X-TDE-systemsettings-advancedusersettings</Category>
 			</Include>
 		</Menu>
-	</Menu>	
+	</Menu>
 </Menu>
 
diff --git a/systemsettings/menu/kde-settings-accessibility_ss.directory b/systemsettings/menu/tde-settings-accessibility_ss.directory
index f782e4a..f782e4a 100644
--- a/systemsettings/menu/kde-settings-accessibility_ss.directory
+++ b/systemsettings/menu/tde-settings-accessibility_ss.directory
diff --git a/systemsettings/menu/kde-settings-advanced.directory b/systemsettings/menu/tde-settings-advanced.directory
index 3da800f..3da800f 100644
--- a/systemsettings/menu/kde-settings-advanced.directory
+++ b/systemsettings/menu/tde-settings-advanced.directory
diff --git a/systemsettings/menu/kde-settings-advancedusersettings.directory b/systemsettings/menu/tde-settings-advancedusersettings.directory
index b8815b4..b8815b4 100644
--- a/systemsettings/menu/kde-settings-advancedusersettings.directory
+++ b/systemsettings/menu/tde-settings-advancedusersettings.directory
diff --git a/systemsettings/menu/kde-settings-appearance.directory b/systemsettings/menu/tde-settings-appearance.directory
index 4986cd1..4986cd1 100644
--- a/systemsettings/menu/kde-settings-appearance.directory
+++ b/systemsettings/menu/tde-settings-appearance.directory
diff --git a/systemsettings/menu/kde-settings-computeradministration.directory b/systemsettings/menu/tde-settings-computeradministration.directory
index 04c5857..04c5857 100644
--- a/systemsettings/menu/kde-settings-computeradministration.directory
+++ b/systemsettings/menu/tde-settings-computeradministration.directory
diff --git a/systemsettings/menu/kde-settings-defaultapplications.directory b/systemsettings/menu/tde-settings-defaultapplications.directory
index a37d8af..a37d8af 100644
--- a/systemsettings/menu/kde-settings-defaultapplications.directory
+++ b/systemsettings/menu/tde-settings-defaultapplications.directory
diff --git a/systemsettings/menu/kde-settings-general.directory b/systemsettings/menu/tde-settings-general.directory
index 05b47ca..05b47ca 100644
--- a/systemsettings/menu/kde-settings-general.directory
+++ b/systemsettings/menu/tde-settings-general.directory
diff --git a/systemsettings/menu/kde-settings-keyboardmouse.directory b/systemsettings/menu/tde-settings-keyboardmouse.directory
index 1c44173..1c44173 100644
--- a/systemsettings/menu/kde-settings-keyboardmouse.directory
+++ b/systemsettings/menu/tde-settings-keyboardmouse.directory
diff --git a/systemsettings/menu/kde-settings-laptops.directory b/systemsettings/menu/tde-settings-laptops.directory
index 19e528a..19e528a 100644
--- a/systemsettings/menu/kde-settings-laptops.directory
+++ b/systemsettings/menu/tde-settings-laptops.directory
diff --git a/systemsettings/menu/kde-settings-looknfeel2.directory b/systemsettings/menu/tde-settings-looknfeel2.directory
index 9e08a68..9e08a68 100644
--- a/systemsettings/menu/kde-settings-looknfeel2.directory
+++ b/systemsettings/menu/tde-settings-looknfeel2.directory
diff --git a/systemsettings/menu/kde-settings-networkconnections.directory b/systemsettings/menu/tde-settings-networkconnections.directory
index d8ab424..d8ab424 100644
--- a/systemsettings/menu/kde-settings-networkconnections.directory
+++ b/systemsettings/menu/tde-settings-networkconnections.directory
diff --git a/systemsettings/menu/kde-settings-networkconnectivity.directory b/systemsettings/menu/tde-settings-networkconnectivity.directory
index b9ff8ba..b9ff8ba 100644
--- a/systemsettings/menu/kde-settings-networkconnectivity.directory
+++ b/systemsettings/menu/tde-settings-networkconnectivity.directory
diff --git a/systemsettings/menu/kde-settings-networksettings.directory b/systemsettings/menu/tde-settings-networksettings.directory
index aeb8b98..aeb8b98 100644
--- a/systemsettings/menu/kde-settings-networksettings.directory
+++ b/systemsettings/menu/tde-settings-networksettings.directory
diff --git a/systemsettings/menu/kde-settings-notifications.directory b/systemsettings/menu/tde-settings-notifications.directory
index 6c76a92..6c76a92 100644
--- a/systemsettings/menu/kde-settings-notifications.directory
+++ b/systemsettings/menu/tde-settings-notifications.directory
diff --git a/systemsettings/menu/kde-settings-panel.directory b/systemsettings/menu/tde-settings-panel.directory
index f96ca50..f96ca50 100644
--- a/systemsettings/menu/kde-settings-panel.directory
+++ b/systemsettings/menu/tde-settings-panel.directory
diff --git a/systemsettings/menu/kde-settings-personal.directory b/systemsettings/menu/tde-settings-personal.directory
index e154385..e154385 100644
--- a/systemsettings/menu/kde-settings-personal.directory
+++ b/systemsettings/menu/tde-settings-personal.directory
diff --git a/systemsettings/menu/kde-settings-power.directory b/systemsettings/menu/tde-settings-power.directory
index 4805e7a..4805e7a 100644
--- a/systemsettings/menu/kde-settings-power.directory
+++ b/systemsettings/menu/tde-settings-power.directory
diff --git a/systemsettings/menu/kde-settings-regional.directory b/systemsettings/menu/tde-settings-regional.directory
index 47d9e36..47d9e36 100644
--- a/systemsettings/menu/kde-settings-regional.directory
+++ b/systemsettings/menu/tde-settings-regional.directory
diff --git a/systemsettings/menu/kde-settings-sharing.directory b/systemsettings/menu/tde-settings-sharing.directory
index ff92dd2..ff92dd2 100644
--- a/systemsettings/menu/kde-settings-sharing.directory
+++ b/systemsettings/menu/tde-settings-sharing.directory
diff --git a/systemsettings/menu/kde-settings-splashscreen.directory b/systemsettings/menu/tde-settings-splashscreen.directory
index de1677a..de1677a 100644
--- a/systemsettings/menu/kde-settings-splashscreen.directory
+++ b/systemsettings/menu/tde-settings-splashscreen.directory
diff --git a/systemsettings/menu/kde-settings-system.directory b/systemsettings/menu/tde-settings-system.directory
index 18002fe..18002fe 100644
--- a/systemsettings/menu/kde-settings-system.directory
+++ b/systemsettings/menu/tde-settings-system.directory
diff --git a/systemsettings/menu/kde-settings-useraccount.directory b/systemsettings/menu/tde-settings-useraccount.directory
index e22990b..e22990b 100644
--- a/systemsettings/menu/kde-settings-useraccount.directory
+++ b/systemsettings/menu/tde-settings-useraccount.directory
diff --git a/systemsettings/menu/kde-settings-windowbehavior.directory b/systemsettings/menu/tde-settings-windowbehavior.directory
index 54242ed..54242ed 100644
--- a/systemsettings/menu/kde-settings-windowbehavior.directory
+++ b/systemsettings/menu/tde-settings-windowbehavior.directory