diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
index 89d40e0d..cfee74cc 100644
--- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
+++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell kcmsambaconf
 Icon=samba
 Type=Application
-DocPath=kcontrol/kcmsambaconf/index.html
+X-DocPath=kcontrol/kcmsambaconf/index.html
 Terminal=false
 X-TDE-FactoryName=KcmSambaConf
 X-TDE-Library=kcmsambaconf
diff --git a/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop b/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop
index ef58019f..e06625bd 100644
--- a/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop
+++ b/filesharing/advanced/propsdlgplugin/fileshare_propsdlgplugin.desktop
@@ -99,4 +99,4 @@ Comment[zh_HK]=用於與本地網絡分享目錄的 Konqueror 屬性對話盒插
 Comment[zh_TW]=Konqueror 屬性對話框外掛程式，用於在本地端網路上分享目錄
 X-TDE-Library=fileshare_propsdlgplugin
 X-TDE-Protocol=file
-ServiceTypes=KPropsDlg/Plugin,inode/directory
+X-TDE-ServiceTypes=KPropsDlg/Plugin,inode/directory
diff --git a/filesharing/simple/fileshare.desktop b/filesharing/simple/fileshare.desktop
index f425d074..d92cdf11 100644
--- a/filesharing/simple/fileshare.desktop
+++ b/filesharing/simple/fileshare.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell fileshare
 Icon=share
 Type=Application
-DocPath=kcontrol/fileshare/index.html
+X-DocPath=kcontrol/fileshare/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=fileshare
 X-TDE-ParentApp=kcontrol
diff --git a/kdict/kdict.desktop b/kdict/kdict.desktop
index ffcd6dfb..2bd3f87b 100644
--- a/kdict/kdict.desktop
+++ b/kdict/kdict.desktop
@@ -149,5 +149,5 @@ GenericName[zh_TW]=線上字典
 GenericName[zu]=Isichaza magama esixhumekile
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Unique
-DocPath=kdict/index.html
+X-DocPath=kdict/index.html
 Categories=Qt;TDE;Office;Dictionary;
diff --git a/kget/kget.desktop b/kget/kget.desktop
index 91225db5..953304c0 100644
--- a/kget/kget.desktop
+++ b/kget/kget.desktop
@@ -74,4 +74,4 @@ GenericName[zh_HK]=下載管理員
 GenericName[zh_TW]=下載管理員
 Categories=Qt;TDE;Network;FileTransfer;
 X-DCOP-ServiceType=Unique
-DocPath=kget/index.html
+X-DocPath=kget/index.html
diff --git a/kget/kget_download.desktop b/kget/kget_download.desktop
index 89654b8e..bc7ebc82 100644
--- a/kget/kget_download.desktop
+++ b/kget/kget_download.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Actions=KGetDownload;
 Icon=
