diff --git a/ark/ark.desktop b/ark/ark.desktop
index 25f1fd9..26b2bcf 100644
--- a/ark/ark.desktop
+++ b/ark/ark.desktop
@@ -83,5 +83,5 @@ Terminal=false
 SwallowExec=
 SwallowTitle=
 X-DCOP-ServiceType=Unique
-X-KDE-HasTempFileOption=true
-Categories=Qt;KDE;Utility;X-KDE-Utilities-File;
+X-TDE-HasTempFileOption=true
+Categories=Qt;TDE;Utility;X-TDE-Utilities-File;
diff --git a/ark/ark_part.desktop b/ark/ark_part.desktop
index e62db26..1d6942c 100644
--- a/ark/ark_part.desktop
+++ b/ark/ark_part.desktop
@@ -132,4 +132,4 @@ Name[zu]=Umqulu
 Icon=ark
 Type=Service
 ServiceTypes=KParts/ReadOnlyPart
-X-KDE-Library=libarkpart
+X-TDE-Library=libarkpart
diff --git a/charselectapplet/kcharselectapplet.desktop b/charselectapplet/kcharselectapplet.desktop
index 029b5be..cad5b76 100644
--- a/charselectapplet/kcharselectapplet.desktop
+++ b/charselectapplet/kcharselectapplet.desktop
@@ -51,8 +51,8 @@ Name[uz@cyrillic]=Ҳарф танлагич
 Name[zh_CN]=字符选择器
 Name[zh_TW]=字元選擇器
 Icon=kcharselect
-X-KDE-Library=kcharselect_panelapplet
-X-KDE-UniqueApplet=true
+X-TDE-Library=kcharselect_panelapplet
+X-TDE-UniqueApplet=true
 Comment=Pick foreign and special characters for clipboard
 Comment[ar]=يلتقط الرموز الأجنبية والخاصة من أجل الحافظة
 Comment[bg]=Избор на чужди и специални знаци за копиране чрез системния буфер
diff --git a/doc/superkaramba/index.docbook b/doc/superkaramba/index.docbook
index 5bf05ff..761ddaa 100644
--- a/doc/superkaramba/index.docbook
+++ b/doc/superkaramba/index.docbook
@@ -168,7 +168,7 @@ following:</para>
 Exec=superkaramba {location of theme file}.theme
 Name={theme name}
 Type=Application
-X-KDE-StartupNotify=false</userinput></screen>
+X-TDE-StartupNotify=false</userinput></screen>
 <para>Then save it as
 <filename><replaceable>themename</replaceable>.desktop</filename> into the
 autostart directory at <filename
diff --git a/kcalc/kcalc.desktop b/kcalc/kcalc.desktop
index 6481922..2009819 100644
--- a/kcalc/kcalc.desktop
+++ b/kcalc/kcalc.desktop
@@ -84,5 +84,5 @@ GenericName[zh_TW]=科學計算機
 GenericName[zu]=Umshini wokubala ezenzululwazi
 Terminal=false
 Type=Application
-X-KDE-StartupNotify=true
-Categories=Qt;KDE;Utility;
+X-TDE-StartupNotify=true
+Categories=Qt;TDE;Utility;
diff --git a/kcharselect/KCharSelect.desktop b/kcharselect/KCharSelect.desktop
index d5a066d..13472e8 100644
--- a/kcharselect/KCharSelect.desktop
+++ b/kcharselect/KCharSelect.desktop
@@ -93,6 +93,6 @@ Name[tr]=Karakter Seçici
 Name[ven]=U nanga muanewa wa K
 Name[xh]=Itshati yokukheta i K
 Name[zh_TW]=KDE 字元選擇
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Utility;
+Categories=Qt;TDE;Utility;
diff --git a/kdelirc/irkick/irkick.desktop b/kdelirc/irkick/irkick.desktop
index 2f85103..bee8a2e 100644
--- a/kdelirc/irkick/irkick.desktop
+++ b/kdelirc/irkick/irkick.desktop
@@ -53,12 +53,12 @@ GenericName[uz@cyrillic]=TDE LIRC сервери
 GenericName[zh_CN]=TDE LIRC 服务器
 GenericName[zh_TW]=TDE LIRC 伺服器
 
-X-KDE-Library=irkick
-X-KDE-autostart-after=panel
-X-KDE-StartupNotify=false
+X-TDE-Library=irkick
+X-TDE-autostart-after=panel
+X-TDE-StartupNotify=false
 X-DCOP-ServiceType=Unique
