diff --git a/acinclude.m4 b/acinclude.m4
index 178d002..d98e86b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -489,7 +489,7 @@ if test "$1" = "default"; then
     kde_widgetdir='\${libdir}/trinity/plugins/designer'
   fi
   if test -z "$xdg_appsdir"; then
-    xdg_appsdir='\${datadir}/applications/kde'
+    xdg_appsdir='\${datadir}/applications/tde'
   fi
   if test -z "$xdg_menudir"; then
     xdg_menudir='\${sysconfdir}/xdg/menus'
diff --git a/aclocal.m4 b/aclocal.m4
index 72d99c2..55c229e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -501,7 +501,7 @@ if test "$1" = "default"; then
     kde_widgetdir='\${libdir}/trinity/plugins/designer'
   fi
   if test -z "$xdg_appsdir"; then
-    xdg_appsdir='\${datadir}/applications/kde'
+    xdg_appsdir='\${datadir}/applications/tde'
   fi
   if test -z "$xdg_menudir"; then
     xdg_menudir='\${sysconfdir}/xdg/menus'
diff --git a/admin b/admin
index 06098ef..4af57bf 160000
--- a/admin
+++ b/admin
@@ -1 +1 @@
-Subproject commit 06098efaf31973c11d7dd89ae291e6844b132e1a
+Subproject commit 4af57bf22967e6ad80ab898980ed505df6eae5b0
diff --git a/cmake b/cmake
index e47cc63..d2f658c 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit e47cc63e66a12ca6b740500b76f385336ee40dbc
+Subproject commit d2f658ca47faefe569bcd1885b9238691fa13280
diff --git a/systemsettings/HACKING b/systemsettings/HACKING
index 0bd23d0..06ebba6 100644
--- a/systemsettings/HACKING
+++ b/systemsettings/HACKING
@@ -26,6 +26,6 @@ To install a new menu you have to install three files.
 Also don't forget to install the ui file.
 -/share/apps/systemsettings/systempreferencesui.rc
 And the desktop file.
--share/applications/kde/systemsettings.desktop
+-share/applications/tde/systemsettings.desktop
 
 When you change (or install) any of the first three files make sure to run kbuildsycoca to re-generate the cache files or log out and back in.
diff --git a/systemsettings/menu/audioencoding.desktop b/systemsettings/menu/audioencoding.desktop
index 2e56ee9..7749ac9 100644
--- a/systemsettings/menu/audioencoding.desktop
+++ b/systemsettings/menu/audioencoding.desktop
@@ -4,8 +4,8 @@ Exec=kcmshell audiocd
 Icon=cdaudio_unmount
 Type=Application
 
-X-KDE-ModuleType=Library
-X-KDE-Library=audiocd
+X-TDE-ModuleType=Library
+X-TDE-Library=audiocd
 
 Name=Audio Encoding
 Name[ar]=ترميز صوت
@@ -53,4 +53,4 @@ Keywords[pt_BR]=CD de áudio,CD,Ogg,Vorbis,codificação, CDDA, taxa de bits
 Keywords[sv]=ljud-cd,cd,Ogg,Vorbis,kodning,CDDA,bithastighet
 
 ## keep this out of kcontrol
-#Categories=Qt;KDE;X-KDE-settings-sound;
+#Categories=Qt;TDE;X-TDE-settings-sound;
diff --git a/systemsettings/menu/defaultapplication.desktop b/systemsettings/menu/defaultapplication.desktop
index 6c11a13..b5a53aa 100644
--- a/systemsettings/menu/defaultapplication.desktop
+++ b/systemsettings/menu/defaultapplication.desktop
@@ -4,9 +4,9 @@ Exec=kcmshell defaultapplication
 Icon=blockdevice
 Type=Application
 
-X-KDE-Library=componentchooser
+X-TDE-Library=componentchooser
 
-X-KDE-ParentApp=kcontrol
+X-TDE-ParentApp=kcontrol
 
 Name=Default Applications
 Name[ar]=التطبيقات الإفتراضية
@@ -94,4 +94,4 @@ Keywords[sv]=komponenter,komponentväljare,resurser,epost-klient,terminalemulato
 Keywords[tr]=bileşenler,bileşen seçici,kaynaklar,e-posta istemci,uçbirim emülatörü,öntanımlı,tarayıcı
 Keywords[xx]=xxcomponents,component chooser,resources, email client, terminal emulator, default, browserxx
 Keywords[zh_CN]=components,component chooser,resources,email client,terminal emulator,default,browser,组件,组件选择器,资源,电子邮件客户端,终端模拟器,默认,浏览器
-Categories=Qt;KDE;X-KDE-settings-components;
+Categories=Qt;TDE;X-TDE-settings-components;
diff --git a/systemsettings/menu/kcm_knetworkconfmodule_ss.desktop b/systemsettings/menu/kcm_knetworkconfmodule_ss.desktop
index 14ccab8..46cf415 100644
--- a/systemsettings/menu/kcm_knetworkconfmodule_ss.desktop
+++ b/systemsettings/menu/kcm_knetworkconfmodule_ss.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Encoding=UTF-8
-X-KDE-RootOnly=true
+X-TDE-RootOnly=true
 
 ## Keep this out of kcontrol