-ServiceTypes=all/allfiles
-ExcludeServiceTypes=kdedevice/*
+X-TDE-ServiceTypes=all/allfiles
+X-TDE-ExcludeServiceTypes=kdedevice/*
 
 [Desktop Action KGetDownload]
 Exec=kget %U
diff --git a/knewsticker/knewsticker-standalone.desktop b/knewsticker/knewsticker-standalone.desktop
index 8586b9ce..0c8e842e 100644
--- a/knewsticker/knewsticker-standalone.desktop
+++ b/knewsticker/knewsticker-standalone.desktop
@@ -22,7 +22,7 @@ Name[zu]=Umlungiseleli Wezindaba ze K
 Type=Application
 Exec=appletproxy knewsticker.desktop
 Icon=knewsticker
-DocPath=knewsticker/index.html
+X-DocPath=knewsticker/index.html
 GenericName=News Ticker
 GenericName[af]=Nuus Tikker
 GenericName[ar]=تجديد الأخبار
diff --git a/knewsticker/knewsticker.desktop b/knewsticker/knewsticker.desktop
index 16fff2fb..42c99744 100644
--- a/knewsticker/knewsticker.desktop
+++ b/knewsticker/knewsticker.desktop
@@ -101,4 +101,4 @@ Comment[uk]=Стрічка новин RDF
 Comment[zh_CN]=滚动的 RDF 新闻播报器
 Comment[zh_HK]=捲軸式 RDF 新聞簡報器
 Comment[zh_TW]=捲軸的 RDF 新聞簡報
-DocPath=knewsticker/index.html
+X-DocPath=knewsticker/index.html
diff --git a/knewsticker/knewstickerstub/knewstickerstub.desktop b/knewsticker/knewstickerstub/knewstickerstub.desktop
index 2cd534b1..0e476663 100644
--- a/knewsticker/knewstickerstub/knewstickerstub.desktop
+++ b/knewsticker/knewstickerstub/knewstickerstub.desktop
@@ -124,7 +124,7 @@ Icon=knode
 NoDisplay=true
 Type=Application
 Terminal=false
-InitialPreference=8
+X-TDE-InitialPreference=8
 Actions=Add;
 X-TDE-StartupNotify=false
 
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop
index 1787df0e..c625e779 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.desktop
@@ -66,4 +66,4 @@ Name[zh_HK]=KNewsticker 來源檔案屬性頁
 Name[zh_TW]=KNewsticker 來源檔案屬性頁
 Name[zu]=Umlekeleli wezindaba ze K wephepha lefayela Yemvelaphi Yempahla
 X-TDE-Library=libkntsrcfilepropsdlg
-ServiceTypes=KPropsDlg/Plugin,text/rdf,text/rss
+X-TDE-ServiceTypes=KPropsDlg/Plugin,text/rdf,text/rss
diff --git a/kopete/kopete/chatwindow/chatwindow.desktop b/kopete/kopete/chatwindow/chatwindow.desktop
index dfbfe3aa..875ae524 100644
--- a/kopete/kopete/chatwindow/chatwindow.desktop
+++ b/kopete/kopete/chatwindow/chatwindow.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-Kopete-Version=1000900
 X-TDE-Library=kopete_chatwindow
 X-TDE-PluginInfo-Author=Kopete Developers
diff --git a/kopete/kopete/chatwindow/emailwindow.desktop b/kopete/kopete/chatwindow/emailwindow.desktop
index 037ea0bd..0c47c980 100644
--- a/kopete/kopete/chatwindow/emailwindow.desktop
+++ b/kopete/kopete/chatwindow/emailwindow.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-Kopete-Version=1000900
 X-TDE-Library=kopete_emailwindow
 X-TDE-PluginInfo-Author=Kopete Developers
diff --git a/kopete/kopete/config/accounts/kopete_accountconfig.desktop b/kopete/kopete/config/accounts/kopete_accountconfig.desktop
index f7645dc7..ea2e7974 100644
--- a/kopete/kopete/config/accounts/kopete_accountconfig.desktop
+++ b/kopete/kopete/config/accounts/kopete_accountconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=personal
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_accountconfig
@@ -126,6 +126,6 @@ Comment[uz@cyrillic]=Бу ерда ҳамма ҳисобларни мослаш
 Comment[zh_CN]=您可在此管理您全部的账户
 Comment[zh_HK]=在此您可管理您的帳號
 Comment[zh_TW]=您可以在此管理您的所有帳號
-DocPath=kopete/configure-dialog.html#configuring-accounts
+X-DocPath=kopete/configure-dialog.html#configuring-accounts
 
 
diff --git a/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop b/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
index e5afd8f8..aa923fcb 100644
--- a/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
+++ b/kopete/kopete/config/appearance/kopete_appearanceconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=looknfeel
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_appearanceconfig
@@ -125,6 +125,6 @@ Comment[uz@cyrillic]=Бу ерда Kopete кўринишини мослаш му
 Comment[zh_CN]=您可在此更改 Kopete 的观感
 Comment[zh_HK]=在此您可改動 Kopete 的外觀
 Comment[zh_TW]=您可以在此改變 Kopete 的外觀與感覺
-DocPath=kopete/configure-dialog.html#configuring-appearance
+X-DocPath=kopete/configure-dialog.html#configuring-appearance
 
 
diff --git a/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop b/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
index 55bd8c3e..ac69e82d 100644
--- a/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
+++ b/kopete/kopete/config/avdevice/kopete_avdeviceconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kopete_avdevice
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_avdeviceconfig
@@ -115,4 +115,4 @@ Comment[uz@cyrillic]=Бу ерда видео ва аудио ускуналар
 Comment[zh_CN]=您可在此更改 Kopete 的影音设备设置
 Comment[zh_HK]=在此您可改動 Kopete 視像和音訊裝置的設定
 Comment[zh_TW]=您可以在此改變 Kopete 的影像與聲音裝置設定
-DocPath=kopete/configure-dialog.html#configuring-avdevice
+X-DocPath=kopete/configure-dialog.html#configuring-avdevice
diff --git a/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop b/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
index e02c4c84..4ef6d33f 100644
--- a/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
+++ b/kopete/kopete/config/behavior/kopete_behaviorconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=configure
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_behaviorconfig
@@ -129,7 +129,7 @@ Comment[wa]=Chal vos ploz apontyî Kopete a vosse mode
 Comment[zh_CN]=您可在此个性化 Kopete
 Comment[zh_HK]=在此您可設定 Kopete 的個人化資料
 Comment[zh_TW]=您已經在此將 Kopete 個人化
-DocPath=kopete/configure-dialog.html#configuring-behavior
+X-DocPath=kopete/configure-dialog.html#configuring-behavior
 
 
 
diff --git a/kopete/kopete/config/identity/kopete_identityconfig.desktop b/kopete/kopete/config/identity/kopete_identityconfig.desktop
index 8ab9dc92..cb46d0dc 100644
--- a/kopete/kopete/config/identity/kopete_identityconfig.desktop
+++ b/kopete/kopete/config/identity/kopete_identityconfig.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=identity
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_identityconfig
@@ -109,4 +109,4 @@ Comment[zh_CN]=您可在此管理您的全局身份
 Comment[zh_HK]=在此您可管理 Kopete 的全域識別名稱
 Comment[zh_TW]=您可以在此管理您的全域身份
 
-DocPath=kopete/configure-dialog.html#configuring-identity
+X-DocPath=kopete/configure-dialog.html#configuring-identity
diff --git a/kopete/kopete/kopete.desktop b/kopete/kopete/kopete.desktop
index 169b910e..85b682c5 100644
--- a/kopete/kopete/kopete.desktop
+++ b/kopete/kopete/kopete.desktop
@@ -117,10 +117,10 @@ Comment[zh_HK]=即時通訊程式
 Comment[zh_TW]=即時訊息客戶端程式
 Exec=kopete -caption "%c" %i %m %u
 Type=Application
-DocPath=kopete/index.html
+X-DocPath=kopete/index.html
 Terminal=false
 Icon=kopete
 Categories=Qt;TDE;Network;InstantMessaging;
 X-DCOP-ServiceType=Unique
 X-DCOP-ServiceName=kopete
-ServiceTypes=DCOP/InstantMessenger
+X-TDE-ServiceTypes=DCOP/InstantMessenger
diff --git a/kopete/plugins/addbookmarks/kopete_addbookmarks.desktop b/kopete/plugins/addbookmarks/kopete_addbookmarks.desktop
index 2deff197..5341996e 100644
--- a/kopete/plugins/addbookmarks/kopete_addbookmarks.desktop
+++ b/kopete/plugins/addbookmarks/kopete_addbookmarks.desktop
@@ -112,7 +112,7 @@ Comment[zh_CN]=自动将收到消息中的链接加入书签
 Comment[zh_HK]=自動將收到的訊息內的連結加到書籤
 Comment[zh_TW]=自動將接收訊息中的連結加入書籤
 Icon=konqueror
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-Kopete-Version=1000900
 X-TDE-Library=kopete_addbookmarks
 X-TDE-PluginInfo-Author=Roie Kerstein
diff --git a/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop b/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop
index 7c25fdef..cf136e0a 100644
--- a/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop
+++ b/kopete/plugins/addbookmarks/kopete_addbookmarks_config.desktop
@@ -112,7 +112,7 @@ Comment[zh_CN]=自动将收到消息中的链接加入书签
 Comment[zh_HK]=自動將收到的訊息內的連結加到書籤
 Comment[zh_TW]=自動將接收訊息中的連結加入書籤
 Icon=konqueror
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_addbookmarks
diff --git a/kopete/plugins/alias/kopete_alias.desktop b/kopete/plugins/alias/kopete_alias.desktop
index d88a3c0d..3e02aa15 100644
--- a/kopete/plugins/alias/kopete_alias.desktop
+++ b/kopete/plugins/alias/kopete_alias.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=alias
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_alias
 X-TDE-PluginInfo-Author=Jason Keirstead
 X-TDE-PluginInfo-Email=jason@keirstead.org
diff --git a/kopete/plugins/alias/kopete_alias_config.desktop b/kopete/plugins/alias/kopete_alias_config.desktop
index 976c0360..cf49900b 100644
--- a/kopete/plugins/alias/kopete_alias_config.desktop
+++ b/kopete/plugins/alias/kopete_alias_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=color
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_alias
diff --git a/kopete/plugins/autoreplace/kopete_autoreplace.desktop b/kopete/plugins/autoreplace/kopete_autoreplace.desktop
index f11a8c0c..7b6adac8 100644
--- a/kopete/plugins/autoreplace/kopete_autoreplace.desktop
+++ b/kopete/plugins/autoreplace/kopete_autoreplace.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=autoreplace
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_autoreplace
 X-TDE-PluginInfo-Author=Roberto Pariset
 X-TDE-PluginInfo-Email=victorheremita@fastwebnet.it
diff --git a/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop b/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop
index 1dc4ec3e..88a1805c 100644
--- a/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop
+++ b/kopete/plugins/autoreplace/kopete_autoreplace_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=color
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_autoreplace
diff --git a/kopete/plugins/connectionstatus/kopete_connectionstatus.desktop b/kopete/plugins/connectionstatus/kopete_connectionstatus.desktop
index d8ea5d13..0bc9ee90 100644
--- a/kopete/plugins/connectionstatus/kopete_connectionstatus.desktop
+++ b/kopete/plugins/connectionstatus/kopete_connectionstatus.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 X-Kopete-Version=1000900
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_connectionstatus
 X-TDE-PluginInfo-Author=Chris Howells
 X-TDE-PluginInfo-Email=howells@kde.org
diff --git a/kopete/plugins/contactnotes/kopete_contactnotes.desktop b/kopete/plugins/contactnotes/kopete_contactnotes.desktop
index 3e39628a..7ea32497 100644
--- a/kopete/plugins/contactnotes/kopete_contactnotes.desktop
+++ b/kopete/plugins/contactnotes/kopete_contactnotes.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=identity
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_contactnotes
 X-TDE-PluginInfo-Author=Olivier Goffart
 X-TDE-PluginInfo-Email=ogoffart@tiscalinet.be
diff --git a/kopete/plugins/cryptography/kopete_cryptography.desktop b/kopete/plugins/cryptography/kopete_cryptography.desktop
index b50c12cc..3a05f7f1 100644
--- a/kopete/plugins/cryptography/kopete_cryptography.desktop
+++ b/kopete/plugins/cryptography/kopete_cryptography.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=encrypted
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_cryptography
 X-TDE-PluginInfo-Author=Olivier Goffart
 X-TDE-PluginInfo-Email=ogoffart@tiscalinet.be
diff --git a/kopete/plugins/cryptography/kopete_cryptography_config.desktop b/kopete/plugins/cryptography/kopete_cryptography_config.desktop
index 23e321aa..49f6fd99 100644
--- a/kopete/plugins/cryptography/kopete_cryptography_config.desktop
+++ b/kopete/plugins/cryptography/kopete_cryptography_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=encrypted
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_cryptography
diff --git a/kopete/plugins/highlight/kopete_highlight.desktop b/kopete/plugins/highlight/kopete_highlight.desktop
index 4812dc5f..2af49cc4 100644
--- a/kopete/plugins/highlight/kopete_highlight.desktop
+++ b/kopete/plugins/highlight/kopete_highlight.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=highlight
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_highlight
 X-TDE-PluginInfo-Author=Olivier Goffart
 X-TDE-PluginInfo-Email=ogoffart@tiscalinet.be
diff --git a/kopete/plugins/highlight/kopete_highlight_config.desktop b/kopete/plugins/highlight/kopete_highlight_config.desktop
index 697b13e2..8165de01 100644
--- a/kopete/plugins/highlight/kopete_highlight_config.desktop
+++ b/kopete/plugins/highlight/kopete_highlight_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=highlight
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_highlight
diff --git a/kopete/plugins/history/kopete_history.desktop b/kopete/plugins/history/kopete_history.desktop
index 17553fbe..5f2e7d3e 100644
--- a/kopete/plugins/history/kopete_history.desktop
+++ b/kopete/plugins/history/kopete_history.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=history
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_history
 X-TDE-PluginInfo-Author=Olivier Goffart
 X-TDE-PluginInfo-Email=ogoffart@tiscalinet.be
diff --git a/kopete/plugins/history/kopete_history_config.desktop b/kopete/plugins/history/kopete_history_config.desktop
index 80684cb9..d7975429 100644
--- a/kopete/plugins/history/kopete_history_config.desktop
+++ b/kopete/plugins/history/kopete_history_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=history
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_history
diff --git a/kopete/plugins/latex/kopete_latex.desktop b/kopete/plugins/latex/kopete_latex.desktop
index cb09d6ec..1b6206aa 100644
--- a/kopete/plugins/latex/kopete_latex.desktop
+++ b/kopete/plugins/latex/kopete_latex.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=latex
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_latex
 X-TDE-PluginInfo-Author=Duncan Mac-Vicar
 X-TDE-PluginInfo-Email=duncan@kde.org
diff --git a/kopete/plugins/latex/kopete_latex_config.desktop b/kopete/plugins/latex/kopete_latex_config.desktop
index f679ed54..673d235c 100644
--- a/kopete/plugins/latex/kopete_latex_config.desktop
+++ b/kopete/plugins/latex/kopete_latex_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=latex
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_latex
diff --git a/kopete/plugins/motionautoaway/kopete_motionaway.desktop b/kopete/plugins/motionautoaway/kopete_motionaway.desktop
index 8ed37316..09c5f68e 100644
--- a/kopete/plugins/motionautoaway/kopete_motionaway.desktop
+++ b/kopete/plugins/motionautoaway/kopete_motionaway.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 X-Kopete-Version=1000900
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_motionaway
 X-TDE-PluginInfo-Author=Duncan Mac-Vicar Prett
 X-TDE-PluginInfo-Email=duncan@kde.org
diff --git a/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop b/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop
index 2f1ae265..cf36f516 100644
--- a/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop
+++ b/kopete/plugins/motionautoaway/kopete_motionaway_config.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_motionaway
diff --git a/kopete/plugins/nowlistening/kopete_nowlistening.desktop b/kopete/plugins/nowlistening/kopete_nowlistening.desktop
index 9dde5231..57985df1 100644
--- a/kopete/plugins/nowlistening/kopete_nowlistening.desktop
+++ b/kopete/plugins/nowlistening/kopete_nowlistening.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=kaboodle
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_nowlistening
 X-TDE-PluginInfo-Author=Will Stephenson
 X-TDE-PluginInfo-Email=will@stevello.free-online.co.uk
diff --git a/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop b/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop
index 7985f663..47faa35b 100644
--- a/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop
+++ b/kopete/plugins/nowlistening/kopete_nowlistening_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kaboodle
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_nowlistening
diff --git a/kopete/plugins/smpppdcs/kopete_smpppdcs.desktop b/kopete/plugins/smpppdcs/kopete_smpppdcs.desktop
index 12a18f00..7fcf2d73 100644
--- a/kopete/plugins/smpppdcs/kopete_smpppdcs.desktop
+++ b/kopete/plugins/smpppdcs/kopete_smpppdcs.desktop
@@ -2,7 +2,7 @@
 Type=Service
 Icon=smpppdcs
 X-Kopete-Version=1000900
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_smpppdcs
 X-TDE-PluginInfo-Author=Heiko Schäfer
 X-TDE-PluginInfo-Email=heiko@rangun.de
diff --git a/kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop b/kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop
index c8b33de5..fe7425d0 100644
--- a/kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop
+++ b/kopete/plugins/smpppdcs/kopete_smpppdcs_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=smpppdcs
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_smpppdcs
diff --git a/kopete/plugins/statistics/kopete_statistics.desktop b/kopete/plugins/statistics/kopete_statistics.desktop
index 857d185a..5d759f0d 100644
--- a/kopete/plugins/statistics/kopete_statistics.desktop
+++ b/kopete/plugins/statistics/kopete_statistics.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=statistics
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_statistics
 X-TDE-PluginInfo-Author=Marc Cramdal
 X-TDE-PluginInfo-Email=marc.cramdal@yahoo.fr
diff --git a/kopete/plugins/texteffect/kopete_texteffect.desktop b/kopete/plugins/texteffect/kopete_texteffect.desktop
index 8124ad86..331bfc15 100644
--- a/kopete/plugins/texteffect/kopete_texteffect.desktop
+++ b/kopete/plugins/texteffect/kopete_texteffect.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=texteffect
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_texteffect
 X-TDE-PluginInfo-Author=Olivier Goffart
 X-TDE-PluginInfo-Email=ogoffart@tiscalinet.be
diff --git a/kopete/plugins/texteffect/kopete_texteffect_config.desktop b/kopete/plugins/texteffect/kopete_texteffect_config.desktop
index e554f7c6..5eb0a75b 100644
--- a/kopete/plugins/texteffect/kopete_texteffect_config.desktop
+++ b/kopete/plugins/texteffect/kopete_texteffect_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=texteffect
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_texteffect
diff --git a/kopete/plugins/translator/kopete_translator.desktop b/kopete/plugins/translator/kopete_translator.desktop
index a1e8ca8b..3b54cc0d 100644
--- a/kopete/plugins/translator/kopete_translator.desktop
+++ b/kopete/plugins/translator/kopete_translator.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=locale
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_translator
 X-TDE-PluginInfo-Author=Duncan Mac-Vicar Prett
 X-TDE-PluginInfo-Email=duncan@kde.org
diff --git a/kopete/plugins/translator/kopete_translator_config.desktop b/kopete/plugins/translator/kopete_translator_config.desktop
index a59090d6..6ecba9f5 100644
--- a/kopete/plugins/translator/kopete_translator_config.desktop
+++ b/kopete/plugins/translator/kopete_translator_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=locale
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_translator
diff --git a/kopete/plugins/webpresence/kopete_webpresence.desktop b/kopete/plugins/webpresence/kopete_webpresence.desktop
index 3291e5e3..49095d38 100644
--- a/kopete/plugins/webpresence/kopete_webpresence.desktop
+++ b/kopete/plugins/webpresence/kopete_webpresence.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=html
-ServiceTypes=Kopete/Plugin
+X-TDE-ServiceTypes=Kopete/Plugin
 X-TDE-Library=kopete_webpresence
 X-TDE-PluginInfo-Author=Will Stephenson
 X-TDE-PluginInfo-Email=will@stevello.free-online.co.uk
diff --git a/kopete/plugins/webpresence/kopete_webpresence_config.desktop b/kopete/plugins/webpresence/kopete_webpresence_config.desktop
index 11e33a5a..f3a696ea 100644
--- a/kopete/plugins/webpresence/kopete_webpresence_config.desktop
+++ b/kopete/plugins/webpresence/kopete_webpresence_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=html
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=kopete_webpresence
diff --git a/kopete/protocols/gadu/kopete_gadu.desktop b/kopete/protocols/gadu/kopete_gadu.desktop
index 1850ebed..a232d492 100644
--- a/kopete/protocols/gadu/kopete_gadu.desktop
+++ b/kopete/protocols/gadu/kopete_gadu.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=gadu_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-Kopete-Messaging-Protocol=messaging/gadu
 X-TDE-Library=kopete_gadu
 X-TDE-PluginInfo-Author=Grzegorz Jaskiewicz
diff --git a/kopete/protocols/groupwise/kopete_groupwise.desktop b/kopete/protocols/groupwise/kopete_groupwise.desktop
index c5d5a50f..aadcbc68 100644
--- a/kopete/protocols/groupwise/kopete_groupwise.desktop
+++ b/kopete/protocols/groupwise/kopete_groupwise.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=groupwise_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_groupwise
 X-Kopete-Messaging-Protocol=messaging/groupwise
 X-TDE-PluginInfo-Author=Will Stephenson
diff --git a/kopete/protocols/irc/kopete_irc.desktop b/kopete/protocols/irc/kopete_irc.desktop
index eb97eecf..8c7893f5 100644
--- a/kopete/protocols/irc/kopete_irc.desktop
+++ b/kopete/protocols/irc/kopete_irc.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=irc_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_irc
 X-Kopete-Messaging-Protocol=messaging/irc
 X-TDE-PluginInfo-Author=Kopete Developers
diff --git a/kopete/protocols/jabber/kopete_jabber.desktop b/kopete/protocols/jabber/kopete_jabber.desktop
index 06275807..45552e42 100644
--- a/kopete/protocols/jabber/kopete_jabber.desktop
+++ b/kopete/protocols/jabber/kopete_jabber.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=jabber_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_jabber
 X-Kopete-Messaging-Protocol=messaging/xmpp
 X-TDE-PluginInfo-Author=Kopete Developers
diff --git a/kopete/protocols/meanwhile/kopete_meanwhile.desktop b/kopete/protocols/meanwhile/kopete_meanwhile.desktop
index 450c78f9..49ae69fb 100644
--- a/kopete/protocols/meanwhile/kopete_meanwhile.desktop
+++ b/kopete/protocols/meanwhile/kopete_meanwhile.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=meanwhile_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_meanwhile
 X-Kopete-Messaging-Protocol=messaging/meanwhile
 X-TDE-PluginInfo-Author=Jeremy Kerr
diff --git a/kopete/protocols/oscar/aim/kopete_aim.desktop b/kopete/protocols/oscar/aim/kopete_aim.desktop
index d4baedb6..cf590551 100644
--- a/kopete/protocols/oscar/aim/kopete_aim.desktop
+++ b/kopete/protocols/oscar/aim/kopete_aim.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=aim_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_aim
 X-Kopete-Messaging-Protocol=messaging/aim
 X-TDE-PluginInfo-Author=Kopete Developers
diff --git a/kopete/protocols/oscar/icq/kopete_icq.desktop b/kopete/protocols/oscar/icq/kopete_icq.desktop
index 90f2381a..082e4900 100644
--- a/kopete/protocols/oscar/icq/kopete_icq.desktop
+++ b/kopete/protocols/oscar/icq/kopete_icq.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=icq_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_icq
 X-Kopete-Messaging-Protocol=messaging/icq
 X-TDE-PluginInfo-Author=Kopete Developers
diff --git a/kopete/protocols/sms/kopete_sms.desktop b/kopete/protocols/sms/kopete_sms.desktop
index c1a20458..bd542632 100644
--- a/kopete/protocols/sms/kopete_sms.desktop
+++ b/kopete/protocols/sms/kopete_sms.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=sms_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-Kopete-Messaging-Protocol=messaging/sms
 X-TDE-Library=kopete_sms
 X-TDE-PluginInfo-Author=Richard Lärkäng
diff --git a/kopete/protocols/testbed/kopete_testbed.desktop b/kopete/protocols/testbed/kopete_testbed.desktop
index 8bb84500..522c26b8 100644
--- a/kopete/protocols/testbed/kopete_testbed.desktop
+++ b/kopete/protocols/testbed/kopete_testbed.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=testbed_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_testbed
 X-Kopete-Messaging-Protocol=messaging/testbed
 X-TDE-PluginInfo-Author=Will Stephenson
diff --git a/kopete/protocols/winpopup/kopete_wp.desktop b/kopete/protocols/winpopup/kopete_wp.desktop
index 6603dbe3..20a48fd0 100644
--- a/kopete/protocols/winpopup/kopete_wp.desktop
+++ b/kopete/protocols/winpopup/kopete_wp.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=wp_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_wp
 X-Kopete-Messaging-Protocol=messaging/winpopup
 X-TDE-PluginInfo-Author=Gav Wood
diff --git a/kopete/protocols/yahoo/kopete_yahoo.desktop b/kopete/protocols/yahoo/kopete_yahoo.desktop
index 2c148a88..7ace3fe1 100644
--- a/kopete/protocols/yahoo/kopete_yahoo.desktop
+++ b/kopete/protocols/yahoo/kopete_yahoo.desktop
@@ -2,7 +2,7 @@
 Type=Service
 X-Kopete-Version=1000900
 Icon=yahoo_protocol
-ServiceTypes=Kopete/Protocol
+X-TDE-ServiceTypes=Kopete/Protocol
 X-TDE-Library=kopete_yahoo
 X-Kopete-Messaging-Protocol=messaging/yahoo
 X-TDE-PluginInfo-Author=Kopete Developers
diff --git a/kpf/kpfapplet.desktop b/kpf/kpfapplet.desktop
index bf9e24fa..b3e237cc 100644
--- a/kpf/kpfapplet.desktop
+++ b/kpf/kpfapplet.desktop
@@ -117,5 +117,5 @@ Comment[zh_TW]=能輕易在網路上分享檔案的小型網頁伺服器
 Icon=kpf
 X-TDE-Library=kpf_panelapplet
 X-TDE-UniqueApplet=true
-DocPath=kpf/index.html
+X-DocPath=kpf/index.html
 X-TDE-Parent-App=Kicker
diff --git a/kpf/kpfpropertiesdialogplugin.desktop b/kpf/kpfpropertiesdialogplugin.desktop
index 960993fd..0591468b 100644
--- a/kpf/kpfpropertiesdialogplugin.desktop
+++ b/kpf/kpfpropertiesdialogplugin.desktop
@@ -53,4 +53,4 @@ Name[zh_HK]=KPF 目錄屬性頁
 Name[zh_TW]=KPF 目錄屬性頁
 X-TDE-Library=kpfpropertiesdialog
 X-TDE-Protocol=file
-ServiceTypes=KPropsDlg/Plugin,inode/directory
+X-TDE-ServiceTypes=KPropsDlg/Plugin,inode/directory
diff --git a/kppp/Kppp.desktop b/kppp/Kppp.desktop
index 33caa95f..e2981ae7 100644
--- a/kppp/Kppp.desktop
+++ b/kppp/Kppp.desktop
@@ -59,7 +59,7 @@ Name[ne]=के पी पी पी
 Name[sv]=Kppp
 Name[zh_TW]=KPPP 撥號工具
 MimeType=
-DocPath=kppp/index.html
+X-DocPath=kppp/index.html
 Exec=kppp %i %m
 Icon=kppp
 Path=
diff --git a/krdc/krdc.desktop b/krdc/krdc.desktop
index b9827a2e..2bc4036a 100644
--- a/krdc/krdc.desktop
+++ b/krdc/krdc.desktop
@@ -58,5 +58,5 @@ GenericName[uz@cyrillic]=Масофадаги иш столига уланиш
 GenericName[zh_CN]=远程桌面连接
 GenericName[zh_HK]=遠端桌面連線
 GenericName[zh_TW]=連接遠端桌面
-DocPath=krdc/index.html
+X-DocPath=krdc/index.html
 Categories=Qt;TDE;Network;RemoteAccess;
diff --git a/krdc/smb2rdc.desktop b/krdc/smb2rdc.desktop
index c12eacd7..a83daa52 100644
--- a/krdc/smb2rdc.desktop
+++ b/krdc/smb2rdc.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=application/x-smb-server
+X-TDE-ServiceTypes=application/x-smb-server
 Actions=smb2rdc
 
 [Desktop Action smb2rdc]
diff --git a/krfb/kcm_krfb/kcmkrfb.desktop b/krfb/kcm_krfb/kcmkrfb.desktop
index cd7d6a85..35a80adb 100644
--- a/krfb/kcm_krfb/kcmkrfb.desktop
+++ b/krfb/kcm_krfb/kcmkrfb.desktop
@@ -2,7 +2,7 @@
 Icon=krfb
 Type=Application
 Exec=tdecmshell kcmkrfb
-DocPath=krfb/krfb-configuration.html
+X-DocPath=krfb/krfb-configuration.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=krfb
diff --git a/krfb/kinetd/kinetd.desktop b/krfb/kinetd/kinetd.desktop
index 8f340f71..cb1214af 100644
--- a/krfb/kinetd/kinetd.desktop
+++ b/krfb/kinetd/kinetd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=kinetd
 X-TDE-FactoryName=kinetd
diff --git a/krfb/krfb/kinetd_krfb.desktop b/krfb/krfb/kinetd_krfb.desktop
index e1c4b7f2..52139db8 100644
--- a/krfb/krfb/kinetd_krfb.desktop
+++ b/krfb/krfb/kinetd_krfb.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 
-ServiceTypes=KInetDModule
+X-TDE-ServiceTypes=KInetDModule
 Exec=krfb
 X-TDE-FactoryName=kinetd
 X-TDE-KINETD-id=krfb
diff --git a/krfb/krfb/krfb.desktop b/krfb/krfb/krfb.desktop
index efa262e2..5da6a2d7 100644
--- a/krfb/krfb/krfb.desktop
+++ b/krfb/krfb/krfb.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=krfb -caption "%c" %i %m
 Icon=krfb
-DocPath=krfb/index.html
+X-DocPath=krfb/index.html
 Terminal=false
 Name=Krfb
 Name[bn]=কে-আর-এফ-বি
diff --git a/krfb/krfb_httpd/kinetd_krfb_httpd.desktop b/krfb/krfb_httpd/kinetd_krfb_httpd.desktop
index 8d04ed3a..e464b84a 100644
--- a/krfb/krfb_httpd/kinetd_krfb_httpd.desktop
+++ b/krfb/krfb_httpd/kinetd_krfb_httpd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 
-ServiceTypes=KInetDModule
+X-TDE-ServiceTypes=KInetDModule
 Exec=krfb_httpd
 X-TDE-FactoryName=kinetd
 X-TDE-KINETD-id=krfb_httpd
diff --git a/ksirc/ksirc.desktop b/ksirc/ksirc.desktop
index 2b2832b2..feff0815 100644
--- a/ksirc/ksirc.desktop
+++ b/ksirc/ksirc.desktop
@@ -85,4 +85,4 @@ Terminal=false
 X-TDE-StartupNotify=true
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;Network;IRCClient;
-DocPath=ksirc/index.html
+X-DocPath=ksirc/index.html
diff --git a/ktalkd/kcmktalkd/kcmktalkd.desktop b/ktalkd/kcmktalkd/kcmktalkd.desktop
index 42421dcd..ea38def4 100644
--- a/ktalkd/kcmktalkd/kcmktalkd.desktop
+++ b/ktalkd/kcmktalkd/kcmktalkd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=ktalkd
 Type=Application
-DocPath=kcontrol/kcmtalkd/index.html
+X-DocPath=kcontrol/kcmtalkd/index.html
 Exec=tdecmshell kcmktalkd
 
 X-TDE-ModuleType=Library
diff --git a/lanbrowsing/kcmlisa/kcmreslisa.desktop b/lanbrowsing/kcmlisa/kcmreslisa.desktop
index 53cfea07..6be51228 100644
--- a/lanbrowsing/kcmlisa/kcmreslisa.desktop
+++ b/lanbrowsing/kcmlisa/kcmreslisa.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Icon=samba
 Exec=tdecmshell kcmreslisa
-DocPath=lisa/index.html
+X-DocPath=lisa/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=lanbrowser
 X-TDE-FactoryName=reslisa
diff --git a/lanbrowsing/kcmlisa/kcmtdeiolan.desktop b/lanbrowsing/kcmlisa/kcmtdeiolan.desktop
index 96969763..83b2f87b 100644
--- a/lanbrowsing/kcmlisa/kcmtdeiolan.desktop
+++ b/lanbrowsing/kcmlisa/kcmtdeiolan.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Icon=samba
 Exec=tdecmshell kcmtdeiolan
-DocPath=kcontrol/lanbrowser/index.html
+X-DocPath=kcontrol/lanbrowser/index.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=lanbrowser
diff --git a/lanbrowsing/tdeio_lan/lan.desktop b/lanbrowsing/tdeio_lan/lan.desktop
index c5f1f59d..965e9bd0 100644
--- a/lanbrowsing/tdeio_lan/lan.desktop
+++ b/lanbrowsing/tdeio_lan/lan.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Link
-DocPath=lisa/index.html
+X-DocPath=lisa/index.html
 URL=lan:/
 Icon=network_local
 Name=Local Network
diff --git a/tdednssd/kdedmodule/dnssdwatcher.desktop b/tdednssd/kdedmodule/dnssdwatcher.desktop
index af8d8a35..d9191059 100644
--- a/tdednssd/kdedmodule/dnssdwatcher.desktop
+++ b/tdednssd/kdedmodule/dnssdwatcher.desktop
@@ -87,7 +87,7 @@ Comment[uk]=Спостерігає за службами DNS-SD та оновл
 Comment[zh_CN]=跟踪 DNS-SD 服务并更新目录列表
 Comment[zh_HK]=監察 DNS-SD 服務並更新目錄清單
 Comment[zh_TW]=追蹤 DNS-SD 服務並更新目錄清單
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=dnssdwatcher
 X-TDE-FactoryName=dnssdwatcher
diff --git a/tdefile-plugins/torrent/tdefile_torrent.desktop b/tdefile-plugins/torrent/tdefile_torrent.desktop
index c04639e4..ca591528 100644
--- a/tdefile-plugins/torrent/tdefile_torrent.desktop
+++ b/tdefile-plugins/torrent/tdefile_torrent.desktop
@@ -48,7 +48,7 @@ Name[uk]=Інформація про Bit Torrent
 Name[zh_CN]=BitTorrent 信息
 Name[zh_HK]=Bit Torrent 資訊
 Name[zh_TW]=Bit Torrent 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_torrent
 # change MimeType here! (example: inode/directory)
 MimeType=application/x-bittorrent
diff --git a/wifi/kcmwifi/kcmwifi.desktop b/wifi/kcmwifi/kcmwifi.desktop
index 9d001a8d..55e59e98 100644
--- a/wifi/kcmwifi/kcmwifi.desktop
+++ b/wifi/kcmwifi/kcmwifi.desktop
@@ -2,7 +2,7 @@
 Icon=kwifimanager
 Type=Application
 Exec=tdecmshell kcmwifi
-DocPath=kcontrol/kcmwifi/index.html
+X-DocPath=kcontrol/kcmwifi/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=wifi
 X-TDE-RootOnly=true
diff --git a/wifi/kwifimanager.desktop b/wifi/kwifimanager.desktop
index 3a77e030..57b2c48a 100644
--- a/wifi/kwifimanager.desktop
+++ b/wifi/kwifimanager.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=kwifimanager -caption "%c" %i %m
 Icon=kwifimanager
-DocPath=kwifimanager/index.html
+X-DocPath=kwifimanager/index.html
 Comment=A wireless LAN connection monitor
 Comment[ar]=مراقب أداء وصلة الشبكة المحلية اللاسلكبة
 Comment[bg]=Мониторинг на безжичната локална мрежа