-X-KDE-autostart-condition=irkickrc:General:AutoStart:false
-Categories=Qt;KDE;Utility;
+X-TDE-autostart-condition=irkickrc:General:AutoStart:false
+Categories=Qt;TDE;Utility;
 
 Exec=irkick
 Icon=irkick
diff --git a/kdelirc/kcmlirc/kcmlirc.desktop b/kdelirc/kcmlirc/kcmlirc.desktop
index 3e50fae..686eeb3 100644
--- a/kdelirc/kcmlirc/kcmlirc.desktop
+++ b/kdelirc/kcmlirc/kcmlirc.desktop
@@ -112,8 +112,8 @@ Name[zh_CN]=远程控制
 Name[zh_TW]=遙控鍵
 Terminal=false
 Type=Application
-X-KDE-FactoryName=kcmlirc
-X-KDE-Library=kcmlirc
-X-KDE-ModuleType=Library
+X-TDE-FactoryName=kcmlirc
+X-TDE-Library=kcmlirc
+X-TDE-ModuleType=Library
 DocPath=kcmlirc/index.html
-Categories=Qt;KDE;X-KDE-settings-peripherals;
+Categories=Qt;TDE;X-TDE-settings-peripherals;
diff --git a/kdf/kcmdf.desktop b/kdf/kcmdf.desktop
index 62cc3f6..8bec44c 100644
--- a/kdf/kcmdf.desktop
+++ b/kdf/kcmdf.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
-X-KDE-ModuleType=Library
-X-KDE-Library=kdf
-X-KDE-FactoryName=kdf
-X-KDE-ParentApp=kinfocenter
-X-KDE-LocalUser=false
+X-TDE-ModuleType=Library
+X-TDE-Library=kdf
+X-TDE-FactoryName=kdf
+X-TDE-ParentApp=kinfocenter
+X-TDE-LocalUser=false
 Exec=kcmshell kcmdf
 Icon=kcmdf
 Type=Application
@@ -136,4 +136,4 @@ Comment[zh_CN]=显示挂接设备的磁盘使用率
 Comment[zh_TW]=顯示連接的設備的磁碟使用率
 Comment[zu]=Ikhombisa ukusebenziswa kwediski yamathuluzi okunyuka
 
-Categories=Qt;KDE;X-KDE-settings-information;
+Categories=Qt;TDE;X-TDE-settings-information;
diff --git a/kdf/kdf.desktop b/kdf/kdf.desktop
index e756492..c9876de 100644
--- a/kdf/kdf.desktop
+++ b/kdf/kdf.desktop
@@ -83,6 +83,6 @@ GenericName[zh_TW]=檢視磁碟使用情形
 GenericName[zu]= Buka Ukusetshenziswa Kwediski
 Terminal=false
 DocPath=kdf/index.html
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;System;
+Categories=Qt;TDE;System;
diff --git a/kdf/kwikdisk.desktop b/kdf/kwikdisk.desktop
index c723364..66d1fe2 100644
--- a/kdf/kwikdisk.desktop
+++ b/kdf/kwikdisk.desktop
@@ -74,5 +74,5 @@ GenericName[zh_CN]=可移动介质工具
 GenericName[zh_TW]=可移動媒體公用程式
 GenericName[zu]=Umsebenzi Wonozindaba Ogudluzekayo
 Terminal=false
-Categories=Qt;KDE;System;
+Categories=Qt;TDE;System;
 OnlyShowIn=TDE;
diff --git a/kedit/KEdit.desktop b/kedit/KEdit.desktop
index f4e3abc..cf409b3 100644
--- a/kedit/KEdit.desktop
+++ b/kedit/KEdit.desktop
@@ -77,6 +77,6 @@ Name[th]=แก้ไขข้อความ
 Name[ven]=U sengulusa ha K
 Name[xh]=Abahleli Be K
 Name[zh_TW]=KDE 編輯器
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;TextEditor;
+Categories=Qt;TDE;TextEditor;
diff --git a/kfloppy/KFloppy.desktop b/kfloppy/KFloppy.desktop
index e1f7a59..a6ed2f0 100644
--- a/kfloppy/KFloppy.desktop
+++ b/kfloppy/KFloppy.desktop
@@ -91,6 +91,6 @@ Icon=kfloppy
 Path=
 Type=Application
 Terminal=false
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Utility
+Categories=Qt;TDE;Utility;
diff --git a/kfloppy/floppy_format.desktop b/kfloppy/floppy_format.desktop
index b780ac9..3e42930 100644
--- a/kfloppy/floppy_format.desktop
+++ b/kfloppy/floppy_format.desktop
@@ -50,5 +50,5 @@ Name[zh_TW]=格式化
 [Desktop Entry]
 Actions=Format;
 ServiceTypes=media/floppy_unmounted,media/floppy5_unmounted