-#Categories=QT;KDE;X-KDE-settings-network;Configuration-KDE-Network-mdk;
-X-KDE-ModuleType=Library
-X-KDE-Library=knetworkconfmodule
-X-KDE-FactoryName=knetworkconfmodule
+#Categories=QT;TDE;X-TDE-settings-network;Configuration-KDE-Network-mdk;
+X-TDE-ModuleType=Library
+X-TDE-Library=knetworkconfmodule
+X-TDE-FactoryName=knetworkconfmodule
 Type=Application
 Exec=kcmshell kcm_knetworkconfmodule
 Icon=knetworkconf
diff --git a/systemsettings/menu/kcmfontinst.desktop b/systemsettings/menu/kcmfontinst.desktop
index 40b4627..ed6022b 100644
--- a/systemsettings/menu/kcmfontinst.desktop
+++ b/systemsettings/menu/kcmfontinst.desktop
@@ -6,11 +6,11 @@ Type=Application
 DocPath=kcontrol/kcmfontinst/index.html
 
 
-X-KDE-Library=fontinst
-X-KDE-FactoryName=fontinst
-X-KDE-RootOnly=true
+X-TDE-Library=fontinst
+X-TDE-FactoryName=fontinst
+X-TDE-RootOnly=true
 
-X-KDE-ParentApp=kcontrol
+X-TDE-ParentApp=kcontrol
 
 Name=Fonts
 Name[ar]=المحارف
@@ -109,4 +109,4 @@ Keywords[tr]=yazıtipi,yazıtipleri,kurulum programı,trutype,type1,speedo,bit e
 Keywords[xx]=xxfont,fonts,installer,truetype,type1,speedo,bitmapxx
 Keywords[zh_CN]=font,fonts,installer,truetype,type1,speedo,bitmap,字体,安装器,位图
 
-Categories=Qt;KDE;X-KDE-settings-system;
+Categories=Qt;TDE;X-TDE-settings-system;
diff --git a/systemsettings/menu/laptoppowermanagement.desktop b/systemsettings/menu/laptoppowermanagement.desktop
index aacb3af..1be9319 100644
--- a/systemsettings/menu/laptoppowermanagement.desktop
+++ b/systemsettings/menu/laptoppowermanagement.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
 Encoding=UTF-8
-X-KDE-Library=laptop
-X-KDE-FactoryName=laptop
-X-KDE-Init=laptop
+X-TDE-Library=laptop
+X-TDE-FactoryName=laptop
+X-TDE-Init=laptop
 Exec=kcmshell laptop
 Icon=laptop_battery
 Type=Application
 DocPath=kcontrol/laptop/index.html
 
 ## Keep this out of kcontrol
-#Categories=Qt;KDE;X-KDE-settings-power;
+#Categories=Qt;TDE;X-TDE-settings-power;
 
 Comment=Laptop Power Management
 Comment[ar]=تدبير الطاقة للحاسوب النقال
diff --git a/systemsettings/menu/medianotifications.desktop b/systemsettings/menu/medianotifications.desktop
index a65ec47..ca2a26b 100644
--- a/systemsettings/menu/medianotifications.desktop
+++ b/systemsettings/menu/medianotifications.desktop
@@ -6,9 +6,9 @@ Icon=system
 Exec=kcmshell media
 
 
-X-KDE-Library=media
-X-KDE-FactoryName=media
-#X-KDE-ParentApp=kcontrol
+X-TDE-Library=media
+X-TDE-FactoryName=media
+#X-TDE-ParentApp=kcontrol
 
 Name=Storage Media Notifications
 Name[ar]=تبليغات وسائط التخزين
@@ -54,4 +54,4 @@ Keywords[pt]=armazenamento,meio,suporte,usb,cdrom,dispositivo
 Keywords[pt_BR]=armazenamento,mídia,usb,cdrom,dispositivo
 Keywords[sv]=lagring,media,usb,cdrom,enhet
 
-#Categories=Qt;KDE;X-KDE-settings-peripherals
+#Categories=Qt;TDE;X-TDE-settings-peripherals
diff --git a/systemsettings/systemsettings.desktop b/systemsettings/systemsettings.desktop
index 1d56aa1..31dbafa 100644
--- a/systemsettings/systemsettings.desktop
+++ b/systemsettings/systemsettings.desktop
@@ -4,7 +4,7 @@ Exec=systemsettings -caption "%c" %i %m
 Icon=systemsettings
 Type=Application
 DocPath=systemsettings/index.html
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 
 Name=System Settings
 Name[ar]=تعيينات النظام
@@ -37,4 +37,4 @@ Name[xx]=xxSystem Settingsxx
 Name[zh_CN]=系统设置
 
 X-DCOP-ServiceType=Unique
-Categories=Qt;KDE;Core;
+Categories=Qt;TDE;Core;