diff --git a/acinclude.m4 b/acinclude.m4
index 765bcb8..5473df7 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -529,7 +529,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 7389a2e..13729ee 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/adept/batch/adept_updater.desktop b/adept/batch/adept_updater.desktop
index dedcbab..bdbb56a 100644
--- a/adept/batch/adept_updater.desktop
+++ b/adept/batch/adept_updater.desktop
@@ -39,10 +39,10 @@ GenericName[sv]=Systemuppdateringsguide
 GenericName[xx]=xxSystem Update Wizardxx
 Exec=adept_updater %i %m -caption "%c"
 TryExec=adept_updater
-Categories=Qt;KDE;System;
+Categories=Qt;TDE;System;
 Icon=adept_updater
 Type=Application
-X-KDE-SubstituteUID=true
+X-TDE-SubstituteUID=true
 Comment=Update installed software
 Comment[bg]=Обновяване на инсталиран софтуер
 Comment[ca]=Actualitza el programari instal·lat
diff --git a/adept/installer/adept_installer.desktop b/adept/installer/adept_installer.desktop
index ec11e52..1857926 100644
--- a/adept/installer/adept_installer.desktop
+++ b/adept/installer/adept_installer.desktop
@@ -19,10 +19,10 @@ Name[pt]=Adicionar/Remover Programas
 Name[sk]=Pridať/Odstrániť programy
 Name[sv]=Lägg till/Ta bort program
 Exec=/opt/trinity/bin/adept_installer
-Categories=Qt;KDE;Core;
+Categories=Qt;TDE;Core;
 Icon=adept_installer
 Type=Application
-X-KDE-SubstituteUID=true
+X-TDE-SubstituteUID=true
 Comment=Adept Installer: install and remove software packages
 Comment[bg]=Инсталатор Adept: инсталиране на нови софтуерни пакети
 Comment[ca]=Instal·lador Adept: instal·la i elimina paquets de programari
diff --git a/adept/manager/adept_manager.desktop b/adept/manager/adept_manager.desktop
index 2bc8a3a..49f5b7e 100644
--- a/adept/manager/adept_manager.desktop
+++ b/adept/manager/adept_manager.desktop
@@ -13,10 +13,10 @@ GenericName[ja]=パッケージを管理
 GenericName[pt]=Gestão de Pacotes
 GenericName[sv]=Hantera paket
 Exec=/opt/trinity/bin/adept_manager
-Categories=Qt;KDE;System;
+Categories=Qt;TDE;System;
 Icon=adept_manager
 Type=Application
-X-KDE-SubstituteUID=true
+X-TDE-SubstituteUID=true
 Comment=Manage installed and available software
 Comment[bg]=Управление на инсталиран и наличен софтуер
 Comment[ca]=Gestiona el programari instal·lat i disponible
diff --git a/adept/notifier/adept_notifier.desktop b/adept/notifier/adept_notifier.desktop
index 453ef5f..8dffba9 100644
--- a/adept/notifier/adept_notifier.desktop
+++ b/adept/notifier/adept_notifier.desktop
@@ -36,10 +36,10 @@ GenericName[sv]=Uppdateringspåminnelse
 GenericName[xx]=xxUpdate Reminderxx
 Exec=adept_notifier -caption "%c"
 TryExec=adept_notifier
-Categories=Qt;KDE;System;
+Categories=Qt;TDE;System;
 Icon=adept_notifier
 Type=Application
-X-KDE-SubstituteUID=false
+X-TDE-SubstituteUID=false
 Comment=Watch for updates
 Comment[bg]=Следене за обновяване
 Comment[ca]=Vigila les actualitzacions
diff --git a/adept/notifier/adept_notifier_auto.desktop b/adept/notifier/adept_notifier_auto.desktop
index a47ab98..98fccdc 100644
--- a/adept/notifier/adept_notifier_auto.desktop
+++ b/adept/notifier/adept_notifier_auto.desktop
@@ -17,7 +17,7 @@ Name[pt]=Notificador do Adept
 Name[sk]=Adept upozornenie
 Name[sv]=Adept uppdatering
 Name[xx]=xxAdept Notifierxx
-X-KDE-autostart-after=panel
+X-TDE-autostart-after=panel
 Type=Service
-X-KDE-autostart-condition=adept_notifierrc:General:Autostart:true
+X-TDE-autostart-condition=adept_notifierrc:General:Autostart:true
 OnlyShowIn=TDE;
diff --git a/adept/updater/adept_updater.desktop b/adept/updater/adept_updater.desktop
index e99e10e..09cbffa 100644
--- a/adept/updater/adept_updater.desktop
+++ b/adept/updater/adept_updater.desktop
@@ -38,10 +38,10 @@ GenericName[sk]=Sprievodca systémovou aktualizáciou
 GenericName[sv]=Systemuppdateringsguide
 GenericName[xx]=xxSystem Update Wizardxx
 Exec=/opt/trinity/bin/adept_updater
-Categories=Qt;KDE;System;
+Categories=Qt;TDE;System;
 Icon=adept_updater
 Type=Application
-X-KDE-SubstituteUID=true
+X-TDE-SubstituteUID=true
 Comment=Update installed software
 Comment[bg]=Обновяване на инсталиран софтуер
 Comment[ca]=Actualitza el programari instal·lat
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