-X-KDE-Priority=TopLevel
-X-KDE-MediaNotifierHide=true
+X-TDE-Priority=TopLevel
+X-TDE-MediaNotifierHide=true
diff --git a/kgpg/kgpg.desktop b/kgpg/kgpg.desktop
index f4387da..6ae219d 100644
--- a/kgpg/kgpg.desktop
+++ b/kgpg/kgpg.desktop
@@ -116,7 +116,7 @@ Name[nl]=KGPG
 Name[sv]=Kgpg
 Name[ta]= KGpg 
 
-X-KDE-autostart-after=panel
-X-KDE-autostart-condition=kgpgrc:User Interface:AutoStart:false
+X-TDE-autostart-after=panel
+X-TDE-autostart-condition=kgpgrc:User Interface:AutoStart:false
 
-Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;
+Categories=Qt;TDE;Utility;X-TDE-Utilities-PIM;
diff --git a/khexedit/khexedit.desktop b/khexedit/khexedit.desktop
index befa3d7..89eb174 100644
--- a/khexedit/khexedit.desktop
+++ b/khexedit/khexedit.desktop
@@ -80,7 +80,7 @@ Path=
 Type=Application
 DocPath=khexedit/index.html
 Terminal=false
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Utility;X-KDE-Utilities-File;
+Categories=Qt;TDE;Utility;X-TDE-Utilities-File;
 
diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.desktop b/khexedit/parts/kbytesedit/kbyteseditwidget.desktop
index 4a050a6..f0dd8ab 100644
--- a/khexedit/parts/kbytesedit/kbyteseditwidget.desktop
+++ b/khexedit/parts/kbytesedit/kbyteseditwidget.desktop
@@ -46,7 +46,7 @@ Name[tg]=Элементи Таҳрири Додаҳои Дуӣ
 Name[uk]=Віджет побайтового редагування
 Name[zh_CN]=字节编辑部件
 Name[zh_TW]=位元編輯器元件
-X-KDE-Library=libkbyteseditwidget
+X-TDE-Library=libkbyteseditwidget
 InitialPreference=2
 ServiceTypes=KHexEdit/KBytesEdit
 
diff --git a/khexedit/parts/kpart/khexedit2part.desktop b/khexedit/parts/kpart/khexedit2part.desktop
index 60f4132..b624953 100644
--- a/khexedit/parts/kpart/khexedit2part.desktop
+++ b/khexedit/parts/kpart/khexedit2part.desktop
@@ -98,4 +98,4 @@ Comment[zh_TW]=嵌入式二進位顯示器
 MimeType=application/octet-stream
 ServiceTypes=KParts/ReadOnlyPart,Browser/View
 #,KParts/ReadWritePart
-X-KDE-Library=libkhexedit2part
+X-TDE-Library=libkhexedit2part
diff --git a/kjots/Kjots.desktop b/kjots/Kjots.desktop
index b0550e0..534dd08 100644
--- a/kjots/Kjots.desktop
+++ b/kjots/Kjots.desktop
@@ -75,6 +75,6 @@ Exec=kjots  -caption "%c" %i %m
 Type=Application
 Path=
 Terminal=false
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;
+Categories=Qt;TDE;Utility;X-TDE-Utilities-PIM;
diff --git a/klaptopdaemon/applnk/klaptopdaemon.desktop b/klaptopdaemon/applnk/klaptopdaemon.desktop
index 0ba43cb..4a27176 100644
--- a/klaptopdaemon/applnk/klaptopdaemon.desktop
+++ b/klaptopdaemon/applnk/klaptopdaemon.desktop
@@ -2,11 +2,11 @@
 Type=Service
 
 ServiceTypes=KDEDModule
-X-KDE-ModuleType=Library
-X-KDE-Library=klaptopdaemon
-X-KDE-FactoryName=klaptopdaemon
-X-KDE-Kded-autoload=false
-X-KDE-Kded-load-on-demand=true
+X-TDE-ModuleType=Library
+X-TDE-Library=klaptopdaemon
+X-TDE-FactoryName=klaptopdaemon
+X-TDE-Kded-autoload=false
+X-TDE-Kded-load-on-demand=true
 
 Icon=laptop_battery
 DocPath=kcontrol/battery-monitor.html
diff --git a/klaptopdaemon/applnk/laptop.desktop b/klaptopdaemon/applnk/laptop.desktop
index 5a3ce26..98d7435 100644
--- a/klaptopdaemon/applnk/laptop.desktop
+++ b/klaptopdaemon/applnk/laptop.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
-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
-Categories=Qt;KDE;X-KDE-settings-hardware;
+Categories=Qt;TDE;X-TDE-settings-hardware;
 Comment=Laptop Battery
 Comment[af]=Draagbare rekenaar Batery
 Comment[ar]=بطّاريّة الحاسوب المحمول
diff --git a/klaptopdaemon/applnk/pcmcia.desktop b/klaptopdaemon/applnk/pcmcia.desktop
index a519aec..4825dae 100644
--- a/klaptopdaemon/applnk/pcmcia.desktop
+++ b/klaptopdaemon/applnk/pcmcia.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-X-KDE-ModuleType=Library
-X-KDE-Library=laptop
-X-KDE-FactoryName=pcmcia
-X-KDE-ParentApp=kinfocenter
+X-TDE-ModuleType=Library
+X-TDE-Library=laptop
+X-TDE-FactoryName=pcmcia
+X-TDE-ParentApp=kinfocenter
 Exec=kcmshell pcmcia
 Icon=laptop_pcmcia
 Type=Application
@@ -82,4 +82,4 @@ Name[pt_BR]=Cartões PCMCIA
 Name[ta]= PCMCIA
 Name[th]=อุปกรณ์ PCMCIA
 
-Categories=Qt;KDE;X-KDE-settings-information;
+Categories=Qt;TDE;X-TDE-settings-information;
diff --git a/kmilo/asus/kmilo_asus.desktop b/kmilo/asus/kmilo_asus.desktop
index 5e662bb..a534872 100644
--- a/kmilo/asus/kmilo_asus.desktop
+++ b/kmilo/asus/kmilo_asus.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KMilo Plugin
-X-KDE-ModuleType=Plugin
+X-TDE-ModuleType=Plugin
 Name=Asus Laptop Plugin
 Name[ar]=ملحق حاسوب Asus المحمول
 Name[br]=Lugent hezoug Asus
@@ -94,4 +94,4 @@ Comment[tr]=Asus dizüstü bilgisayarlar için özel tuş desteğini etkinleşti
 Comment[uk]=Уможливлює підтримку спеціальних клавіш для лептопа Asus
 Comment[zh_CN]=启用华硕笔记本的特殊按键
 Comment[zh_TW]=開啟華碩筆記型電腦特殊鍵支援
-X-KDE-Library=kmilo_asus
+X-TDE-Library=kmilo_asus
diff --git a/kmilo/delli8k/kmilo_delli8k.desktop b/kmilo/delli8k/kmilo_delli8k.desktop
index 4dd7c97..40dd85a 100644
--- a/kmilo/delli8k/kmilo_delli8k.desktop
+++ b/kmilo/delli8k/kmilo_delli8k.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KMilo Plugin
-X-KDE-ModuleType=Plugin
+X-TDE-ModuleType=Plugin
 Name=Dell I8k Laptop Plugin
 Name[ar]=ملحق حاسوب Dell I8k المحمول
 Name[br]=Lugent hezoug Dell I8k
@@ -93,4 +93,4 @@ Comment[tr]=Dell dizüstü bilgisayarların özel tuşları için desteği etkin
 Comment[uk]=Уможливлює підтримку спеціальних клавіш для лептопа Dell
 Comment[zh_CN]=此插件启用 Dell 笔记本的特殊按键
 Comment[zh_TW]=開啟 Dell 筆記型電腦特殊鍵支援
-X-KDE-Library=kmilo_delli8k
+X-TDE-Library=kmilo_delli8k
diff --git a/kmilo/demo/kmilo_demo.desktop b/kmilo/demo/kmilo_demo.desktop
index 288903f..ce3240b 100644
--- a/kmilo/demo/kmilo_demo.desktop
+++ b/kmilo/demo/kmilo_demo.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KMilo Plugin
-X-KDE-ModuleType=Plugin
+X-TDE-ModuleType=Plugin
 Name=Demo Plugin
 Name[ar]=ملحق للعرض
 Name[bg]=Демонстрационна приставка
@@ -107,4 +107,4 @@ Comment[uz@cyrillic]=Бу плагин ҳеч нарса бажармайди.
 Comment[wa]=Ci tchôke-divins chal ni fwait rén do tot.
 Comment[zh_CN]=此插件不完成任何工作。
 Comment[zh_TW]=這個外掛程式不做任何事。
-X-KDE-Library=kmilo_demo
+X-TDE-Library=kmilo_demo
diff --git a/kmilo/generic/kmilo_generic.desktop b/kmilo/generic/kmilo_generic.desktop
index 89d55d0..b1534fc 100644
--- a/kmilo/generic/kmilo_generic.desktop
+++ b/kmilo/generic/kmilo_generic.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KMilo Plugin
-X-KDE-ModuleType=Plugin
+X-TDE-ModuleType=Plugin
 Name=Generic Keyboard Plugin
 Name[ar]=ملحق عام للوحة المفاتيح
 Name[bg]=Приставка за клавиатурата
@@ -105,4 +105,4 @@ Comment[tr]=Bu plugin tüm klavye ve dizüstülerdeki özel tuşlar için deste
 Comment[uk]=Цей втулок додає підтримку спеціальних клавіш для різних типів клавіатур та лептопів.
 Comment[zh_CN]=此插件启用各种键盘和便携电脑的特殊按键。
 Comment[zh_TW]=這個外掛程式開啟所有鍵盤與筆記型電腦的特殊鍵支援。
-X-KDE-Library=kmilo_generic
+X-TDE-Library=kmilo_generic
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop b/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop
index 5b90d8c..8c51255 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop
+++ b/kmilo/kmilo_kvaio/kcmkvaio/kvaio.desktop
@@ -4,8 +4,8 @@ Exec=kcmshell kvaio
 Icon=laptop
 DocPath=kcontrol/kvaio/index.html
 
-X-KDE-Library=kvaio
-X-KDE-ParentApp=kcontrol
+X-TDE-Library=kvaio
+X-TDE-ParentApp=kcontrol
 
 Name=Sony Vaio Laptop
 Name[ar]=حاسوب سونى فايو المحمولة
@@ -143,4 +143,4 @@ Keywords[tr]=Sony, Vaio, kvaio, parlaklık, sessiz, gösterme itmesi
 Keywords[uk]=Sony, Vaio, kvaio, яскравість, вимкнення звуку
 Keywords[zh_CN]=Sony, Vaio, kvaio, brightness, mute, Jog Dial,索尼,亮度,静音
 
-Categories=Qt;KDE;X-KDE-settings-system;
+Categories=Qt;TDE;X-TDE-settings-system;
diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.desktop b/kmilo/kmilo_kvaio/kmilo_kvaio.desktop
index 5539734..d28c89f 100644
--- a/kmilo/kmilo_kvaio/kmilo_kvaio.desktop
+++ b/kmilo/kmilo_kvaio/kmilo_kvaio.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KMilo Plugin
-X-KDE-ModuleType=Plugin
+X-TDE-ModuleType=Plugin
 Name=Sony Vaio Plugin
 Name[ar]=ملحق سونى فايوة
 Name[br]=Lugent an hezoug Sony Vaio
@@ -103,4 +103,4 @@ Comment[tr]=Sony Vaio Dizüstüler için KMilo Modül desteği
 Comment[uk]=Модуль KMilo, що додає підтримку лептопів Sony Vaio
 Comment[zh_CN]=索尼 Vaio 便携电脑支持的 KMilo 模块
 Comment[zh_TW]=支援 Sony Vaio 筆記型電腦的 KMilo 模組
-X-KDE-Library=kmilo_kvaio
+X-TDE-Library=kmilo_kvaio
diff --git a/kmilo/kmilod/kmilod.desktop b/kmilo/kmilod/kmilod.desktop
index 41c4538..cbd629f 100644
--- a/kmilo/kmilod/kmilod.desktop
+++ b/kmilo/kmilod/kmilod.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KDEDModule
-X-KDE-ModuleType=Library
-X-KDE-Library=kmilod
-X-KDE-FactoryName=kmilod
-X-KDE-Kded-autoload=true
-X-KDE-Kded-load-on-demand=false
+X-TDE-ModuleType=Library
+X-TDE-Library=kmilod
+X-TDE-FactoryName=kmilod
+X-TDE-Kded-autoload=true
+X-TDE-Kded-load-on-demand=false
 Name=KMilo
 Name[de]=KMilo Sondertasten
 Name[hi]=के-मिलो
diff --git a/kmilo/kmilod/kmilopluginsvc.desktop b/kmilo/kmilod/kmilopluginsvc.desktop
index a3bba63..392ad1b 100644
--- a/kmilo/kmilod/kmilopluginsvc.desktop
+++ b/kmilo/kmilod/kmilopluginsvc.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=ServiceType
-X-KDE-ServiceType=KMilo Plugin
+X-TDE-ServiceType=KMilo Plugin
 
 [PropertyDef::X-KMilo-Plugin-Author]
 Type=TQString
diff --git a/kmilo/powerbook/kmilo_powerbook.desktop b/kmilo/powerbook/kmilo_powerbook.desktop
index 842d276..402e435 100644
--- a/kmilo/powerbook/kmilo_powerbook.desktop
+++ b/kmilo/powerbook/kmilo_powerbook.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KMilo Plugin
-X-KDE-ModuleType=Plugin
+X-TDE-ModuleType=Plugin
 Name=Apple (R) PowerBook (R) Plugin
 Name[ar]=ملحق Apple (R) PowerBook (R)ة
 Name[br]=Lugent Apple (R) PowerBook (R)
@@ -102,4 +102,4 @@ Comment[tr]=Bu plugin pbbuttonsd aracılığı ile Apple(R) PowerBook(R) dizüst
 Comment[uk]=Цей втулок дозволяє користуватися спеціальними клавішами на лептопах Apple (R) PowerBook (R) за допомогою pbbuttonsd.
 Comment[zh_CN]=此插件启用 Apple(R) PowerBook(R) 便携电脑上的特殊按键。
 Comment[zh_TW]=這個外掛程式透過 pbbuttonsd 開啟 Apple(R) PowerBook(R) 筆記型電腦的特殊鍵支援。
-X-KDE-Library=kmilo_powerbook
+X-TDE-Library=kmilo_powerbook
diff --git a/kmilo/powerbook2/kmilo_powerbook.desktop b/kmilo/powerbook2/kmilo_powerbook.desktop
index 9aff481..6a84f48 100644
--- a/kmilo/powerbook2/kmilo_powerbook.desktop
+++ b/kmilo/powerbook2/kmilo_powerbook.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KMilo Plugin
-X-KDE-ModuleType=Plugin
+X-TDE-ModuleType=Plugin
 Name=Apple PowerBook Plugin
 Name[ar]=ملحق Apple PowerBook
 Name[br]=Lugent Apple PowerBook
@@ -103,4 +103,4 @@ Comment[tr]=Bu plugin pbbuttonsd aracılığı ile Apple PowerBook dizüstüler
 Comment[uk]=Цей втулок дозволив користуватися спеціальними клавішами на лептопах Apple PowerBook за допомогою pbbuttonsd.
 Comment[zh_CN]=此插件启用 Apple PowerBook 电源按钮的特殊按键支持。
 Comment[zh_TW]=這個外掛程式透過 pbbuttonsd 開啟 Apple Powerbooks 特殊鍵支援。
-X-KDE-Library=kmilo_powerbook
+X-TDE-Library=kmilo_powerbook
diff --git a/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop b/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop
index 420372c..4b0b0d4 100644
--- a/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop
+++ b/kmilo/thinkpad/kcmthinkpad/thinkpad.desktop
@@ -4,8 +4,8 @@ Exec=kcmshell thinkpad
 Icon=laptop
 DocPath=kcontrol/thinkpad/index.html
 
-X-KDE-Library=thinkpad
-X-KDE-ParentApp=kcontrol
+X-TDE-Library=thinkpad
+X-TDE-ParentApp=kcontrol
 
 Name=IBM Thinkpad Laptop
 Name[ar]=حاسوب IBM Thinkpad المحمول
@@ -142,4 +142,4 @@ Keywords[tr]=IBM, Thinkpad, parlaklık, sessiz, gösterme itmesi
 Keywords[uk]=IBM, Thinkpad, яскравість, вимкнення звуку, Jog Dial
 Keywords[zh_CN]=IBM, Lenovo, Thinkpad, brightness, mute, Jog Dial,亮度,静音,联想,导航键
 
-Categories=Qt;KDE;X-KDE-settings-system;
+Categories=Qt;TDE;X-TDE-settings-system;
diff --git a/kmilo/thinkpad/kmilo_thinkpad.desktop b/kmilo/thinkpad/kmilo_thinkpad.desktop
index 1d957c4..cbde3c1 100644
--- a/kmilo/thinkpad/kmilo_thinkpad.desktop
+++ b/kmilo/thinkpad/kmilo_thinkpad.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 ServiceTypes=KMilo Plugin
-X-KDE-ModuleType=Plugin
+X-TDE-ModuleType=Plugin
 Name=Thinkpad Plugin
 Name[ar]=ملحق Thinkpad
 Name[br]=Lugent Thinkpad
@@ -98,4 +98,4 @@ Comment[tr]=Özel Thinkpad tuşları için desteği etkinleştirir
 Comment[uk]=Уможливлює підтримку спеціальних клавіш для Thinkpad.
 Comment[zh_CN]=此插件启用各种键盘和便携电脑的特殊按键
 Comment[zh_TW]=開啟特殊 Thinkpad 按鍵支援
-X-KDE-Library=kmilo_thinkpad
+X-TDE-Library=kmilo_thinkpad
diff --git a/kregexpeditor/kregexpeditor.desktop b/kregexpeditor/kregexpeditor.desktop
index e93f87b..659703c 100644
--- a/kregexpeditor/kregexpeditor.desktop
+++ b/kregexpeditor/kregexpeditor.desktop
@@ -71,6 +71,6 @@ GenericName[zh_CN]=正规表达式编辑器
 GenericName[zh_TW]=正規表示式編輯器
 Terminal=false
 Type=Application
-X-KDE-StartupNotify=true
-Categories=Qt;KDE;Utility;
+X-TDE-StartupNotify=true
+Categories=Qt;TDE;Utility;
 Icon=kregexpeditor
diff --git a/kregexpeditor/kregexpeditorgui.desktop b/kregexpeditor/kregexpeditorgui.desktop
index 23e3896..1c1d8f7 100644
--- a/kregexpeditor/kregexpeditorgui.desktop
+++ b/kregexpeditor/kregexpeditorgui.desktop
@@ -57,6 +57,6 @@ Name[xh]=RegExp Umhleli we Widget
 Name[zh_CN]=正则表达式编辑器部件
 Name[zh_TW]=正規表示式編輯小程式
 Name[zu]=RegExp Umhleli we-widget
-X-KDE-Library=libkregexpeditorgui
+X-TDE-Library=libkregexpeditorgui
 InitialPreference=2
 ServiceTypes=KRegExpEditor/KRegExpEditor
diff --git a/ksim/ksim.desktop b/ksim/ksim.desktop
index 8f4934a..e9b6212 100644
--- a/ksim/ksim.desktop
+++ b/ksim/ksim.desktop
@@ -128,7 +128,7 @@ Name[sv]=Ksim
 Name[ta]=கேசிம்
 Name[th]=สอดส่องระบบ
 Name[zh_TW]=KSim 系統監視器
-X-KDE-Library=ksim_panelextension
-X-KDE-UniqueApplet=true
-Categories=Qt;KDE;System;
+X-TDE-Library=ksim_panelextension
+X-TDE-UniqueApplet=true
+Categories=Qt;TDE;System;
 Hidden=false
diff --git a/ktimer/ktimer.desktop b/ktimer/ktimer.desktop
index 1d12283..84862ed 100644
--- a/ktimer/ktimer.desktop
+++ b/ktimer/ktimer.desktop
@@ -58,6 +58,6 @@ Name[th]=ตั้งเวลาทำงาน
 Name[ven]=Ratshikhathi wa K
 Name[xh]=Umjongi Wexesha
 Name[zh_TW]=KDE 計時器
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
-Categories=Qt;KDE;Utility;
+Categories=Qt;TDE;Utility;
diff --git a/kwallet/konfigurator/kwalletconfig.desktop b/kwallet/konfigurator/kwalletconfig.desktop
index 1ea48a9..4dedee9 100644
--- a/kwallet/konfigurator/kwalletconfig.desktop
+++ b/kwallet/konfigurator/kwalletconfig.desktop
@@ -3,9 +3,9 @@ Icon=kwalletmanager
 Type=Application
 Exec=kcmshell kwalletconfig
 DocPath=kwallet/index.html
-X-KDE-ModuleType=Library
-X-KDE-Library=kwallet
-X-KDE-ParentApp=kcontrol
+X-TDE-ModuleType=Library
+X-TDE-Library=kwallet
+X-TDE-ParentApp=kcontrol
 
 Name=TDE Wallet
 Name[ar]=محفظة كدى
@@ -149,4 +149,4 @@ Keywords[tr]=Cüzdan,Form Doldur,Şifreler,Form Verisi
 Keywords[uk]=Торбинка,Заповнення форм,Паролі,Дані форм
 Keywords[zh_CN]=Wallet,Form Fill,Passwords,Form Data,钱包,填充表单,密码,表单数据
 
-Categories=Qt;KDE;X-KDE-settings-security;
+Categories=Qt;TDE;X-TDE-settings-security;
diff --git a/kwallet/konfigurator/kwalletmanager_show.desktop b/kwallet/konfigurator/kwalletmanager_show.desktop
index 91b7368..73fc8a0 100644
--- a/kwallet/konfigurator/kwalletmanager_show.desktop
+++ b/kwallet/konfigurator/kwalletmanager_show.desktop
@@ -57,4 +57,4 @@ MimeType=application/x-kde-wallet
 InitialPreference=6
 Icon=kwalletmanager
 Type=Service
-X-KDE-StartupNotify=true
+X-TDE-StartupNotify=true
diff --git a/kwallet/kwalletmanager-kwalletd.desktop b/kwallet/kwalletmanager-kwalletd.desktop
index e9d38ac..1d29543 100644
--- a/kwallet/kwalletmanager-kwalletd.desktop
+++ b/kwallet/kwalletmanager-kwalletd.desktop
@@ -56,5 +56,5 @@ Exec=kwalletmanager --kwalletd
 Icon=kwalletmanager
 Type=Application
 Terminal=false
-X-KDE-StartupNotify=false
+X-TDE-StartupNotify=false
 NoDisplay=true
diff --git a/kwallet/kwalletmanager.desktop b/kwallet/kwalletmanager.desktop
index 7884977..72e99ce 100644
--- a/kwallet/kwalletmanager.desktop
+++ b/kwallet/kwalletmanager.desktop
@@ -58,6 +58,6 @@ InitialPreference=6
 Icon=kwalletmanager
 Type=Application
 Terminal=false
-X-KDE-StartupNotify=false
-Categories=Qt;KDE;Settings;
+X-TDE-StartupNotify=false
+Categories=Qt;TDE;Settings;
 DocPath=kwallet/index.html
diff --git a/superkaramba/doc/faq/faq.dat b/superkaramba/doc/faq/faq.dat
index de0f1ef..9645b32 100644
--- a/superkaramba/doc/faq/faq.dat
+++ b/superkaramba/doc/faq/faq.dat
@@ -30,7 +30,7 @@ To create a desktop config file, open KWrite and enter the following:<pre>
             Exec=superkaramba {location of theme file}.theme
             Name={theme name}
             Type=Application
-            X-KDE-StartupNotify=false
+            X-TDE-StartupNotify=false
 </pre>Then save it as {theme}.desktop into /home/{user}/.kde/Autostart/.
 
 <c>Troubleshooting
diff --git a/superkaramba/doc/faq/faq.html b/superkaramba/doc/faq/faq.html
index aa5f72c..9fec7b2 100644
--- a/superkaramba/doc/faq/faq.html
+++ b/superkaramba/doc/faq/faq.html
@@ -64,7 +64,7 @@ To create a desktop config file, open KWrite and enter the following:<pre>
             Exec=superkaramba {location of theme file}.theme
             Name={theme name}
             Type=Application
-            X-KDE-StartupNotify=false
+            X-TDE-StartupNotify=false
 </pre>Then save it as {theme}.desktop into /home/{user}/.kde/Autostart/.<br><br></dd>
 <dt><b><a name="General3">2.4. Why is the Edit Script option disabled when I right-click on a theme?</a></b></dt>
 <dd>Some karamba themes don't include a python script. This is normal and those themes will still work fine without one. However, if the theme does use a python script, superkaramba may have not been able to load the script. This is usually due to python errors. Run the theme from the command line to find out the specific error message.<br><br></dd>
diff --git a/superkaramba/doc/faq/faq.txt b/superkaramba/doc/faq/faq.txt
index 922a1d4..e752493 100644
--- a/superkaramba/doc/faq/faq.txt
+++ b/superkaramba/doc/faq/faq.txt
@@ -79,7 +79,7 @@ To create a desktop config file, open KWrite and enter the following:
             Exec=superkaramba {location of theme file}.theme
             Name={theme name}
             Type=Application
-            X-KDE-StartupNotify=false
+            X-TDE-StartupNotify=false
 Then save it as {theme}.desktop into /home/{user}/.kde/Autostart/.
 
 2.4. Why is the Edit Script option disabled when I right-click on a theme?
diff --git a/superkaramba/mimetypes/x-superkaramba.desktop b/superkaramba/mimetypes/x-superkaramba.desktop
index 946c9e1..4612262 100644
--- a/superkaramba/mimetypes/x-superkaramba.desktop
+++ b/superkaramba/mimetypes/x-superkaramba.desktop
@@ -49,4 +49,4 @@ Icon=superkaramba_theme
 MimeType=application/x-superkaramba
 Patterns=*.skz;*.SKZ;*.theme;*.THEME
 Type=MimeType
-X-KDE-AutoEmbed=false
+X-TDE-AutoEmbed=false
diff --git a/superkaramba/src/superkaramba.desktop b/superkaramba/src/superkaramba.desktop
index 32bf6a2..c2ed1c3 100644
--- a/superkaramba/src/superkaramba.desktop
+++ b/superkaramba/src/superkaramba.desktop
@@ -95,5 +95,5 @@ GenericName[uk]=Віджети стільниці
 GenericName[zh_CN]=桌面部件
 GenericName[zh_TW]=桌面元件
 DocPath=superkaramba/index.html
-Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop;
+Categories=Qt;TDE;Utility;X-TDE-Utilities-Desktop;
 OnlyShowIn=TDE;