Fix ServiceTypes, ExcludeServiceTypes, and DocPath desktop file entries to match XDG specifications

340 files changed, 361 insertions, 361 deletions

diff --git a/applnk/compat/email.desktop b/applnk/compat/email.desktop
index 016b0eeb3..1791ecdd6 100644
--- a/applnk/compat/email.desktop
+++ b/applnk/compat/email.desktop
@@ -2,7 +2,7 @@
 Icon=email
 Type=Application
 Exec=tdecmshell kcm_useraccount
-DocPath=kcontrol/email/index.html
+X-DocPath=kcontrol/email/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=useraccount
 X-TDE-ParentApp=kcontrol
diff --git a/applnk/compat/passwords.desktop b/applnk/compat/passwords.desktop
index 7d90765c5..82e040fe1 100644
--- a/applnk/compat/passwords.desktop
+++ b/applnk/compat/passwords.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=tdecmshell kcm_useraccount
 Icon=password
-DocPath=kcontrol/useraccount/index.html
+X-DocPath=kcontrol/useraccount/index.html
 NoDisplay=true
 X-TDE-ModuleType=Library
 X-TDE-Library=useraccount
diff --git a/applnk/compat/userinfo.desktop b/applnk/compat/userinfo.desktop
index 376463595..3a2f97190 100644
--- a/applnk/compat/userinfo.desktop
+++ b/applnk/compat/userinfo.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=tdecmshell kcm_useraccount
 Icon=tdmconfig
-DocPath=kcontrol/useraccount/index.html
+X-DocPath=kcontrol/useraccount/index.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=useraccount
diff --git a/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop b/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
index f44293337..033223250 100644
--- a/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
+++ b/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
@@ -52,7 +52,7 @@ GenericName[vi]=Giao diện BitTorrent
 GenericName[wa]=Eterface grafike po BitTorrent
 GenericName[zh_TW]=BitTorrent 圖型使用者介面
 Icon=xapp
-InitialPreference=1
+X-TDE-InitialPreference=1
 MimeType=application/x-bittorrent
 Name=BitTorrent Python Curses GUI
 Name[be]=Графічны кліент BitTorrent на мове Python
@@ -101,6 +101,6 @@ Name[uz@cyrillic]=BitTorrent учун Python Curses график интерфе�
 Name[vi]=Con trỏ Giao diện Python BitTorrent
 Name[wa]=Eterface grafike e python po BitTorrent
 Name[zh_TW]=BitTorrent Python Curses 圖型使用者介面
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=true
 Type=Application
diff --git a/kappfinder/apps/Internet/btdownloadgui.desktop b/kappfinder/apps/Internet/btdownloadgui.desktop
index 66bff959c..671879bfc 100644
--- a/kappfinder/apps/Internet/btdownloadgui.desktop
+++ b/kappfinder/apps/Internet/btdownloadgui.desktop
@@ -52,7 +52,7 @@ GenericName[vi]=Giao diện BitTorrent
 GenericName[wa]=Eterface grafike po BitTorrent
 GenericName[zh_TW]=BitTorrent 圖型使用者介面
 Icon=xapp
-InitialPreference=2
+X-TDE-InitialPreference=2
 MimeType=application/x-bittorrent
 Name=BitTorrent Python wxGTK GUI
 Name[be]=Графічны кліент BitTorrent на мове Python для wxGTK
@@ -100,6 +100,6 @@ Name[uz@cyrillic]=BitTorrent учун Python wxGTK график интерфей
 Name[vi]=Giao diện wxGTK Python BitTorrent
 Name[wa]=Eterface grafike e python wxGTK po BitTorrent
 Name[zh_TW]=BitTorrent Python wxGTK 圖型使用者介面
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=false
 Type=Application
diff --git a/kappfinder/apps/Internet/javaws.desktop b/kappfinder/apps/Internet/javaws.desktop
index bed9f6f98..fada7245a 100644
--- a/kappfinder/apps/Internet/javaws.desktop
+++ b/kappfinder/apps/Internet/javaws.desktop
@@ -27,7 +27,7 @@ Name[tr]=Jawa Web Start
 Name[uk]=Запуск програм Java з мережі
 Name[vi]=Khởi động Java Mạng
 Name[wa]=Enondaedje di Java sol daegntoele
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=false
 Type=Application
 Icon=java
diff --git a/kappfinder/apps/Multimedia/XMovie.desktop b/kappfinder/apps/Multimedia/XMovie.desktop
index 594a2f914..25a1a9e4e 100644
--- a/kappfinder/apps/Multimedia/XMovie.desktop
+++ b/kappfinder/apps/Multimedia/XMovie.desktop
@@ -96,5 +96,5 @@ Exec=xmovie
 Terminal=false
 Icon=xmovie
 MimeType=video/x-msvideo;video/quicktime;video/x-flic;video/mpeg;video/x-mpeg;
-InitialPreference=10
+X-TDE-InitialPreference=10
 Type=Application
diff --git a/kappfinder/apps/Multimedia/aviplay.desktop b/kappfinder/apps/Multimedia/aviplay.desktop
index 058a89890..a19f9d717 100644
--- a/kappfinder/apps/Multimedia/aviplay.desktop
+++ b/kappfinder/apps/Multimedia/aviplay.desktop
@@ -93,6 +93,6 @@ Name[ven]=U tamba ha Avi
 Name[vi]=Chơi Avi
 Name[xh]=Umdlalo we Avi
 Name[zu]=Umdlali we-Avi
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 
diff --git a/kappfinder/apps/Multimedia/gtv.desktop b/kappfinder/apps/Multimedia/gtv.desktop
index cac898444..2a7eb0ca8 100644
--- a/kappfinder/apps/Multimedia/gtv.desktop
+++ b/kappfinder/apps/Multimedia/gtv.desktop
@@ -88,5 +88,5 @@ Name[bn]=জিটিভি
 Name[hi]=जीटीवी
 Name[te]=జిటివి
 Name[th]=GTV 
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
diff --git a/kappfinder/apps/Multimedia/mplayer.desktop b/kappfinder/apps/Multimedia/mplayer.desktop
index 0dc6a15c3..e08dbc8e1 100644
--- a/kappfinder/apps/Multimedia/mplayer.desktop
+++ b/kappfinder/apps/Multimedia/mplayer.desktop
@@ -95,7 +95,7 @@ Name[sv]=Mplayer
 Name[ta]=Mசாதனம்
 Name[te]=ఎంప్లెయర్
 Name[ven]=Tshitambisi tsha M
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 X-TDE-Protocols=http
 
diff --git a/kappfinder/apps/Multimedia/ogle.desktop b/kappfinder/apps/Multimedia/ogle.desktop
index 18a650326..e50b28a1f 100644
--- a/kappfinder/apps/Multimedia/ogle.desktop
+++ b/kappfinder/apps/Multimedia/ogle.desktop
@@ -91,7 +91,7 @@ Name[ta]=ஓகல்
 Name[te]=ఒగిల్
 Name[th]=Ogel
 Name[ven]=Zondolola
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 X-TDE-SubstituteUID=false
 X-TDE-Username=
diff --git a/kappfinder/apps/Multimedia/oqtplayer.desktop b/kappfinder/apps/Multimedia/oqtplayer.desktop
index 8002acf64..d511da23a 100644
--- a/kappfinder/apps/Multimedia/oqtplayer.desktop
+++ b/kappfinder/apps/Multimedia/oqtplayer.desktop
@@ -98,7 +98,7 @@ Name[ven]=Tshitambi tsha OQTP
 Name[xh]=Umdlali we OQT
 Name[zh_TW]=OQT 播放器
 Name[zu]=Umdlali we-OQT
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 X-TDE-SubstituteUID=false
 X-TDE-Username=
diff --git a/kappfinder/apps/Multimedia/xine.desktop b/kappfinder/apps/Multimedia/xine.desktop
index 2340371f8..3944dbeb8 100644
--- a/kappfinder/apps/Multimedia/xine.desktop
+++ b/kappfinder/apps/Multimedia/xine.desktop
@@ -88,6 +88,6 @@ Name=Xine
 Name[hi]=एक्साइन
 Name[lo]=ສຸວັນທອງ
 Name[te]=క్సైన్
-ServiceTypes=
+X-TDE-ServiceTypes=
 Type=Application
 
diff --git a/kappfinder/apps/Office/Applix.desktop b/kappfinder/apps/Office/Applix.desktop
index 0b0da803a..e80336063 100644
--- a/kappfinder/apps/Office/Applix.desktop
+++ b/kappfinder/apps/Office/Applix.desktop
@@ -10,7 +10,7 @@ MimeType=
 Exec=applix
 Icon=applixware
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Office Suite
diff --git a/kappfinder/apps/Office/WordPerfect.desktop b/kappfinder/apps/Office/WordPerfect.desktop
index 8870b18b2..26ea75802 100644
--- a/kappfinder/apps/Office/WordPerfect.desktop
+++ b/kappfinder/apps/Office/WordPerfect.desktop
@@ -19,7 +19,7 @@ MimeType=application/wordperfect;
 Exec=xwp
 Icon=wp
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Word Processor
diff --git a/kappfinder/apps/Office/WordPerfect2000.desktop b/kappfinder/apps/Office/WordPerfect2000.desktop
index 15ad77ae0..ed733f761 100644
--- a/kappfinder/apps/Office/WordPerfect2000.desktop
+++ b/kappfinder/apps/Office/WordPerfect2000.desktop
@@ -19,7 +19,7 @@ MimeType=application/wordperfect;application/msword;application/x-winword97;
 Exec=wordperfect
 Icon=wp
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Word Processor
diff --git a/kappfinder/apps/Office/XAcc.desktop b/kappfinder/apps/Office/XAcc.desktop
index ba50dd74d..9169d45bf 100644
--- a/kappfinder/apps/Office/XAcc.desktop
+++ b/kappfinder/apps/Office/XAcc.desktop
@@ -9,7 +9,7 @@ MimeType=
 Exec=xacc
 Icon=xapp
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Personal Accounting Tool
diff --git a/kappfinder/apps/Office/XsLite.desktop b/kappfinder/apps/Office/XsLite.desktop
index 27bf3c4aa..6cd0fb19c 100644
--- a/kappfinder/apps/Office/XsLite.desktop
+++ b/kappfinder/apps/Office/XsLite.desktop
@@ -11,7 +11,7 @@ MimeType=
 Exec=xslite
 Icon=xapp
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Spread Sheet
diff --git a/kappfinder/apps/Office/acroread.desktop b/kappfinder/apps/Office/acroread.desktop
index 827c4aec7..3a94f34ad 100644
--- a/kappfinder/apps/Office/acroread.desktop
+++ b/kappfinder/apps/Office/acroread.desktop
@@ -29,7 +29,7 @@ Name[zu]=Umfundi we-Acrobat
 MimeType=application/pdf;
 Exec=acroread %f
 Type=Application
-DocPath=
+X-DocPath=
 GenericName=PDF Viewer
 GenericName[af]=Pdf Aansig
 GenericName[ar]=عارض الملفات PDF
diff --git a/kappfinder/apps/Office/gnucash.desktop b/kappfinder/apps/Office/gnucash.desktop
index 411f7d33e..5fc1cc647 100644
--- a/kappfinder/apps/Office/gnucash.desktop
+++ b/kappfinder/apps/Office/gnucash.desktop
@@ -13,7 +13,7 @@ Name[tg]=Пули Gnu
 Name[ven]=Tshelede ya Gnu
 Exec=gnucash
 Type=Application
-DocPath=
+X-DocPath=
 GenericName=Finance Manager
 GenericName[af]=Finansiële Bestuurder
 GenericName[ar]=أداة لإدارة الأموال
diff --git a/kappfinder/apps/Office/mrproject.desktop b/kappfinder/apps/Office/mrproject.desktop
index a8d7fc25e..dfe5a34e4 100644
--- a/kappfinder/apps/Office/mrproject.desktop
+++ b/kappfinder/apps/Office/mrproject.desktop
@@ -15,7 +15,7 @@ Name[ven]=Radziphurodzhekiti
 Name[vi]=Ngài Dự án
 Exec=mrproject
 Type=Application
-DocPath=
+X-DocPath=
 GenericName=Project Manager
 GenericName[af]=Projek Bestuurder
 GenericName[ar]=أداة لإدارة المشاريع
diff --git a/kappfinder/apps/Office/plan.desktop b/kappfinder/apps/Office/plan.desktop
index d20780d61..56be264ee 100644
--- a/kappfinder/apps/Office/plan.desktop
+++ b/kappfinder/apps/Office/plan.desktop
@@ -25,7 +25,7 @@ MimeType=
 Exec=plan
 Icon=plan
 Path=
-DocPath=
+X-DocPath=
 Type=Application
 Terminal=false
 GenericName=Calendar Manager
diff --git a/kappfinder/apps/Office/pybliographic.desktop b/kappfinder/apps/Office/pybliographic.desktop
index b4a98fa91..36627f116 100644
--- a/kappfinder/apps/Office/pybliographic.desktop
+++ b/kappfinder/apps/Office/pybliographic.desktop
@@ -82,7 +82,7 @@ GenericName[zh_TW]=書目資料庫
 GenericName[zu]=Isiqu sedata somlando
 Exec=pybliographic
 Icon=pybliographic
-InitialPreference=2
+X-TDE-InitialPreference=2
 MimeType=text/x-bibtex
 Name=Pybliographic
 Name[af]=Pybliografie
@@ -96,6 +96,6 @@ Name[pa]=ਫੀਬਬਲੀਓਗਰਾਫ
 Name[te]=పైబ్లియొగ్రాఫిక్
 Name[tg]=Иттилооти китобшиноси P
 Path=
-ServiceTypes=
+X-TDE-ServiceTypes=
 Terminal=false
 Type=Application
diff --git a/kate/data/kate.desktop b/kate/data/kate.desktop
index 6c176b7d5..b09f33049 100644
--- a/kate/data/kate.desktop
+++ b/kate/data/kate.desktop
@@ -88,9 +88,9 @@ X-TDE-StartupNotify=true
 X-TDE-HasTempFileOption=true
 Icon=kate
 Path=
-DocPath=kate/index.html
+X-DocPath=kate/index.html
 Type=Application
 Terminal=false
-InitialPreference=8
+X-TDE-InitialPreference=8
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;TextEditor;
diff --git a/kate/data/kwrite.desktop b/kate/data/kwrite.desktop
index 6bbdf70c6..dd64b58cd 100644
--- a/kate/data/kwrite.desktop
+++ b/kate/data/kwrite.desktop
@@ -103,9 +103,9 @@ Exec=kwrite %U
 X-TDE-StartupNotify=true
 Icon=kwrite
 Path=
-DocPath=kwrite/index.html
+X-DocPath=kwrite/index.html
 Type=Application
 Terminal=false
-InitialPreference=8
+X-TDE-InitialPreference=8
 X-DCOP-ServiceType=Multi
 Categories=Qt;TDE;TextEditor;
diff --git a/kcontrol/access/kaccess.desktop b/kcontrol/access/kaccess.desktop
index f7637379e..3cb7de873 100644
--- a/kcontrol/access/kaccess.desktop
+++ b/kcontrol/access/kaccess.desktop
@@ -75,4 +75,4 @@ Name[zh_TW]=無障礙工具
 Exec=kaccess
 X-DCOP-ServiceType=None
 X-TDE-ParentApp=kcontrol
-DocPath=kcontrol/kcmaccess/index.html
+X-DocPath=kcontrol/kcmaccess/index.html
diff --git a/kcontrol/access/kcmaccess.desktop b/kcontrol/access/kcmaccess.desktop
index 46830a2ea..8c2c88f13 100644
--- a/kcontrol/access/kcmaccess.desktop
+++ b/kcontrol/access/kcmaccess.desktop
@@ -2,7 +2,7 @@
 Icon=access
 Type=Application
 Exec=tdecmshell kcmaccess
-DocPath=kcontrol/kcmaccess/index.html
+X-DocPath=kcontrol/kcmaccess/index.html
 
 
 X-TDE-Library=access
diff --git a/kcontrol/arts/arts.desktop b/kcontrol/arts/arts.desktop
index fd44a7e63..f88084275 100644
--- a/kcontrol/arts/arts.desktop
+++ b/kcontrol/arts/arts.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell arts
 Icon=arts
 Type=Application
-DocPath=kcontrol/arts/index.html
+X-DocPath=kcontrol/arts/index.html
 
 
 X-TDE-Library=arts
diff --git a/kcontrol/background/background.desktop b/kcontrol/background/background.desktop
index 26daa4d10..4d4f8e99b 100644
--- a/kcontrol/background/background.desktop
+++ b/kcontrol/background/background.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell background
 Icon=background
 Type=Application
-DocPath=kcontrol/background/index.html
+X-DocPath=kcontrol/background/index.html
 
 
 X-TDE-Library=background
diff --git a/kcontrol/bell/bell.desktop b/kcontrol/bell/bell.desktop
index 24ed20b22..f38a031f2 100644
--- a/kcontrol/bell/bell.desktop
+++ b/kcontrol/bell/bell.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell bell
 Icon=bell
 Type=Application
-DocPath=kcontrol/bell/index.html
+X-DocPath=kcontrol/bell/index.html
 Categories=Qt;TDE;X-TDE-settings-sound;
 
 
diff --git a/kcontrol/clock/clock.desktop b/kcontrol/clock/clock.desktop
index 047514006..b99ef16e4 100644
--- a/kcontrol/clock/clock.desktop
+++ b/kcontrol/clock/clock.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=tdecmshell tde-clock.desktop
 Icon=date
-DocPath=kcontrol/clock/index.html
+X-DocPath=kcontrol/clock/index.html
 
 
 X-TDE-Library=clock
diff --git a/kcontrol/colors/colors.desktop b/kcontrol/colors/colors.desktop
index a9e1d6663..ecd3a5c97 100644
--- a/kcontrol/colors/colors.desktop
+++ b/kcontrol/colors/colors.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell colors
 Icon=colorscm
 Type=Application
-DocPath=kcontrol/colors/index.html
+X-DocPath=kcontrol/colors/index.html
 
 
 X-TDE-Library=colors
diff --git a/kcontrol/componentchooser/componentchooser.desktop b/kcontrol/componentchooser/componentchooser.desktop
index 9f60cfdb9..fdd1d417d 100644
--- a/kcontrol/componentchooser/componentchooser.desktop
+++ b/kcontrol/componentchooser/componentchooser.desktop
@@ -4,7 +4,7 @@ Icon=misc
 Type=Application
 X-TDE-Library=componentchooser
 X-TDE-ParentApp=kcontrol
-DocPath=kcontrol/componentchooser/index.html
+X-DocPath=kcontrol/componentchooser/index.html
 Categories=Qt;TDE;X-TDE-settings-components;
 
 Name=Default Applications
diff --git a/kcontrol/crypto/crypto.desktop b/kcontrol/crypto/crypto.desktop
index 3875f7efc..9561189d2 100644
--- a/kcontrol/crypto/crypto.desktop
+++ b/kcontrol/crypto/crypto.desktop
@@ -2,7 +2,7 @@
 Icon=encrypted
 Type=Application
 Exec=tdecmshell crypto
-DocPath=kcontrol/crypto/index.html
+X-DocPath=kcontrol/crypto/index.html
 
 X-TDE-Library=crypto
 X-TDE-ParentApp=kcontrol
diff --git a/kcontrol/css/kcmcss.desktop b/kcontrol/css/kcmcss.desktop
index 36d2b4817..97bf00944 100644
--- a/kcontrol/css/kcmcss.desktop
+++ b/kcontrol/css/kcmcss.desktop
@@ -2,7 +2,7 @@
 Icon=stylesheet
 Type=Application
 Exec=tdecmshell kcmcss
-DocPath=kcontrol/kcmcss/index.html
+X-DocPath=kcontrol/kcmcss/index.html
 
 
 X-TDE-Library=css
diff --git a/kcontrol/display/display.desktop b/kcontrol/display/display.desktop
index 3ac5f3934..b5c8b8117 100644
--- a/kcontrol/display/display.desktop
+++ b/kcontrol/display/display.desktop
@@ -2,7 +2,7 @@
 Icon=tdescreensaver
 Type=Application
 Exec=tdecmshell display
-DocPath=kcontrol/display/index.html
+X-DocPath=kcontrol/display/index.html
 
 X-TDE-Library=display
 X-TDE-FactoryName=display
diff --git a/kcontrol/displayconfig/displayconfig.desktop b/kcontrol/displayconfig/displayconfig.desktop
index f9ef8241a..05f1b58eb 100644
--- a/kcontrol/displayconfig/displayconfig.desktop
+++ b/kcontrol/displayconfig/displayconfig.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell displayconfig
 Icon=background
 Type=Application
-DocPath=kcontrol/displayconfig/index.html
+X-DocPath=kcontrol/displayconfig/index.html
 
 X-TDE-Library=displayconfig
 X-TDE-ParentApp=kcontrol
diff --git a/kcontrol/dnssd/kcm_tdednssd.desktop b/kcontrol/dnssd/kcm_tdednssd.desktop
index 178b844d2..bf7e627bb 100644
--- a/kcontrol/dnssd/kcm_tdednssd.desktop
+++ b/kcontrol/dnssd/kcm_tdednssd.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell kcm_tdednssd
 Icon=network_local
 MimeType=
-DocPath=kcontrol/dnssd/index.html
+X-DocPath=kcontrol/dnssd/index.html
 StartupNotify=true
 Terminal=false
 Type=Application
diff --git a/kcontrol/ebrowsing/ebrowsing.desktop b/kcontrol/ebrowsing/ebrowsing.desktop
index 8bb86c42c..2371d2811 100644
--- a/kcontrol/ebrowsing/ebrowsing.desktop
+++ b/kcontrol/ebrowsing/ebrowsing.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/ebrowsing/index.html
+X-DocPath=kcontrol/ebrowsing/index.html
 Icon=enhanced_browsing
 Exec=tdecmshell ebrowsing
 
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.desktop b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.desktop
index ca54eec81..f8de6b2a0 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.desktop
@@ -66,5 +66,5 @@ Name[zh_CN]=Internet 关键字过滤
 Name[zh_TW]=Internet 關鍵字過濾
 Name[zu]=Ihluzo lamagama abalulekile e-Internet
 X-TDE-Library=libkuriikwsfilter
-ServiceTypes=KURIFilter/Plugin
-InitialPreference=1
+X-TDE-ServiceTypes=KURIFilter/Plugin
+X-TDE-InitialPreference=1
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.desktop b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.desktop
index d70b4cf1d..1dabcda68 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.desktop
@@ -64,5 +64,5 @@ Name[zh_CN]=搜索关键字过滤
 Name[zh_TW]=搜索關鍵字過濾
 Name[zu]=Ihluzo lamagama abalulekile okusesha
 X-TDE-Library=libkurisearchfilter
-ServiceTypes=KURIFilter/Plugin
-InitialPreference=4
+X-TDE-ServiceTypes=KURIFilter/Plugin
+X-TDE-InitialPreference=4
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/acronym.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/acronym.desktop
index ddd1039d4..42c0cb8ac 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/acronym.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/acronym.desktop
@@ -76,7 +76,7 @@ Name[xh]=Isiseko sedata Segama elenziwe ngonoobumba bamanye amagama
 Name[zh_CN]=首字母缩写数据库
 Name[zh_TW]=Acronym 資料庫
 Name[zu]=Isiqu sedata samagama asho okufanayo
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=ad,acro,acronym
 Query=http://www.chemie.de/tools/acronym.php3?language=e&acronym=\\{@}
 Query[ne]=http://www.chemie.de/tools/acronym.php3?language=eacronym=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa.desktop
index aaa75e772..75adb0eab 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa.desktop
@@ -9,6 +9,6 @@ Name[ne]=एलेक्सा
 Name[pa]=ਅਲੀਕਸਾ
 Name[ta]=அலெக்சா
 Name[te]=ఎలెక్సా
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=al,alexa
 Query=http://info.alexa.com/search?q=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop
index 70b93be4d..886c974b0 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/alexa_url.desktop
@@ -38,6 +38,6 @@ Name[te]=ఎలెక్సా యూ అర్ ఎల్
 Name[vi]=Địa chỉ Alexa
 Name[wa]=URL d' Alexa
 Name[zu]=I-URL ye-Alexa
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=alu,url
 Query=http://info.alexa.com/data/details?url=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop
index fca85d4d2..bd74b3377 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/alltheweb.desktop
@@ -40,6 +40,6 @@ Name[vi]=Tìm mọi trang mạng nhanh
 Name[wa]=AllTheWeb rade
 Name[xh]=Yonke i Web ngokukhawuleza
 Name[zu]=Yonke i-Web ngokushesha
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=atw,alltheweb
 Query=http://www.alltheweb.com/search?exec=FAST+Search&type=all&query=\\{@}&cat=web
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/altavista.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/altavista.desktop
index 42b273d68..664980309 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/altavista.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/altavista.desktop
@@ -14,7 +14,7 @@ Name[sv]=Altavista
 Name[ta]=அல்டாவிஸ்டா
 Name[te]=ఆల్టావిస్టా
 Name[th]=อัลต้าวิสต้า
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=av,altavista
 Query=http://www.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}
 Query[nb]=http://no.altavista.com/cgi-bin/query?pg=q&kl=XX&stype=stext&q=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/amg.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/amg.desktop
index 908f3fee8..b95e2472f 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/amg.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/amg.desktop
@@ -45,5 +45,5 @@ Name[zh_CN]=全音乐指南
 Name[zh_TW]=所有音樂指南
 Query=http://www.allmusic.com/cg/amg.dll?p=amg&opt1=1&sql=\\{@}
 Query[ne]=http://www.allmusic.com/cg/amg.dll?p=amgopt1=1&sql=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/appsy.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/appsy.desktop
index 13584e1f3..3ad806783 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/appsy.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/appsy.desktop
@@ -78,7 +78,7 @@ Name[xh]=Uphendlo lwe KDE App
 Name[zh_CN]=KDE 应用程序搜索
 Name[zh_TW]=KDE 程式搜尋
 Name[zu]=Usesho lwe-App lwe-KDE
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=apps,appsy
 Query=http://www.kde-apps.org/content/search.php?search=Search&name=\\{@}
 Query[ne]=http://www.kde-apps.org/content/search.php?search=Searchname=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/austronaut.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/austronaut.desktop
index 9dddb3a59..6bc6ca4ee 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/austronaut.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/austronaut.desktop
@@ -11,7 +11,7 @@ Name[sv]=Astronaut
 Name[ta]=ஆஸ்ட்ரோநட்
 Name[te]=ఆస్ట్రొనాట్
 Name[zu]=Umuntu wasemkhathini
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=austro,austronaut
 Query=http://austronaut.at/page.php?begriff=\{@}&wo=at
 Query[ko]=http://austronaut.at/page.php?begriff=\\{@}&wo=at
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/backports.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/backports.desktop
index ac9c933fb..60d89b92c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/backports.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/backports.desktop
@@ -62,5 +62,5 @@ Name[wa]=Cweraedje Backports Debian
 Name[zh_CN]=Debian 后端搜索
 Name[zh_TW]=Debian Backports 搜尋
 Query=http://www.backports.org/package.php?search=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugft.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugft.desktop
index 1984716d1..2a5ebd5b6 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugft.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugft.desktop
@@ -77,5 +77,5 @@ Name[zh_CN]=KDE 错误数据库全文检索
 Name[zh_TW]=KDE 臭蟲資料庫全文檢索
 Name[zu]=Usesho lwe-KDE lombhalo ogcwele lwesiqu sedata sedata
 Query=http://bugs.kde.org/simple_search.cgi?id=\\{1}+\\{2}+\\{3}+\\{4}+\\{5}+\\{6}+\\{7}+\\{8}+\\{9}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugno.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugno.desktop
index 1f63fb72f..117d89d6f 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugno.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/bugno.desktop
@@ -78,5 +78,5 @@ Name[zh_CN]=TDE 错误数据库按错误编号搜索
 Name[zh_TW]=TDE 臭蟲資料庫按錯誤編號搜索
 Name[zu]=Usesho lwe-TDE lwenombolo yegciwane lwesiqu sedata segciwane
 Query=http://bugs.pearsoncomputing.net/show_bug.cgi?id=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/call.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/call.desktop
index 527bf39f1..f9dd2e2e3 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/call.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/call.desktop
@@ -66,5 +66,5 @@ Name[wa]=Båze di dnêyes callsign QRZ.com
 Name[zh_CN]=QRZ.com Callsign 数据库
 Name[zh_TW]=QRZ.com Callsign 資料庫
 Query=http://www.qrz.com/database?callsign=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/cia.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/cia.desktop
index 1bd7725f2..4427ed026 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/cia.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/cia.desktop
@@ -41,5 +41,5 @@ Query[he]=http://www.google.co.il/search?q=allintitle%3A\\{@}+world+factbook+sit
 Query[ja]=http://www.google.com/search?q=allintitle%3A\\{@}+world+fact+book+site%3Awww.cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky
 Query[nds]=http://www.google.com/search?q=allintitle%3A\\{@}+world+fact+book+site%3Awww.cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky
 Query[th]=http://www.google.com/search?q=allintitle%3A\\{@}+world+fact+book+site%3Awww.cia.gov&ie=UTF-8&btnI=I%27m+Feeling+Lucky
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/citeseer.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/citeseer.desktop
index c92d86d0b..9628ece9e 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/citeseer.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/citeseer.desktop
@@ -68,5 +68,5 @@ Name[wa]=CiteSeer: Didjitåle livreye di literateure siyintifike
 Name[zh_TW]=CiteSeer: 科學文獻數位圖書館
 Query=http://citeseer.ist.psu.edu/cs?q=\\{@}&submit=Search+Documents&cs=1
 Query[ne]=http://citeseer.ist.psu.edu/cs?q=\\{@}submit=Search+Documents&cs=1
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/cpan.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/cpan.desktop
index fe2503e13..fa8e75ef8 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/cpan.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/cpan.desktop
@@ -49,5 +49,5 @@ Name[vi]=CPAN - Mạng lưới lưu trữ Perl đầy đủ
 Name[xh]=CPAN - Enomxholo Perl Indawo yokugcina Yomsebenzi womnatha
 Name[zh_TW]=CPAN - 全面的 Perl 收集網路
 Query=http://search.cpan.org/search?mode=\\{mode,2,"dist"}&query=\\{query,q,1}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan.desktop
index 824a7f8b0..f06db1640 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan.desktop
@@ -50,5 +50,5 @@ Name[zh_TW]=CTAN - 全面的 Tex 收集網路
 Query=http://tug.ctan.org/cgi-bin/filenameSearch.py?action=/search/&filename=\\{ at }
 Query[ja]=http://tug.ctan.org/tools/filenamesearch.py?action=/search/&filename=\\\\{ at }
 Query[tg]=http://tug.ctan.org/cgi-bin/filenameSearch.py?action=/search/&filename=\\{ аз }
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop
index faa4f7fce..74a4260c5 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/ctan_cat.desktop
@@ -73,5 +73,5 @@ Name[wa]=Catalogue do CTAN
 Name[zh_CN]=CTAN 目录
 Name[zh_TW]=CTAN 目錄
 Query=http://www.ctan.org/tools/cataloguesearch?action=/search/&catstring=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/dbug.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/dbug.desktop
index d580154e2..5fdafd659 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/dbug.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/dbug.desktop
@@ -63,5 +63,5 @@ Name[wa]=Cweraedje di Bug BTS Debian
 Name[zh_CN]=Debian BTS Bug 搜索
 Name[zh_TW]=Debian BTS 臭蟲搜尋
 Query=http://bugs.debian.org/\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2en.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2en.desktop
index c8717a2d4..842a369d7 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2en.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2en.desktop
@@ -65,5 +65,5 @@ Name[vi]=dict.cc Dịch: Tiếng Đức sang tiếng Anh
 Name[wa]=Ratournadje dict.cc: Almand viè inglès
 Name[zh_TW]=dict.cc 翻譯: 德文至英文
 Query=http://www.dict.cc/?s=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2fr.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2fr.desktop
index 646f3313e..ad8b70439 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2fr.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/de2fr.desktop
@@ -66,7 +66,7 @@ Name[uz@cyrillic]=LEO - Немисчадан Французчага таржим
 Name[vi]=LEO - Dịch tiếng Đức sang tiếng Pháp
 Name[wa]=LEO - Ratourner etur l' almand et l' francès
 Name[zh_TW]=LEO - 翻譯德語和法語
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=de2fr
 Query=http://dict.leo.org/?lp=frde&search=\\{@}
 Query[ne]=http://dict.leo.org/?lp=frdesearch=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/deb.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/deb.desktop
index 7422c8776..6e3ed6865 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/deb.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/deb.desktop
@@ -68,5 +68,5 @@ Name[wa]=Cweraedje di pakets Debian
 Name[zh_CN]=Debian 软件包搜索
 Name[zh_TW]=Debian 套件搜尋
 Query=http://packages.debian.org/\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop
index 5715e5161..6fa4d4938 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/dmoz.desktop
@@ -45,7 +45,7 @@ Name[wa]=Drovi ridant
 Name[xh]=Vula Ulawulo
 Name[zh_TW]=開啟目錄
 Name[zu]=Vula Uhlu lwamafayela
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=dmoz,odp
 Query=http://search.dmoz.org/cgi-bin/search?search=\\{@}
 Query[ne]=http://search.dmoz.org/cgi-bin/search?खोज्नुहोस्=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/docbook.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/docbook.desktop
index fd422d7ba..be77b6c7b 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/docbook.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/docbook.desktop
@@ -68,5 +68,5 @@ Name[zh_CN]=DocBook - 权威的指南
 Name[zh_TW]=DocBook - 終極指南
 Name[zu]=DocBook - Umbonisi ochazayo
 Query=http://www.docbook.org/tdg/en/html/\\{1}.html
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/doi.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/doi.desktop
index 07b5a0a52..50c542214 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/doi.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/doi.desktop
@@ -59,5 +59,5 @@ Name[wa]=Idintifieu di didjitås agayons
 Name[zh_TW]=數位物件識別
 Query=http://dx.doi.org/\\{@}
 Query[sk]=http://dx.doi.org/\\{@
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2de.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2de.desktop
index 3e5861baf..06eb00216 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2de.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2de.desktop
@@ -69,5 +69,5 @@ Name[vi]=dict.cc Dịch: Tiếng Anh sang tiếng Đức
 Name[wa]=Ratournaedje dict.cc di l' inglès viè l' almand
 Name[zh_TW]=dict.cc 翻譯: 英文至德文
 Query=http://www.dict.cc/?s=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2es.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2es.desktop
index 06a71322e..470d62644 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2es.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2es.desktop
@@ -72,5 +72,5 @@ Name[wa]=WordReference.com ratournaedje di l' inglès viè l' espagnol
 Name[zh_CN]=WordReference.com 翻译：英语译西班牙语
 Name[zh_TW]=WordReference.com 翻譯: 英文至西班牙文
 Query=http://www.wordreference.com/es/translation.asp?tranword=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2fr.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2fr.desktop
index 545d8fc2b..86258bfc2 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2fr.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2fr.desktop
@@ -72,5 +72,5 @@ Name[wa]=WordReference.com ratournaedje di l' inglès viè l' francès
 Name[zh_CN]=WordReference.com 翻译：英语译法语
 Name[zh_TW]=WordReference.com 翻譯: 英文至法文
 Query=http://www.wordreference.com/fr/Translation.asp?enfr=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2it.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2it.desktop
index f4db13931..740480554 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2it.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/en2it.desktop
@@ -72,5 +72,5 @@ Name[wa]=WordReference.com ratournaedje di l' inglès viè l' itålyin
 Name[zh_CN]=WordReference.com 翻译：英语译意大利语
 Name[zh_TW]=WordReference.com 翻譯: 英文至義大利文
 Query=http://www.wordreference.com/it/translation.asp?enit=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/es2en.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/es2en.desktop
index 48e49a249..5d215dbd7 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/es2en.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/es2en.desktop
@@ -72,5 +72,5 @@ Name[wa]=WordReference.com ratournaedje do castiyan viè l' inglès
 Name[zh_CN]=WordReference.com 翻译：西班牙语译英语
 Name[zh_TW]=WordReference.com 翻譯: 西班牙文至英文
 Query=http://www.wordreference.com/es/en/translation.asp?spen=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/excite.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/excite.desktop
index f889c0257..bc19aa7e3 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/excite.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/excite.desktop
@@ -16,7 +16,7 @@ Name[te]=ఎక్సైట్
 Name[ven]=Takadza
 Name[vi]=Tra Excite
 Name[zu]=Jabulisa
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=ex,excite
 Query=http://search.excite.com/search.gw?search=\\{@}
 Query[en_GB]=http://www.excite.co.uk/search/web/results?q=\\{@}&c=web
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/feedster.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/feedster.desktop
index 4843936df..74d964ea0 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/feedster.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/feedster.desktop
@@ -10,7 +10,7 @@ Name[ta]=பீட்ஸ்டர்
 Name[te]=ఫీడ్ స్టర్
 Name[th]=Feedster หาบล็อก
 Name[vi]=Tra Feedster
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=blog,rss,feedster
 Query=http://www.feedster.com/search.php?q=\\{@}&ie=UTF-8&oe=UTF-8
 Query[he]=http://www.feedster.com/search.php?q=\\{@}&ie=UTF8&oe=UTF-88
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/foldoc.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/foldoc.desktop
index 2ff15b7a7..ca7eac200 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/foldoc.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/foldoc.desktop
@@ -67,6 +67,6 @@ Name[vi]=Từ điển Tin học Trực tuyến Miễn phí
 Name[wa]=Diccionaire informatike libe so les fyis
 Name[zh_CN]=Free On-Line Dictionary Of Computing
 Name[zh_TW]=免費的線上電腦辭典
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=fd,foldoc
 Query=http://foldoc.doc.ic.ac.uk/foldoc/foldoc.cgi?query=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2de.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2de.desktop
index c73229494..bddc4b604 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2de.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2de.desktop
@@ -66,7 +66,7 @@ Name[uz@cyrillic]=LEO - Французчадан Немисчага таржим
 Name[vi]=LEO - Dịch tiếng Pháp sang tiếng Đức
 Name[wa]=LEO - Ratournaedje do francès viè l' almand
 Name[zh_TW]=LEO - 翻譯法語和德語
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=fr2de
 Query=http://dict.leo.org/?lp=frde&search=\\{@}
 Query[ne]=http://dict.leo.org/?lp=frdesearch=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2en.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2en.desktop
index 44694be00..a399d5921 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2en.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/fr2en.desktop
@@ -72,5 +72,5 @@ Name[wa]=WordReference.com ratournaedje do francès viè l' inglès
 Name[zh_CN]=WordReference.com 翻译：法语译英语
 Name[zh_TW]=WordReference.com 翻譯: 法文至英文
 Query=http://www.wordreference.com/fr/en/translation.asp?fren=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/freedb.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/freedb.desktop
index 0ee044112..43a8ae0a0 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/freedb.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/freedb.desktop
@@ -9,7 +9,7 @@ Name[ta]=இலவசடிபி
 Name[te]=ఫ్రీడిబి
 Name[tg]=ОзодиDB
 Name[vi]=Tra FreeDB
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=fdb,freedb
 Query=http://www.freedb.org/freedb_search.php?words=\\{@}
 Charset=utf8
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop
index 598c26a06..ad7b6d357 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/freshmeat.desktop
@@ -14,6 +14,6 @@ Name[te]=ఫ్రెష్ మీట్
 Name[ven]=Namathethe
 Name[vi]=Tra Freshmeat
 Name[zu]=Inyama yamanje
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=fm,freshmeat
 Query=http://freshmeat.net/search/?q=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/froogle.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/froogle.desktop
index 2cb235ac1..bdd55bb30 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/froogle.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/froogle.desktop
@@ -10,7 +10,7 @@ Name[ta]=ஃப்ரூகுல்
 Name[te]=ఫ్రూగుల్
 Name[th]=Froogle หาสินค้าผ่าน google
 Name[vi]=Tra Froogle
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=froogle
 Query=http://froogle.google.com/froogle?q=\\{@}
 Query[en_GB]=http://froogle.google.co.uk/froogle?q=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop
index ed09b4b7e..691b7c11e 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/fsd.desktop
@@ -58,7 +58,7 @@ Name[uk]=Словник з вільного програмного забезп�
 Name[vi]=Thư mục Phần mềm Tự do FSF/UNESCO
 Name[wa]=Livreye di libes programes FSF/UNESCO
 Name[zh_TW]=FSF/UNESCO 自由軟體目錄
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=fsd
 Query=http://directory.fsf.org/search/?query=\\{@}
 Query[nds]=http://directory.fsf.org/search/fsd-search.py?q=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google.desktop
index 535fff91f..08046f918 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google.desktop
@@ -12,7 +12,7 @@ Name[pl]=Google - wyszukiwarka stron WWW
 Name[ta]=கூகுல்
 Name[te]=గూగుల్
 Name[th]=กูเกิ้ล
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=gg,google
 Query=http://www.google.com/search?q=\\{@}&ie=UTF-8&oe=UTF-8
 Query[de]=http://www.google.de/search?q=\\{@}&ie=UTF-8&oe=UTF-8
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop
index 121ca5e1b..501a9408c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_advanced.desktop
@@ -91,5 +91,5 @@ Query[nn]=http://www.google.com/search?hl=nn&as_q=\\{all,@}&num=\\{num,"10"}&btn
 Query[pt]=http://www.google.pt/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
 Query[wa]=http://www.google.be/search?as_q=\\{all,@}&num=\\{num,"10"}&btnG=Google+Search&as_epq=\\{exact,""}&as_oq=\\{any,""}&as_eq=\\{without,""}&lr=\\{lang,""}&as_ft=\\{ft,"i"}&as_filetype=\\{filetype,""}&as_qdr=\{date,"all"}&as_occt=\\{occ,"any"}&as_dt=\\{siteop,"i"}&as_sitesearch=\\{site}&safe=\\{safe,"active"}&ie=UTF-8&oe=UTF-8
 Charset=utf8
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_groups.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_groups.desktop
index ee9f24f3a..ab73c523c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_groups.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_groups.desktop
@@ -74,7 +74,7 @@ Name[xh]=Amaqela e Google
 Name[zh_CN]=Google 兴趣组
 Name[zh_TW]=Google 群組
 Name[zu]=Amaqembu e-Google
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=ggg,groups,dj,deja
 Query=http://groups.google.com/groups?oi=djq&as_q=\\{@}
 Query[en_GB]=http://groups.google.co.uk/groups?oi=djq&as_q=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_images.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_images.desktop
index e0b808df9..f16b08e15 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_images.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_images.desktop
@@ -79,7 +79,7 @@ Name[xh]=Uphendlo Lomfanekiso we Google
 Name[zh_CN]=Google 图像搜索
 Name[zh_TW]=Google 圖片搜尋
 Name[zu]=Ukusesha isithombe kwe-Google
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=ggi,images
 Query=http://images.google.com/images?q=\\{@}
 Query[en_GB]=http://images.google.co.uk/images?q=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop
index f72e175d6..25e2accac 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_lucky.desktop
@@ -76,7 +76,7 @@ Name[wa]=Cweraedje d' imådjes avou Google (Dji tchai roed dsu)
 Name[zh_CN]=Google (手气不错)
 Name[zh_TW]=Google (好手氣)
 Name[zu]=Google (Ngizizwa Ngisenhlanhleni)
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=ggl,gglucky
 Query=http://www.google.com/search?q=\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8
 Query[csb]=http://www.google.pl/search?q=\\{@}&btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_movie.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_movie.desktop
index 47d53118f..0702ef661 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_movie.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_movie.desktop
@@ -59,7 +59,7 @@ Name[uz]=Google - Kino
 Name[uz@cyrillic]=Google - Кино
 Name[vi]=Tìm phim ảnh qua Google
 Name[zh_TW]=Google 電影
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=ggmovie
 Query=http://www.google.com/search?q=movie:\{@}&ie=UTF-8&oe=UTF-8
 Query[csb]=http://www.google.pl/search?q=movie:\{@}&ie=UTF-8&oe=UTF-8
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_news.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_news.desktop
index f8521c3a3..999bfdcdf 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_news.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/google_news.desktop
@@ -68,7 +68,7 @@ Name[vi]=Tin tức Google
 Name[wa]=Noveles Google
 Name[zh_CN]=Google 新闻
 Name[zh_TW]=Google 新聞
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=ggn,googlenews
 Query=http://news.google.com/news?q=\\{@}&ie=UTF-8&oe=UTF-8
 Query[en_GB]=http://news.google.co.uk/news?q=\\{@}&ie=UTF-8&oe=UTF-8
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/gracenote.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/gracenote.desktop
index 04a6655c8..c8dd2279b 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/gracenote.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/gracenote.desktop
@@ -11,7 +11,7 @@ Name[ta]=க்ரேஸ்நோட்
 Name[te]=గ్రెస్ నోట్
 Name[th]=Gracenote ค้นหาดนตรี, วิดิโอ
 Name[vi]=Tra Gracenote
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=gn,gracenote
 Query=http://www.gracenote.com/music/search-adv.html?q=\\{@}
 Charset=utf8
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/grec.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/grec.desktop
index 295637533..e4afd8b88 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/grec.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/grec.desktop
@@ -61,5 +61,5 @@ Name[vi]=Tra Từ điển Lớn của tiếng Catalan (GRan Enciclopèdia  Catal
 Name[wa]=Grand motî do catalan lingaedje (GRan Enciclopèdia  Catalana)
 Name[zh_TW]=很棒的加泰隆尼亞語文字典 (GRan Enciclopèdia  Catalana)
 Query=http://www.grec.net/cgibin/lexicx.pgm?GECART=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/hotbot.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/hotbot.desktop
index c555088ac..db1d8cb15 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/hotbot.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/hotbot.desktop
@@ -11,7 +11,7 @@ Name[ta]=ஹாட்பாட்
 Name[te]=హాట్ బాట్
 Name[ven]=Bot yau fhisa
 Name[vi]=Tra Hotbot
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=hb,hotbot
 Query=http://hotbot.lycos.com/?MT=\\{@}&SM=MC&DV=0&LG=any&DC=10&DE=2
 Query[en_GB]=http://search.hotbot.co.uk/cgi-bin/pursuit?query=\\{@}&cat=hb_loc&enc=utf-8&SITE=uk&command=
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop
index 54627f6c6..24160fc1b 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary.desktop
@@ -7,6 +7,6 @@ Name[hu]=HyperDirectory.com
 Name[pl]=HyperDictionary.com - słownik
 Name[sv]=Hyperdictionary.com
 Name[ta]=திறந்த அடைவு
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=hd,hyperdict
 Query=http://www.hyperdictionary.com/search.aspx?define=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop
index aa66572c4..8ddde2d4b 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/hyperdictionary_thesaurus.desktop
@@ -59,7 +59,7 @@ Name[vi]=Từ điển đồng nghĩa HyperDictionary.com
 Name[wa]=HyperDictionary.com
 Name[zh_CN]=HyperDictionary.com 宝藏
 Name[zh_TW]=HyperDictionary.com 辭典
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=hdt,hd-ths,hd-thesaurus
 Query=http://www.hyperdictionary.com/search.aspx?Dict=T&define=\\{@}
 Query[ne]=http://www.hyperdictionary.com/search.aspx?Dict=Tdefine=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/imdb.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/imdb.desktop
index 4d6fba3d3..6d95e28cc 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/imdb.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/imdb.desktop
@@ -66,7 +66,7 @@ Name[vi]=Cơ sở dữ liệu Phim ảnh trên Mạng
 Name[wa]=Båze di dnêyes di films sol Daegntoele
 Name[zh_CN]=互联网电影数据库
 Name[zh_TW]=Internet 電影資料庫
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=imdb
 Query=http://imdb.com/Find?\\{@}
 Query[en_GB]=http://imdb.co.uk/Find?\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/it2en.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/it2en.desktop
index cc4b867f8..54e57e35d 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/it2en.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/it2en.desktop
@@ -71,5 +71,5 @@ Name[wa]=WordReference.com ratournaedje di l' itålyin viè l' inglès
 Name[zh_CN]=WordReference.com 翻译：意大利语译英语
 Name[zh_TW]=WordReference.com 翻譯: 義大利文至英文
 Query=http://www.wordreference.com/it/en/translation.asp?iten=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/jeeves.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/jeeves.desktop
index b1fc478fd..8cee7db0a 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/jeeves.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/jeeves.desktop
@@ -24,7 +24,7 @@ Name[te]=జీవ్స్ ను అడగండి
 Name[th]=ถามจีฟส์
 Name[ven]=Vhudzisani Jeeves
 Name[vi]=Hỏi Jeeves
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=ask,jeeves
 Query=http://www.ask.com/main/askJeeves.asp?origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}
 Query[en_GB]=http://www.ask.co.uk/main/askJeeves.asp?origin=0&qSource=4&site_name=Jeeves&metasearch=yes&ask=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/katatudo.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/katatudo.desktop
index ac220a515..24d128db9 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/katatudo.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/katatudo.desktop
@@ -8,7 +8,7 @@ Name[hi]=केएटीए ट्यूडो
 Name[ne]=काता टुडो
 Name[ta]=காட்டா ட்யூடோ
 Name[te]=కటాటుడొ
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=kt,katatudo
 Query=http://www.katatudo.com.br/busca/resultado.php?q=\\{@}&onde=&b=Buscar
 Query[ne]=http://www.katatudo.com.br/busca/resultado.php?q=\\{@}onde=&b=Buscar
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde.desktop
index 961b236be..c4e55cd78 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde.desktop
@@ -75,5 +75,5 @@ Name[wa]=Documintåcion di l' API di KDE
 Name[zh_CN]=KDE API 文档
 Name[zh_TW]=KDE API 文件
 Query=http://api.kde.org/classmapper.php?class=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop
index 17c4fccc8..50516214b 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/kde_websvn.desktop
@@ -24,7 +24,7 @@ Name[tg]=KDE ВэбSVN
 Name[th]=SVN บนเว็บของ KDE
 Name[vi]=Tra KDE WebSVN
 Name[wa]=WebSVN di KDE
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=websvn,tdesvn,ksvn,kvs
 Query=http://websvn.kde.org/\\{@}
 Query[ja]=http://webcvs.kde.org/\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/leo.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/leo.desktop
index 87e961e5e..bbad1aa3a 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/leo.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/leo.desktop
@@ -44,6 +44,6 @@ Name[vi]=Dịch bằng LEO
 Name[wa]=Ratournaedje LEO
 Name[xh]=LEO-Guqulela
 Name[zu]=Uguqulelo-LEO
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=leo
 Query=http://dict.leo.org/?search=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/lycos.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/lycos.desktop
index ba6b44c12..21e4bd468 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/lycos.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/lycos.desktop
@@ -11,7 +11,7 @@ Name[ta]=லைகோஸ்
 Name[te]=లైకోస్
 Name[th]=ไลคอส
 Name[vi]=Tra Lycos
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=lycos,ly
 Query=http://www.lycos.com/cgi-bin/pursuit?cat=dir&query=\\{@}
 Query[ne]=http://www.lycos.com/cgi-bin/pursuit?cat=dirquery=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
index 2e104f15b..70d8554f2 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
@@ -70,7 +70,7 @@ Name[xh]=Mamma - Umama weenjini zonke zophendlo
 Name[zh_CN]=Mamma - 所有搜索引擎之母
 Name[zh_TW]=Mamma - 搜尋引擎之母
 Name[zu]=Mamma - Umama wazo zonke Izinjini Zokusesha
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=mm,mamma
 Query=http://www.mamma.com/Mamma?lang=1&timeout=4&qtype=0&query=\\{@}
 Query[ne]=http://www.mamma.com/Mamma?lang=1timeout=4&qtype=0&query=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop
index 0c3fc2edf..4c17e9424 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/metacrawler.desktop
@@ -15,6 +15,6 @@ Name[te]=మెటా క్రాలర్
 Name[th]=เมทาคลอเรอร์
 Name[ven]=Tshikokovhi tsha Meta
 Name[vi]=Tra MetaCrawler
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=mc,meta,metacrawler
 Query=http://search.metacrawler.com/crawler?general=\\{@}&method=0&cat=Web&target=metaworld&redirect=web&rpp=20&hpe=10&region=0&timeout=0&sort=0&format=beta99&theme=classic&refer=mc-search&refer=mc-search
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/msdn.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/msdn.desktop
index 5a9fc733c..48e2de3a3 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/msdn.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/msdn.desktop
@@ -69,6 +69,6 @@ Name[xh]=Uphendlo Womsebenzi womnatha Wombhekisi phambili we Microsoft
 Name[zh_CN]=MSDN 微软开发者网络搜索
 Name[zh_TW]=微軟開發者網路搜尋
 Name[zu]=Usesho Loxhumano olusakazekile Lomthuthukisi we-Microsoft
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=msdn
 Query=http://msdn.microsoft.com/library/shared/searchtab/searchHandoff.asp?handoffurl=%2Fisapi%2Fgosearch.asp%3FTARGET%3D%2Fus%2Fdev%2Fdefault.asp&stcfg=d%3A%2Fhttp%2Fcnfg.xml&qu=\\{@}&btnSearch=GO
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/netcraft.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/netcraft.desktop
index d2ea4be81..2290d525d 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/netcraft.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/netcraft.desktop
@@ -12,6 +12,6 @@ Name[te]=నెట్ క్రాఫ్ట్
 Name[tg]=Шабакаи craft
 Name[th]=เน็ตคราฟต์
 Name[vi]=Tra Netcraft
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=nc,netcraft
 Query=http://uptime.netcraft.com/up/graph?site=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
index 7abbad0e1..bed07b8ef 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
@@ -66,6 +66,6 @@ Name[wa]=Dineu d' cweraedje di live di limeros d' telefone
 Name[zh_CN]=Telephonebook 搜索提供者
 Name[zh_TW]=電話號碼簿搜尋提供者
 Type=Service
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=telnl,telefoon
 Query=http://www.detelefoongids.nl/tginl.dll?action=white&type=search&resultsperpage=25&pagestart=1&source=searchcategory&name2=\\{1}&name=&initials=&city=\\{2}&citycode=&zipcode4=&street=&area=conditional&areacode=&region=&subscription=&country=&catcode=&dcity=\\{2}&dname=\\{1}&dwhere=\\{2}&partnerid=
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop
index d305fd88b..7ad969678 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-teletekst.desktop
@@ -69,6 +69,6 @@ Name[wa]=Dineu di cweraedje Teletecse
 Name[zh_CN]=Teletekst 搜索提供者
 Name[zh_TW]=Teletekst 搜尋提供者
 Type=Service
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=tt,teletekst
 Query=http://teletekst.nos.nl/gif/\\{@}-01.html
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop
index c1b128780..38eee0a16 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/pgpkeys.desktop
@@ -79,5 +79,5 @@ Name[zh_TW]=OpenPGP 金鑰搜尋
 Name[zu]=OpenPGP Usesho olubalulekile
 Query=http://pgp.dtype.org:11371/pks/lookup?search=\\{@}&op=vindex
 Query[ne]=http://pgp.dtype.org:11371/pks/lookup?search=\\{@}op=vindex
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/php.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/php.desktop
index 5289cd38d..9323b6b1a 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/php.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/php.desktop
@@ -77,5 +77,5 @@ Name[zh_TW]=PHP 搜尋
 Name[zu]=Usesho lwe-PHP
 Query=http://www.php.net/search.php?show=\\{mode,"manual"}&pattern=\\{@}
 Query[ne]=http://www.php.net/search.php?show=\\{mode,"manual"}pattern=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/python.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/python.desktop
index 2825c073d..abf3d0c37 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/python.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/python.desktop
@@ -80,5 +80,5 @@ Query[fy]=http://www.google.nl/search?sourceid=python-search&q=\{@}&submit=Searc
 Query[nb]=http://www.google.no/search?sourceid=python-search&q=\{@}&submit=Search&q=site%3Apython.org
 Query[nl]=http://www.google.nl/search?sourceid=python-search&q=\{@}&submit=Search&q=site%3Apython.org
 Query[pt]=http://www.google.pt/search?sourceid=python-search&q=\{@}&submit=Search&q=site%3Apython.org
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/qt.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/qt.desktop
index 2ee904fd9..6e03b04d0 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/qt.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/qt.desktop
@@ -74,5 +74,5 @@ Name[wa]=Documintåcion di Qt so les fyis
 Name[zh_CN]=最新的 Qt 在线文档
 Name[zh_TW]=最新的 Qt 線上文件
 Query=http://doc.trolltech.com/latest/\\{@}.html
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/qt3.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/qt3.desktop
index bc59a41ac..6278f97c4 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/qt3.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/qt3.desktop
@@ -67,5 +67,5 @@ Name[wa]=Documintåcion di Qt3 so les fyis
 Name[zh_CN]=Qt3 在线文档
 Name[zh_TW]=Qt3 線上文件
 Query=http://doc.trolltech.com/3.3/\\{@}.html
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/rae.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/rae.desktop
index b87befb0a..6381cf8a7 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/rae.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/rae.desktop
@@ -73,5 +73,5 @@ Name[wa]=Diccionaire del Royåle Academeye Espagnole (RAE)
 Name[zh_CN]=西班牙学院的字典(RAE)
 Name[zh_TW]=西班牙金像獎字典 (RAE)
 Query=http://buscon.rae.es/draeI/SrvltGUIBusUsual?TIPO_HTML=2&LEMA=\\{@}&FORMATO=ampliado
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/rfc.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/rfc.desktop
index a11b090b0..4ab17c560 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/rfc.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/rfc.desktop
@@ -53,5 +53,5 @@ Name[zh_CN]=IETF 评论请求
 Name[zh_TW]=IETF RFC 文件
 Name[zu]=Izicelo ze-IETF zemibono
 Query=http://www.ietf.org/rfc/rfc\\{@}.txt
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop
index a6e407083..e9bd4c0f4 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/rpmfind.desktop
@@ -37,7 +37,7 @@ Name[ven]=RPM-Toda
 Name[vi]=Tìm RPM
 Name[xh]=RPM-Fumana
 Name[zu]=RPM-Thola
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=rf,rpmfind
 Query=http://www.rpmfind.net/linux/rpm2html/search.php?query=\{@}
 Query[en_GB]=http://fr.rpmfind.net/linux/rpm2html/search.php?query=\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop
index 6f165eb65..0c43e4ca7 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/ruby_application_archive.desktop
@@ -68,7 +68,7 @@ Name[wa]=Årtchive di programes Ruby
 Name[xh]=Indawo ye Ruby yokugcina Isicelo
 Name[zh_TW]=Ruby 應用程式檔案庫
 Name[zu]=Umqulu Womyaleli we-Ruby 
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=raa
 Query=http://raa.ruby-lang.org/search.rhtml?search=\\{@}
 Query[fy]=http://www.ruby-lang.org/en/raa-list.rhtml?name=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/seek.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/seek.desktop
index 55351db8f..a58b4b607 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/seek.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/seek.desktop
@@ -6,6 +6,6 @@ Name[eo]=Go.com
 Name[hi]=गो.कॉम
 Name[mn]=go.com
 Name[nso]=EYA.com
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=seek
 Query=http://www.go.com/Titles?col=WW&qt=\\{@}&svx=home_searchbox&sv=IS&lk=noframeso
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop
index 3a04f92a2..268b359bd 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/sourceforge.desktop
@@ -15,5 +15,5 @@ Name[ta]=மூலத்திருட்டு
 Name[te]=సొర్స్ ఫొర్జ్
 Name[vi]=Tra SourceForge
 Query=http://sourceforge.net/search/?type_of_search=\\{type,"soft"}&exact=\{exact,"0"}&words=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/technorati.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/technorati.desktop
index 6a82f51a1..3136f4f33 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/technorati.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/technorati.desktop
@@ -6,7 +6,7 @@ Name[csb]=Technorati - blodżi
 Name[lt]=Technorati paieška
 Name[ne]=टेक्नोरती
 Name[vi]=Tra từ Kĩ thuật bằng Technorati
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=tr,technorati
 Query=http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\{@}
 Query[ja]=http://technorati.com/cosmos/search.html?sourceid=kde-search&url=\\\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop
index ce7dd5056..56dfc31b5 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/technoratitags.desktop
@@ -47,7 +47,7 @@ Name[tg]=Тегҳои Technorati
 Name[uk]=Статті Technorati
 Name[vi]=Nhãn Technorati
 Name[wa]=Tags Technorati
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=tags,tag,technoratitags
 Query=http://technorati.com/tag/\\{@}?sourceid=kde-search
 Query[ja]=http://technorati.com/tag/\\\\{@}?sourceid=kde-search
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop
index f1c9576c0..b89570eb5 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/thesaurus.desktop
@@ -57,7 +57,7 @@ Name[wa]=Diccionaire inglès Merriam-Webster
 Name[zh_CN]=韦氏辞典
 Name[zh_TW]=韋氏辭典
 Name[zu]=Incawdi yamagama afanayo ye-Merriam-Webster
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=ths,thesaurus
 Query=http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurus&va=\\{@}
 Query[ne]=http://www.m-w.com/cgi-bin/thesaurus?book=Thesaurusva=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/tvtome.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/tvtome.desktop
index a24f74287..b7030fed7 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/tvtome.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/tvtome.desktop
@@ -16,7 +16,7 @@ Name[tg]=Томи левизиони Хона
 Name[th]=ทีวีทอร์ม
 Name[tr]=TV Kanalları
 Name[vi]=Tra Quyển TV
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Query=http://www.tv.com/search.php?type=11&stype=all&qs=\\{@}&x=0&y=0
 Query[ja]=http://www.tv.com/search.php?type=11&stype=all&qs=\\\\{@}&x=0&y=0
 Query[ne]=http://www.tv.com/search.php?type=11stype=all&qs=\\{@}&x=0&y=0
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/uspto.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/uspto.desktop
index 6bed5bc9b..9539a5c0e 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/uspto.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/uspto.desktop
@@ -70,5 +70,5 @@ Name[wa]=Båze di dnêyes des brevets U.S.
 Name[zh_CN]=美国专利数据库
 Name[zh_TW]=U.S. 專利權資料庫
 Query=http://patft.uspto.gov/netacgi/nph-Parser?TERM1=\\{@}&Sect1=PTO1&Sect2=HITOFF&d=PALL&p=1&u=/netahtml/srchnum.htm&r=0&f=S&l=50
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop
index 4fb6d0551..e664d402c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/vivisimo.desktop
@@ -9,6 +9,6 @@ Name[pa]=ਵੀਵੀਸੀਮੋ
 Name[ta]=விவிசிமோ
 Name[te]=వివిస్మొ
 Name[vi]=Tra Vivisimo
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=vi
 Query=http://vivisimo.com/search?query=\\{@}&se=Yahoo%2CAltaVista%2CMSN%2CFast%2COD%2CExcite%2CDirectHit%2CLooksmart%2CEuroseek&x=49&y=16
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/voila.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/voila.desktop
index 034213e7b..bb488c346 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/voila.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/voila.desktop
@@ -10,7 +10,7 @@ Name[te]=వొయిలా
 Name[th]=เวยลา
 Name[vi]=Tra Voila
 Name[wa]=Voilà
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=voila
 Query=http://search.ke.voila.fr/S/voila?lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}
 Query[ja]=http://search.ke.voila.fr/S/voila?lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/webster.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/webster.desktop
index bcb5fe583..d6f206c16 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/webster.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/webster.desktop
@@ -67,7 +67,7 @@ Name[xh]= Dikshinari ye Merriam-Webster
 Name[zh_CN]=韦氏词典
 Name[zh_TW]=韋氏詞典
 Name[zu]=Isichazamagama se-Merriam-Webster
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=dict,webster
 Query=http://www.m-w.com/cgi-bin/dictionary?book=Dictionary&va=\\{@}
 Query[ne]=http://www.m-w.com/cgi-bin/dictionary?book=Dictionaryva=\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/whatis.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/whatis.desktop
index 1cf117c27..79ecdc002 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/whatis.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/whatis.desktop
@@ -65,7 +65,7 @@ Name[vi]=Hỏi Whatis
 Name[wa]=Cweraedje Whatis
 Name[zh_CN]=Whatis 查询
 Name[zh_TW]=Whatis 查詢
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=wi,whatis
 Query=http://whatis.techtarget.com/wsearchResults/1,290214,,00.html?query=\\{@}
 Query[ja]=http://whatis.techtarget.com/wsearchResults/1,290214,,00.html?query=\\\\{@}
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop
index 5bc56d83e..15501b8b8 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/wikipedia.desktop
@@ -73,7 +73,7 @@ Name[vi]=Wikipedia - Bách khoa toàn thư mở
 Name[wa]=Wikipedia - Li libe eciclopedeye (walon)
 Name[zh_CN]=维基百科 - 免费的百科全书
 Name[zh_TW]=Wikipedia - 免費的 Encyclopedia
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=wp
 Query=http://en.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
 Query[de]=http://de.wikipedia.org/wiki/Special:Search?search=\{@}&go=Go
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop
index f4dfa192d..2e7183aba 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/wiktionary.desktop
@@ -63,7 +63,7 @@ Name[vi]=Wiktionary - Từ điển mở
 Name[wa]=Wikitionary - Li libe motî (inglès)
 Name[zh_CN]=维基字典 - 免费的字典
 Name[zh_TW]=Wiktionary - 免費的字典
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Keys=wt,wikt
 Query=http://en.wiktionary.org/wiki/Special:Search?search=\{@}&go=Go
 Query[csb]=http://pl.wiktionary.org/wiki/Special:Search?search=\{@}&go=Go
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/wordref.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/wordref.desktop
index 2a3d70523..c4cff1ff3 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/wordref.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/wordref.desktop
@@ -74,5 +74,5 @@ Name[wa]=WordReference.com diccionaire inglès
 Name[zh_CN]=WordReference.com 英语字典
 Name[zh_TW]=WordReference.com 英文字典
 Query=http://www.wordreference.com/english/definition.asp?en=\\{@}
-ServiceTypes=SearchProvider
+X-TDE-ServiceTypes=SearchProvider
 Type=Service
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.desktop b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.desktop
index 9cf9d16b9..8f5594db8 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.desktop
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.desktop
@@ -44,5 +44,5 @@ Name[zh_CN]=本地域名过滤
 Name[zh_TW]=區域網域過濾器
 Name[zu]=Ihluzo Lendawo Yaseduze
 X-TDE-Library=liblocaldomainurifilter
-ServiceTypes=KURIFilter/Plugin
-InitialPreference=2
+X-TDE-ServiceTypes=KURIFilter/Plugin
+X-TDE-InitialPreference=2
diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop
index 32e544a6d..3ebe7dee6 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop
+++ b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.desktop
@@ -50,5 +50,5 @@ Name[wa]=PasseteCoutURI
 Name[zh_CN]=短 URI 过滤
 Name[zh_TW]=短 URI 過濾器
 X-TDE-Library=libtdeshorturifilter
-ServiceTypes=KURIFilter/Plugin
-InitialPreference=5
+X-TDE-ServiceTypes=KURIFilter/Plugin
+X-TDE-InitialPreference=5
diff --git a/kcontrol/energy/energy.desktop b/kcontrol/energy/energy.desktop
index 73cae3f53..057f0780b 100644
--- a/kcontrol/energy/energy.desktop
+++ b/kcontrol/energy/energy.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Exec=tdecmshell energy
 Icon=energy_star
-DocPath=kcontrol/energy/index.html
+X-DocPath=kcontrol/energy/index.html
 Type=Application
 X-TDE-Library=energy
 X-TDE-Init=energy
diff --git a/kcontrol/filetypes/filetypes.desktop b/kcontrol/filetypes/filetypes.desktop
index 09101d191..ed42e6a8d 100644
--- a/kcontrol/filetypes/filetypes.desktop
+++ b/kcontrol/filetypes/filetypes.desktop
@@ -2,7 +2,7 @@
 Icon=filetypes
 Type=Application
 Exec=tdecmshell filetypes
-DocPath=kcontrol/filetypes/index.html
+X-DocPath=kcontrol/filetypes/index.html
 Categories=Qt;TDE;X-TDE-settings-components;
 
 
diff --git a/kcontrol/fonts/fonts.desktop b/kcontrol/fonts/fonts.desktop
index a52f9dc6f..c6ef538d6 100644
--- a/kcontrol/fonts/fonts.desktop
+++ b/kcontrol/fonts/fonts.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell fonts
 Icon=fonts
 Type=Application
-DocPath=kcontrol/fonts/index.html
+X-DocPath=kcontrol/fonts/index.html
 
 
 X-TDE-Library=fonts
diff --git a/kcontrol/hwmanager/hwmanager.desktop b/kcontrol/hwmanager/hwmanager.desktop
index d7348482c..4030c866c 100644
--- a/kcontrol/hwmanager/hwmanager.desktop
+++ b/kcontrol/hwmanager/hwmanager.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell hwmanager
 Icon=background
 Type=Application
-DocPath=kcontrol/hwmanager/index.html
+X-DocPath=kcontrol/hwmanager/index.html
 
 X-TDE-Library=hwmanager
 X-TDE-ParentApp=kcontrol
diff --git a/kcontrol/iccconfig/iccconfig.desktop b/kcontrol/iccconfig/iccconfig.desktop
index 9442415be..b88acad29 100644
--- a/kcontrol/iccconfig/iccconfig.desktop
+++ b/kcontrol/iccconfig/iccconfig.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell iccconfig
 Icon=background
 Type=Application
-DocPath=kcontrol/iccconfig/index.html
+X-DocPath=kcontrol/iccconfig/index.html
 
 X-TDE-Library=iccconfig
 X-TDE-ParentApp=kcontrol
diff --git a/kcontrol/icons/icons.desktop b/kcontrol/icons/icons.desktop
index fa8ccefdc..38de6ef30 100644
--- a/kcontrol/icons/icons.desktop
+++ b/kcontrol/icons/icons.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/icons/index.html
+X-DocPath=kcontrol/icons/index.html
 Icon=icons
 Exec=tdecmshell icons
 
diff --git a/kcontrol/info/cdinfo.desktop b/kcontrol/info/cdinfo.desktop
index e1d158265..1369878c5 100644
--- a/kcontrol/info/cdinfo.desktop
+++ b/kcontrol/info/cdinfo.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell cdinfo
 Icon=kcmdevices
 Type=Application
-DocPath=kcontrol/cdinfo/index.html
+X-DocPath=kcontrol/cdinfo/index.html
 
 
 X-TDE-Library=info
diff --git a/kcontrol/info/devices.desktop b/kcontrol/info/devices.desktop
index d8b1584a1..0b920dd80 100644
--- a/kcontrol/info/devices.desktop
+++ b/kcontrol/info/devices.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell devices
 Icon=kcmdevices
 Type=Application
-DocPath=kcontrol/devices/index.html
+X-DocPath=kcontrol/devices/index.html
 Categories=Qt;TDE;X-TDE-settings-information;
 
 
diff --git a/kcontrol/info/dma.desktop b/kcontrol/info/dma.desktop
index cc6187c3a..62fea6aaa 100644
--- a/kcontrol/info/dma.desktop
+++ b/kcontrol/info/dma.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell dma
 Icon=kcmmemory
 Type=Application
-DocPath=kcontrol/dma/index.html
+X-DocPath=kcontrol/dma/index.html
 Categories=Qt;TDE;X-TDE-settings-information;
 
 
diff --git a/kcontrol/info/interrupts.desktop b/kcontrol/info/interrupts.desktop
index 7a428840e..50f96c525 100644
--- a/kcontrol/info/interrupts.desktop
+++ b/kcontrol/info/interrupts.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell interrupts
 Icon=kcmmemory
 Type=Application
-DocPath=kcontrol/interrupts/index.html
+X-DocPath=kcontrol/interrupts/index.html
 Categories=Qt;TDE;X-TDE-settings-information;
 
 
diff --git a/kcontrol/info/ioports.desktop b/kcontrol/info/ioports.desktop
index 9793eef94..39d4e936f 100644
--- a/kcontrol/info/ioports.desktop
+++ b/kcontrol/info/ioports.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell ioports
 Icon=kcmmemory
 Type=Application
-DocPath=kcontrol/ioports/index.html
+X-DocPath=kcontrol/ioports/index.html
 Categories=Qt;TDE;X-TDE-settings-information;
 
 
diff --git a/kcontrol/info/memory.desktop b/kcontrol/info/memory.desktop
index 2490b0445..e71ff88ef 100644
--- a/kcontrol/info/memory.desktop
+++ b/kcontrol/info/memory.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell memory
 Icon=kcmmemory
 Type=Application
-DocPath=kcontrol/memory/index.html
+X-DocPath=kcontrol/memory/index.html
 
 
 X-TDE-Library=info
diff --git a/kcontrol/info/opengl.desktop b/kcontrol/info/opengl.desktop
index fa665ca3a..f36040f91 100644
--- a/kcontrol/info/opengl.desktop
+++ b/kcontrol/info/opengl.desktop
@@ -3,7 +3,7 @@
 Exec=tdecmshell opengl
 Icon=kcmopengl
 Type=Application
-DocPath=kcontrol/opengl/index.html
+X-DocPath=kcontrol/opengl/index.html
 
 
 X-TDE-Library=info
diff --git a/kcontrol/info/partitions.desktop b/kcontrol/info/partitions.desktop
index 4576ec4b6..74977cdab 100644
--- a/kcontrol/info/partitions.desktop
+++ b/kcontrol/info/partitions.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell partitions
 Icon=kcmpartitions
 Type=Application
-DocPath=kcontrol/partitions/index.html
+X-DocPath=kcontrol/partitions/index.html
 
 
 X-TDE-Library=info
diff --git a/kcontrol/info/pci.desktop b/kcontrol/info/pci.desktop
index 075eb4328..f233661f3 100644
--- a/kcontrol/info/pci.desktop
+++ b/kcontrol/info/pci.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell pci
 Icon=kcmpci
 Type=Application
-DocPath=kcontrol/pci/index.html
+X-DocPath=kcontrol/pci/index.html
 
 
 X-TDE-Library=info
diff --git a/kcontrol/info/processor.desktop b/kcontrol/info/processor.desktop
index b4de8df85..0de3d96da 100644
--- a/kcontrol/info/processor.desktop
+++ b/kcontrol/info/processor.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell processor
 Icon=kcmprocessor
 Type=Application
-DocPath=kcontrol/processor/index.html
+X-DocPath=kcontrol/processor/index.html
 
 
 X-TDE-Library=info
diff --git a/kcontrol/info/scsi.desktop b/kcontrol/info/scsi.desktop
index 30473fe9b..931cdb2c9 100644
--- a/kcontrol/info/scsi.desktop
+++ b/kcontrol/info/scsi.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell scsi
 Icon=kcmscsi
 Type=Application
-DocPath=kcontrol/scsi/index.html
+X-DocPath=kcontrol/scsi/index.html
 
 
 X-TDE-Library=info
diff --git a/kcontrol/info/sound.desktop b/kcontrol/info/sound.desktop
index 3d1789525..850f728a4 100644
--- a/kcontrol/info/sound.desktop
+++ b/kcontrol/info/sound.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell sound
 Icon=kcmsound
 Type=Application
-DocPath=kcontrol/sound/index.html
+X-DocPath=kcontrol/sound/index.html
 
 
 X-TDE-Library=info
diff --git a/kcontrol/info/xserver.desktop b/kcontrol/info/xserver.desktop
index 53d67d2be..589bda86c 100644
--- a/kcontrol/info/xserver.desktop
+++ b/kcontrol/info/xserver.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell xserver
 Icon=kcmx
 Type=Application
-DocPath=kcontrol/xserver/index.html
+X-DocPath=kcontrol/xserver/index.html
 
 
 X-TDE-Library=info
diff --git a/kcontrol/input/mouse.desktop b/kcontrol/input/mouse.desktop
index db9ecc468..cd15e678f 100644
--- a/kcontrol/input/mouse.desktop
+++ b/kcontrol/input/mouse.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell mouse
 Icon=mouse
 Type=Application
-DocPath=kcontrol/mouse/index.html
+X-DocPath=kcontrol/mouse/index.html
 
 
 X-TDE-Library=input
diff --git a/kcontrol/joystick/joystick.desktop b/kcontrol/joystick/joystick.desktop
index 261f12b99..5b2226c06 100644
--- a/kcontrol/joystick/joystick.desktop
+++ b/kcontrol/joystick/joystick.desktop
@@ -6,7 +6,7 @@ X-TDE-FactoryName=kcm_joystick
 X-TDE-Library=joystick
 X-TDE-Test-Module=true
 Icon=joystick
-DocPath=kcontrol/joystick/index.html
+X-DocPath=kcontrol/joystick/index.html
 Categories=Qt;TDE;X-TDE-settings-hardware;
 Name=Joystick
 Name[be]=Джойстык
diff --git a/kcontrol/kcontrol/KControl.desktop b/kcontrol/kcontrol/KControl.desktop
index 9413b2acc..8a1385583 100644
--- a/kcontrol/kcontrol/KControl.desktop
+++ b/kcontrol/kcontrol/KControl.desktop
@@ -2,7 +2,7 @@
 Exec=kcontrol -caption "%c" %i %m
 Icon=kcontrol
 Type=Application
-DocPath=kcontrol/index.html
+X-DocPath=kcontrol/index.html
 X-TDE-StartupNotify=true
 
 Name=Trinity Control Center
diff --git a/kcontrol/kcontrol/KControl_NoDisplay.desktop b/kcontrol/kcontrol/KControl_NoDisplay.desktop
index cc0c0119e..333971c26 100644
--- a/kcontrol/kcontrol/KControl_NoDisplay.desktop
+++ b/kcontrol/kcontrol/KControl_NoDisplay.desktop
@@ -2,7 +2,7 @@
 Exec=kcontrol -caption "%c" %i %m
 Icon=kcontrol
 Type=Application
-DocPath=kcontrol/index.html
+X-DocPath=kcontrol/index.html
 X-TDE-StartupNotify=true
 
 Name=Trinity Control Center
diff --git a/kcontrol/kcontrol/tde-kcontrol.desktop b/kcontrol/kcontrol/tde-kcontrol.desktop
index c5e78af16..122d4fdce 100644
--- a/kcontrol/kcontrol/tde-kcontrol.desktop
+++ b/kcontrol/kcontrol/tde-kcontrol.desktop
@@ -2,7 +2,7 @@
 Exec=kcontrol -caption "%c" %i %m
 Icon=kcontrol
 Type=Application
-DocPath=kcontrol/index.html
+X-DocPath=kcontrol/index.html
 X-TDE-StartupNotify=true
 
 Name=Trinity Control Center
diff --git a/kcontrol/kded/kcmkded.desktop b/kcontrol/kded/kcmkded.desktop
index dd9bfd48b..c0e587953 100644
--- a/kcontrol/kded/kcmkded.desktop
+++ b/kcontrol/kded/kcmkded.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell kcmkded
 Icon=services
 Type=Application
-DocPath=kcontrol/kcmkded/index.html
+X-DocPath=kcontrol/kcmkded/index.html
 X-TDE-Library=kded
 X-TDE-Factoryname=kded
 X-TDE-ParentApp=kcontrol
diff --git a/kcontrol/keys/keys.desktop b/kcontrol/keys/keys.desktop
index 30899a8dd..34069c16d 100644
--- a/kcontrol/keys/keys.desktop
+++ b/kcontrol/keys/keys.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell keys
 Icon=key_bindings
 Type=Application
-DocPath=kcontrol/keys/index.html
+X-DocPath=kcontrol/keys/index.html
 
 
 X-TDE-Library=keys
diff --git a/kcontrol/kicker/kicker_config.desktop b/kcontrol/kicker/kicker_config.desktop
index 7a5b33f75..9336eb7ff 100644
--- a/kcontrol/kicker/kicker_config.desktop
+++ b/kcontrol/kicker/kicker_config.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-DocPath=kicker/configuring.html
+X-DocPath=kicker/configuring.html
 Exec=tdecmshell panel
 
 X-TDE-Library=kicker
diff --git a/kcontrol/kicker/kicker_config_appearance.desktop b/kcontrol/kicker/kicker_config_appearance.desktop
index d2a77c3aa..beacc1af3 100644
--- a/kcontrol/kicker/kicker_config_appearance.desktop
+++ b/kcontrol/kicker/kicker_config_appearance.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-DocPath=kicker/configuring.html#panel-appearance
+X-DocPath=kicker/configuring.html#panel-appearance
 Exec=tdecmshell kicker_appearance
 
 
diff --git a/kcontrol/kicker/kicker_config_arrangement.desktop b/kcontrol/kicker/kicker_config_arrangement.desktop
index d555922d8..0ee41a003 100644
--- a/kcontrol/kicker/kicker_config_arrangement.desktop
+++ b/kcontrol/kicker/kicker_config_arrangement.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-DocPath=kicker/configuring.html#panel-arrangement
+X-DocPath=kicker/configuring.html#panel-arrangement
 Exec=tdecmshell kicker_arrangement
 
 X-TDE-Library=kicker
diff --git a/kcontrol/kicker/kicker_config_hiding.desktop b/kcontrol/kicker/kicker_config_hiding.desktop
index d5e8e7f15..498fcda23 100644
--- a/kcontrol/kicker/kicker_config_hiding.desktop
+++ b/kcontrol/kicker/kicker_config_hiding.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-DocPath=kicker/configuring.html#panel-hiding
+X-DocPath=kicker/configuring.html#panel-hiding
 Exec=tdecmshell kicker_hiding
 
 X-TDE-Library=kicker
diff --git a/kcontrol/kicker/kicker_config_menus.desktop b/kcontrol/kicker/kicker_config_menus.desktop
index 0aaff3754..feae5245b 100644
--- a/kcontrol/kicker/kicker_config_menus.desktop
+++ b/kcontrol/kicker/kicker_config_menus.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-DocPath=kicker/configuring.html#panel-menus
+X-DocPath=kicker/configuring.html#panel-menus
 Exec=tdecmshell kicker_menus
 
 X-TDE-Library=kicker
diff --git a/kcontrol/kicker/panel.desktop b/kcontrol/kicker/panel.desktop
index a8df352b2..9491e6332 100644
--- a/kcontrol/kicker/panel.desktop
+++ b/kcontrol/kicker/panel.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kcmkicker
 Type=Application
-DocPath=kicker/configuring.html
+X-DocPath=kicker/configuring.html
 Exec=tdecmshell panel
 
 X-TDE-Library=kicker
diff --git a/kcontrol/knotify/kcmnotify.desktop b/kcontrol/knotify/kcmnotify.desktop
index 95fc24cfc..ce5366def 100644
--- a/kcontrol/knotify/kcmnotify.desktop
+++ b/kcontrol/knotify/kcmnotify.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell kcmnotify
 Icon=knotify
 Type=Application
-DocPath=kcontrol/kcmnotify/index.html
+X-DocPath=kcontrol/kcmnotify/index.html
 
 
 X-TDE-Library=knotify
diff --git a/kcontrol/konq/desktop.desktop b/kcontrol/konq/desktop.desktop
index 4a8cc33ba..40408a55d 100644
--- a/kcontrol/konq/desktop.desktop
+++ b/kcontrol/konq/desktop.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/desktop/index.html
+X-DocPath=kcontrol/desktop/index.html
 Icon=desktop
 Exec=tdecmshell desktop
 
diff --git a/kcontrol/konq/desktopbehavior.desktop b/kcontrol/konq/desktopbehavior.desktop
index 0711d1209..1a1e21009 100644
--- a/kcontrol/konq/desktopbehavior.desktop
+++ b/kcontrol/konq/desktopbehavior.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/desktopbehavior/index.html
+X-DocPath=kcontrol/desktopbehavior/index.html
 Icon=desktop
 Exec=tdecmshell desktopbehavior
 
diff --git a/kcontrol/konq/desktoppath.desktop b/kcontrol/konq/desktoppath.desktop
index 8268e1e81..1577eaea5 100644
--- a/kcontrol/konq/desktoppath.desktop
+++ b/kcontrol/konq/desktoppath.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/paths/index.html
+X-DocPath=kcontrol/paths/index.html
 Icon=kfm
 Exec=tdecmshell desktoppath
 
diff --git a/kcontrol/konq/fileappearance.desktop b/kcontrol/konq/fileappearance.desktop
index 12afc5e5e..7b1cbb327 100644
--- a/kcontrol/konq/fileappearance.desktop
+++ b/kcontrol/konq/fileappearance.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/filemanager/index.html
+X-DocPath=kcontrol/filemanager/index.html
 Icon=kfm
 Exec=tdecmshell fileappearance
 
diff --git a/kcontrol/konq/filebehavior.desktop b/kcontrol/konq/filebehavior.desktop
index ee19e39ff..02c74ccf4 100644
--- a/kcontrol/konq/filebehavior.desktop
+++ b/kcontrol/konq/filebehavior.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/filemanager/index.html
+X-DocPath=kcontrol/filemanager/index.html
 Icon=kfm
 Exec=tdecmshell filebehavior
 
diff --git a/kcontrol/konq/filebrowser.desktop b/kcontrol/konq/filebrowser.desktop
index a583e6d2a..379089f83 100644
--- a/kcontrol/konq/filebrowser.desktop
+++ b/kcontrol/konq/filebrowser.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/filemanager/index.html
+X-DocPath=kcontrol/filemanager/index.html
 Icon=kfm
 Exec=tdecmshell filebrowser
 
diff --git a/kcontrol/konq/filepreviews.desktop b/kcontrol/konq/filepreviews.desktop
index 20bf4f8bd..34eab6679 100644
--- a/kcontrol/konq/filepreviews.desktop
+++ b/kcontrol/konq/filepreviews.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/filemanager/index.html
+X-DocPath=kcontrol/filemanager/index.html
 Icon=kfm
 Exec=tdecmshell filepreviews
 
diff --git a/kcontrol/konq/webappearance.desktop b/kcontrol/konq/webappearance.desktop
index 12afc5e5e..7b1cbb327 100644
--- a/kcontrol/konq/webappearance.desktop
+++ b/kcontrol/konq/webappearance.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/filemanager/index.html
+X-DocPath=kcontrol/filemanager/index.html
 Icon=kfm
 Exec=tdecmshell fileappearance
 
diff --git a/kcontrol/konq/webbehavior.desktop b/kcontrol/konq/webbehavior.desktop
index 72b17695a..3b7ac310b 100644
--- a/kcontrol/konq/webbehavior.desktop
+++ b/kcontrol/konq/webbehavior.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/filemanager/index.html
+X-DocPath=kcontrol/filemanager/index.html
 Icon=kfm
 Exec=tdecmshell filebehavior
 
diff --git a/kcontrol/konqhtml/tdehtml_behavior.desktop b/kcontrol/konqhtml/tdehtml_behavior.desktop
index 99a201bec..6d70f17f9 100644
--- a/kcontrol/konqhtml/tdehtml_behavior.desktop
+++ b/kcontrol/konqhtml/tdehtml_behavior.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/tdehtml/index.html#kbrowse-html
+X-DocPath=kcontrol/tdehtml/index.html#kbrowse-html
 Icon=konqueror
 Exec=tdecmshell tdehtml_behavior
 
diff --git a/kcontrol/konqhtml/tdehtml_filter.desktop b/kcontrol/konqhtml/tdehtml_filter.desktop
index b657c2e1f..cc0bd11ac 100644
--- a/kcontrol/konqhtml/tdehtml_filter.desktop
+++ b/kcontrol/konqhtml/tdehtml_filter.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/tdehtml/index.html#tdehtml-adblock
+X-DocPath=kcontrol/tdehtml/index.html#tdehtml-adblock
 Icon=filter
 Exec=tdecmshell tdehtml_filter
 
diff --git a/kcontrol/konqhtml/tdehtml_fonts.desktop b/kcontrol/konqhtml/tdehtml_fonts.desktop
index 6b85b265f..2cfc95e4e 100644
--- a/kcontrol/konqhtml/tdehtml_fonts.desktop
+++ b/kcontrol/konqhtml/tdehtml_fonts.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance
+X-DocPath=kcontrol/tdehtml/index.html#kbrowse-appearance
 Icon=fonts
 Exec=tdecmshell tdehtml_fonts
 
diff --git a/kcontrol/konqhtml/tdehtml_java_js.desktop b/kcontrol/konqhtml/tdehtml_java_js.desktop
index edc10269f..b48d27663 100644
--- a/kcontrol/konqhtml/tdehtml_java_js.desktop
+++ b/kcontrol/konqhtml/tdehtml_java_js.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/tdehtml/index.html
+X-DocPath=kcontrol/tdehtml/index.html
 Icon=konqueror
 Exec=tdecmshell tdehtml_java_js
 
diff --git a/kcontrol/konqhtml/tdehtml_userinterface.desktop b/kcontrol/konqhtml/tdehtml_userinterface.desktop
index 08c2e8901..9a422e3c2 100644
--- a/kcontrol/konqhtml/tdehtml_userinterface.desktop
+++ b/kcontrol/konqhtml/tdehtml_userinterface.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/tdehtml/index.html#userinterface
+X-DocPath=kcontrol/tdehtml/index.html#userinterface
 Icon=konqueror
 Exec=tdecmshell tdehtml_userinterface
 
diff --git a/kcontrol/konsole/kcmkonsole.desktop b/kcontrol/konsole/kcmkonsole.desktop
index 31b126b29..874741c00 100644
--- a/kcontrol/konsole/kcmkonsole.desktop
+++ b/kcontrol/konsole/kcmkonsole.desktop
@@ -2,7 +2,7 @@
 Icon=konsole
 Type=Application
 Exec=tdecmshell kcmkonsole
-DocPath=kcontrol/kcmkonsole/index.html
+X-DocPath=kcontrol/kcmkonsole/index.html
 
 X-TDE-Library=konsole
 X-TDE-ParentApp=kcontrol
diff --git a/kcontrol/kthememanager/kthememanager.desktop b/kcontrol/kthememanager/kthememanager.desktop
index f5a497c4e..b6efdf361 100644
--- a/kcontrol/kthememanager/kthememanager.desktop
+++ b/kcontrol/kthememanager/kthememanager.desktop
@@ -218,4 +218,4 @@ Type=Application
 X-TDE-FactoryName=kthememanager
 X-TDE-Library=kthememanager
 Categories=Qt;TDE;X-TDE-settings-looknfeel;
-DocPath=kcontrol/kthememanager/index.html
+X-DocPath=kcontrol/kthememanager/index.html
diff --git a/kcontrol/launch/kcmlaunch.desktop b/kcontrol/launch/kcmlaunch.desktop
index 3579e5e30..0d0e0c96a 100644
--- a/kcontrol/launch/kcmlaunch.desktop
+++ b/kcontrol/launch/kcmlaunch.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=launch
 Type=Application
-DocPath=kcontrol/kcmlaunch/index.html
+X-DocPath=kcontrol/kcmlaunch/index.html
 Exec=tdecmshell kcmlaunch
 
 
diff --git a/kcontrol/locale/language.desktop b/kcontrol/locale/language.desktop
index 4f040b47f..cbf903e48 100644
--- a/kcontrol/locale/language.desktop
+++ b/kcontrol/locale/language.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell language
 Icon=locale
 Type=Application
-DocPath=kcontrol/language/index.html
+X-DocPath=kcontrol/language/index.html
 
 
 X-TDE-Library=locale
diff --git a/kcontrol/nics/nic.desktop b/kcontrol/nics/nic.desktop
index ba7472161..a876010cc 100644
--- a/kcontrol/nics/nic.desktop
+++ b/kcontrol/nics/nic.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Exec=tdecmshell nic
 Type=Application
-DocPath=kcontrol/nics/index.html
+X-DocPath=kcontrol/nics/index.html
 Icon=network
 
 
diff --git a/kcontrol/performance/kcmkonqyperformance.desktop b/kcontrol/performance/kcmkonqyperformance.desktop
index 3001e3b81..4c42d4660 100644
--- a/kcontrol/performance/kcmkonqyperformance.desktop
+++ b/kcontrol/performance/kcmkonqyperformance.desktop
@@ -2,7 +2,7 @@
 Icon=launch
 Type=Application
 Exec=tdecmshell kcmkonqyperformance
-DocPath=kcontrol/performance/index.html#konqueror-performance
+X-DocPath=kcontrol/performance/index.html#konqueror-performance
 
 X-TDE-Library=performance
 X-TDE-FactoryName=konqueror
diff --git a/kcontrol/performance/kcmperformance.desktop b/kcontrol/performance/kcmperformance.desktop
index 8d7bfadb3..1968d90f2 100644
--- a/kcontrol/performance/kcmperformance.desktop
+++ b/kcontrol/performance/kcmperformance.desktop
@@ -2,7 +2,7 @@
 Icon=launch
 Type=Application
 Exec=tdecmshell kcmperformance
-DocPath=kcontrol/performance/index.html
+X-DocPath=kcontrol/performance/index.html
 
 X-TDE-Library=performance
 X-TDE-FactoryName=performance
diff --git a/kcontrol/privacy/privacy.desktop b/kcontrol/privacy/privacy.desktop
index 005a32f84..0a8c8d71b 100644
--- a/kcontrol/privacy/privacy.desktop
+++ b/kcontrol/privacy/privacy.desktop
@@ -6,7 +6,7 @@ X-TDE-FactoryName=privacy
 X-TDE-Library=privacy
 Categories=Qt;TDE;X-TDE-settings-security;
 Icon=trashcan_empty
-DocPath=kcontrol/privacy/index.html
+X-DocPath=kcontrol/privacy/index.html
 
 Name=Privacy
 Name[af]=Privaatheid
diff --git a/kcontrol/randr/tderandrtray.desktop b/kcontrol/randr/tderandrtray.desktop
index e10283813..3e6248598 100644
--- a/kcontrol/randr/tderandrtray.desktop
+++ b/kcontrol/randr/tderandrtray.desktop
@@ -139,4 +139,4 @@ Icon=randr
 Type=Application
 OnlyShowIn=TDE;
 Categories=Qt;TDE;System;
-DocPath=tderandrtray/index.html
+X-DocPath=tderandrtray/index.html
diff --git a/kcontrol/samba/smbstatus.desktop b/kcontrol/samba/smbstatus.desktop
index 792799a19..d308d92d4 100644
--- a/kcontrol/samba/smbstatus.desktop
+++ b/kcontrol/samba/smbstatus.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell smbstatus
 Icon=samba
 Type=Application
-DocPath=kcontrol/samba/index.html
+X-DocPath=kcontrol/samba/index.html
 
 
 X-TDE-Library=samba
diff --git a/kcontrol/screensaver/screensaver.desktop b/kcontrol/screensaver/screensaver.desktop
index a377c5183..2156e0218 100644
--- a/kcontrol/screensaver/screensaver.desktop
+++ b/kcontrol/screensaver/screensaver.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell screensaver
 Icon=tdescreensaver
 Type=Application
-DocPath=kcontrol/screensaver/index.html
+X-DocPath=kcontrol/screensaver/index.html
 
 
 X-TDE-Library=screensaver
diff --git a/kcontrol/smartcard/smartcard.desktop b/kcontrol/smartcard/smartcard.desktop
index e23fcd109..e3e2d3dbf 100644
--- a/kcontrol/smartcard/smartcard.desktop
+++ b/kcontrol/smartcard/smartcard.desktop
@@ -2,7 +2,7 @@
 Icon=identity
 Type=Application
 Exec=tdecmshell smartcard
-DocPath=kcontrol/smartcard.html
+X-DocPath=kcontrol/smartcard.html
 
 X-TDE-Library=smartcard
 X-TDE-Init=smartcard
diff --git a/kcontrol/smserver/kcmsmserver.desktop b/kcontrol/smserver/kcmsmserver.desktop
index 863693c3c..f4fe13cc3 100644
--- a/kcontrol/smserver/kcmsmserver.desktop
+++ b/kcontrol/smserver/kcmsmserver.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=exit
 Type=Application
-DocPath=kcontrol/kcmsmserver/index.html
+X-DocPath=kcontrol/kcmsmserver/index.html
 Exec=tdecmshell kcmsmserver
 
 
diff --git a/kcontrol/spellchecking/spellchecking.desktop b/kcontrol/spellchecking/spellchecking.desktop
index d90306941..42b8bdcd3 100644
--- a/kcontrol/spellchecking/spellchecking.desktop
+++ b/kcontrol/spellchecking/spellchecking.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell spellchecking
 Icon=spellcheck
 Type=Application
-DocPath=kcontrol/spellchecking/index.html
+X-DocPath=kcontrol/spellchecking/index.html
 
 
 X-TDE-Library=spellchecking
diff --git a/kcontrol/style/style.desktop b/kcontrol/style/style.desktop
index fd99ac9ce..2602d9122 100644
--- a/kcontrol/style/style.desktop
+++ b/kcontrol/style/style.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell style
 Icon=style
 Type=Application
-DocPath=kcontrol/kcmstyle/index.html
+X-DocPath=kcontrol/kcmstyle/index.html
 
 
 X-TDE-Library=style
diff --git a/kcontrol/taskbar/kcmtaskbar.desktop b/kcontrol/taskbar/kcmtaskbar.desktop
index cdb2eeb21..a65f0b462 100644
--- a/kcontrol/taskbar/kcmtaskbar.desktop
+++ b/kcontrol/taskbar/kcmtaskbar.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kmenu
 Type=Application
-DocPath=kicker/taskbar-settings.html
+X-DocPath=kicker/taskbar-settings.html
 Exec=tdecmshell kcmtaskbar
 
 X-TDE-Library=taskbar
diff --git a/kcontrol/tdefontinst/installfont.desktop b/kcontrol/tdefontinst/installfont.desktop
index 5286ce4ec..b625877bd 100644
--- a/kcontrol/tdefontinst/installfont.desktop
+++ b/kcontrol/tdefontinst/installfont.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=application/x-font-ttf,application/x-font-type1,application/x-font-speedo,application/x-font-bdf,application/x-font-pcf,application/x-font-snf,application/x-font-otf,application/x-font-ttc,application/x-afm
+X-TDE-ServiceTypes=application/x-font-ttf,application/x-font-type1,application/x-font-speedo,application/x-font-bdf,application/x-font-pcf,application/x-font-snf,application/x-font-otf,application/x-font-ttc,application/x-afm
 Actions=installFont;
 
 [Desktop Action installFont]
diff --git a/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop b/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop
index 336e84c57..30e1aeab6 100644
--- a/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop
+++ b/kcontrol/tdefontinst/kcmfontinst/kcmfontinst.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell kcmfontinst
 Icon=fonts
 Type=Application
-DocPath=kcontrol/kcmfontinst/index.html
+X-DocPath=kcontrol/kcmfontinst/index.html
 
 
 X-TDE-Library=fontinst
diff --git a/kcontrol/tdefontinst/tdefile-plugin/tdefile_font.desktop b/kcontrol/tdefontinst/tdefile-plugin/tdefile_font.desktop
index 20e502c59..7ccb1b745 100644
--- a/kcontrol/tdefontinst/tdefile-plugin/tdefile_font.desktop
+++ b/kcontrol/tdefontinst/tdefile-plugin/tdefile_font.desktop
@@ -79,7 +79,7 @@ Name[xh]=Ulwazi Lohlobo lwamagama
 Name[zh_CN]=字体信息
 Name[zh_TW]=字型資訊
 Name[zu]=Ulwazi lohlobo lwamagama
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_font
 MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-bdf;application/x-font-pcf;application/x-font-otf;application/x-font-ttc;application/x-afm
 PreferredGroups=General
diff --git a/kcontrol/tdefontinst/thumbnail/fontthumbnail.desktop b/kcontrol/tdefontinst/thumbnail/fontthumbnail.desktop
index 7b82caf93..5d0bdf46a 100644
--- a/kcontrol/tdefontinst/thumbnail/fontthumbnail.desktop
+++ b/kcontrol/tdefontinst/thumbnail/fontthumbnail.desktop
@@ -79,7 +79,7 @@ Name[xh]=Iifayile Zohlobo lwamagama
 Name[zh_CN]=字体文件
 Name[zh_TW]=字型檔案
 Name[zu]=Amafayela ohlobo lwamagama
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=application/x-font-ttf,application/x-font-type1,application/x-font-bdf,application/x-font-pcf,application/x-font-otf,application/x-font-ttc
 X-TDE-Library=fontthumbnail
 CacheThumbnail=false
diff --git a/kcontrol/tdefontinst/viewpart/tdefontview.desktop b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
index 81d82cf4d..5d5e2b81c 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontview.desktop
+++ b/kcontrol/tdefontinst/viewpart/tdefontview.desktop
@@ -96,6 +96,6 @@ GenericName[wa]=Håyneu di fontes
 GenericName[zh_CN]=字体查看器
 GenericName[zh_TW]=字型檢視器
 Terminal=false
-InitialPreference=1
+X-TDE-InitialPreference=1
 Categories=Qt;TDE;Graphics;
-DocPath=tdefontview/index.html
+X-DocPath=tdefontview/index.html
diff --git a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
index ac1746bdd..9162afb1a 100644
--- a/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
+++ b/kcontrol/tdefontinst/viewpart/tdefontviewpart.desktop
@@ -79,8 +79,8 @@ Name[zh_CN]=字体查看器
 Name[zh_TW]=字型檢視器
 Name[zu]=Umbukisi Wohlobo lwamagama
 MimeType=application/x-font-ttf;application/x-font-type1;application/x-font-otf;application/x-font-ttc;application/x-font-pcf;application/x-font-bdf;fonts/package
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=libtdefontviewpart
 Type=Service
-InitialPreference=1
+X-TDE-InitialPreference=1
 Icon=fonts
diff --git a/kcontrol/tdeio/cache.desktop b/kcontrol/tdeio/cache.desktop
index 1e8666de5..2d03cf11e 100644
--- a/kcontrol/tdeio/cache.desktop
+++ b/kcontrol/tdeio/cache.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/cache/index.html
+X-DocPath=kcontrol/cache/index.html
 Icon=cache
 Exec=tdecmshell cache
 
diff --git a/kcontrol/tdeio/cookies.desktop b/kcontrol/tdeio/cookies.desktop
index 9612c8d53..f6c034f89 100644
--- a/kcontrol/tdeio/cookies.desktop
+++ b/kcontrol/tdeio/cookies.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/cookies/index.html
+X-DocPath=kcontrol/cookies/index.html
 Icon=cookie
 Exec=tdecmshell cookies
 
diff --git a/kcontrol/tdeio/lanbrowser.desktop b/kcontrol/tdeio/lanbrowser.desktop
index c917bfbbf..2a7571f71 100644
--- a/kcontrol/tdeio/lanbrowser.desktop
+++ b/kcontrol/tdeio/lanbrowser.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/smb/index.html
+X-DocPath=kcontrol/smb/index.html
 Icon=samba
 Exec=tdecmshell lanbrowser
 
diff --git a/kcontrol/tdeio/netpref.desktop b/kcontrol/tdeio/netpref.desktop
index 61d181019..428051a38 100644
--- a/kcontrol/tdeio/netpref.desktop
+++ b/kcontrol/tdeio/netpref.desktop
@@ -196,7 +196,7 @@ Name[wa]=Preferinces di raloyaedje
 Name[zh_CN]=连接首选项
 Name[zh_TW]=連線偏好設定
 Type=Application
-DocPath=kcontrol/netpref/index.html
+X-DocPath=kcontrol/netpref/index.html
 X-TDE-FactoryName=netpref
 X-TDE-Library=tdeio
 
diff --git a/kcontrol/tdeio/proxy.desktop b/kcontrol/tdeio/proxy.desktop
index 6bab29836..9cf7ed67d 100644
--- a/kcontrol/tdeio/proxy.desktop
+++ b/kcontrol/tdeio/proxy.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/proxy/index.html
+X-DocPath=kcontrol/proxy/index.html
 Icon=proxy
 Exec=tdecmshell proxy
 
diff --git a/kcontrol/tdeio/smb.desktop b/kcontrol/tdeio/smb.desktop
index c1cf7a15b..e82da7926 100644
--- a/kcontrol/tdeio/smb.desktop
+++ b/kcontrol/tdeio/smb.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/smb/index.html
+X-DocPath=kcontrol/smb/index.html
 Icon=samba
 Exec=tdecmshell smb
 
diff --git a/kcontrol/tdeio/uasproviders/ie45onwinnt5.desktop b/kcontrol/tdeio/uasproviders/ie45onwinnt5.desktop
index 94fa23150..09d757326 100644
--- a/kcontrol/tdeio/uasproviders/ie45onwinnt5.desktop
+++ b/kcontrol/tdeio/uasproviders/ie45onwinnt5.desktop
@@ -71,7 +71,7 @@ Name[xh]=UADescription (IE 4.5 kwi Win 2000)
 Name[zh_CN]=用户代理描述 (运行于 Win 2000 的 IE 4.5)
 Name[zh_TW]=使用者代理描述 (IE 4.5 on Win 2000)
 Type=Service
-ServiceTypes=UserAgentStrings
+X-TDE-ServiceTypes=UserAgentStrings
 X-TDE-UA-TAG=IE
 X-TDE-UA-FULL=Mozilla/4.0 (compatible; MSIE 4.5; Windows NT 5.0)
 X-TDE-UA-NAME=Internet Explorer
diff --git a/kcontrol/tdeio/uasproviders/ie501onwinnt5.desktop b/kcontrol/tdeio/uasproviders/ie501onwinnt5.desktop
index a32a4a606..77d0f3ac0 100644
--- a/kcontrol/tdeio/uasproviders/ie501onwinnt5.desktop
+++ b/kcontrol/tdeio/uasproviders/ie501onwinnt5.desktop
@@ -70,7 +70,7 @@ Name[xh]=UADescription (IE 5.01 kwi Win 2000)
 Name[zh_CN]=用户代理描述 (运行于 Win 2000 的 IE 5.01)
 Name[zh_TW]=使用者代理描述 (IE 5.01 on Win 2000)
 Type=Service
-ServiceTypes=UserAgentStrings
+X-TDE-ServiceTypes=UserAgentStrings
 X-TDE-UA-TAG=IE
 X-TDE-UA-FULL=Mozilla/4.0 (compatible; MSIE 5.01; Windows NT 5.0)
 X-TDE-UA-NAME=Internet Explorer
diff --git a/kcontrol/tdeio/uasproviders/ie55onwin98.desktop b/kcontrol/tdeio/uasproviders/ie55onwin98.desktop
index f5c7046f0..36b65ec68 100644
--- a/kcontrol/tdeio/uasproviders/ie55onwin98.desktop
+++ b/kcontrol/tdeio/uasproviders/ie55onwin98.desktop
@@ -70,7 +70,7 @@ Name[xh]=UADescription UA (IE 5.5 kwi Win 98)
 Name[zh_CN]=用户代理描述 (运行于 Win 98 的 IE 5.5)
 Name[zh_TW]=使用者代理描述 (IE 5.5 on Win 98)
 Type=Service
-ServiceTypes=UserAgentStrings
+X-TDE-ServiceTypes=UserAgentStrings
 X-TDE-UA-TAG=IE
 X-TDE-UA-FULL=Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)
 X-TDE-UA-NAME=Internet Explorer
diff --git a/kcontrol/tdeio/uasproviders/op75oncurrent.desktop b/kcontrol/tdeio/uasproviders/op75oncurrent.desktop
index 64c0c234b..b0d537d77 100644
--- a/kcontrol/tdeio/uasproviders/op75oncurrent.desktop
+++ b/kcontrol/tdeio/uasproviders/op75oncurrent.desktop
@@ -61,7 +61,7 @@ Name[wa]=Discrijhaedje di l' idintité do betchteu (Opera 7.55 sol ci do moumint
 Name[zh_CN]=用户代理描述 (运行于本机的 Opera 7.55)
 Name[zh_TW]=使用者代理描述 (Opera 7.55 on current)
 Type=Service
-ServiceTypes=UserAgentStrings
+X-TDE-ServiceTypes=UserAgentStrings
 X-TDE-UA-TAG=OPR
 X-TDE-UA-FULL=Opera/7.55 (appPlatform; appSysName appMachineType; U) [appLanguage]
 X-TDE-UA-NAME=Opera
diff --git a/kcontrol/tdeio/useragent.desktop b/kcontrol/tdeio/useragent.desktop
index 7729b7f50..dd129113d 100644
--- a/kcontrol/tdeio/useragent.desktop
+++ b/kcontrol/tdeio/useragent.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Icon=agent
 Exec=tdecmshell useragent
-DocPath=kcontrol/useragent/index.html
+X-DocPath=kcontrol/useragent/index.html
 
 
 X-TDE-Library=tdeio
diff --git a/kcontrol/tdm/tdm.desktop b/kcontrol/tdm/tdm.desktop
index 0f82690e2..848c6cd43 100644
--- a/kcontrol/tdm/tdm.desktop
+++ b/kcontrol/tdm/tdm.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell tdm
 Icon=tdmconfig
 Type=Application
-DocPath=tdm/index.html
+X-DocPath=tdm/index.html
 
 X-TDE-SubstituteUID=true
 
diff --git a/kcontrol/usbview/kcmusb.desktop b/kcontrol/usbview/kcmusb.desktop
index 39d9518f7..3c1b43728 100644
--- a/kcontrol/usbview/kcmusb.desktop
+++ b/kcontrol/usbview/kcmusb.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=usb
 Type=Application
-DocPath=kcontrol/usb/index.html
+X-DocPath=kcontrol/usb/index.html
 Exec=tdecmshell kcmusb
 
 X-TDE-Library=usb
diff --git a/kcontrol/view1394/kcmview1394.desktop b/kcontrol/view1394/kcmview1394.desktop
index 23f542bd7..8e57475bf 100644
--- a/kcontrol/view1394/kcmview1394.desktop
+++ b/kcontrol/view1394/kcmview1394.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=ieee1394
 Type=Application
-DocPath=kcontrol/view1394/index.html
+X-DocPath=kcontrol/view1394/index.html
 Exec=tdecmshell kcmview1394
 
 X-TDE-Library=view1394
diff --git a/kcontrol/xinerama/xinerama.desktop b/kcontrol/xinerama/xinerama.desktop
index 1f4173583..c4bc98052 100644
--- a/kcontrol/xinerama/xinerama.desktop
+++ b/kcontrol/xinerama/xinerama.desktop
@@ -2,7 +2,7 @@
 Icon=identity
 Type=Application
 Exec=tdecmshell xinerama
-DocPath=kcontrol/multiplemonitors.html
+X-DocPath=kcontrol/multiplemonitors.html
 
 X-TDE-Library=xinerama
 X-TDE-Test-Module=true
diff --git a/kdesktop/kdesktopSetAsBackground.desktop b/kdesktop/kdesktopSetAsBackground.desktop
index 79c879b20..298d3e489 100644
--- a/kdesktop/kdesktopSetAsBackground.desktop
+++ b/kdesktop/kdesktopSetAsBackground.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=image/*
+X-TDE-ServiceTypes=image/*
 Actions=setAsBackground;tileAsBackground;
 X-TDE-Submenu=Set as Background
 X-TDE-Submenu[af]=Stel as agtergrond
diff --git a/kfind/Kfind.desktop b/kfind/Kfind.desktop
index 36fe93238..92352a990 100644
--- a/kfind/Kfind.desktop
+++ b/kfind/Kfind.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Exec=kfind %f
 Icon=kfind
-DocPath=kfind/index.html
+X-DocPath=kfind/index.html
 Path=
 Type=Application
 Terminal=false
diff --git a/kfind/kfindpart.desktop b/kfind/kfindpart.desktop
index 35e15322d..c9cb0c025 100644
--- a/kfind/kfindpart.desktop
+++ b/kfind/kfindpart.desktop
@@ -79,9 +79,9 @@ Name[zh_CN]=查找部件
 Name[zh_TW]=尋找組件
 Name[zu]=Thola Ingxenye
 MimeType=
-ServiceTypes=Konqueror/FindPart
+X-TDE-ServiceTypes=Konqueror/FindPart
 X-TDE-Library=libkfindpart
 X-TDE-BrowserView-AllowAsDefault=true
 X-TDE-BrowserView-HideFromMenus=true
 X-TDE-BrowserView-PassiveMode=true
-InitialPreference=10
+X-TDE-InitialPreference=10
diff --git a/khelpcenter/Help.desktop b/khelpcenter/Help.desktop
index 9f423cff7..730a92e3c 100644
--- a/khelpcenter/Help.desktop
+++ b/khelpcenter/Help.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Exec=khelpcenter
 Icon=khelpcenter
-DocPath=khelpcenter/index.html
+X-DocPath=khelpcenter/index.html
 Type=Application
 Terminal=false
 Name=Help
diff --git a/khelpcenter/htmlsearch/htmlsearch.desktop b/khelpcenter/htmlsearch/htmlsearch.desktop
index 5393ffb4a..324c96d45 100644
--- a/khelpcenter/htmlsearch/htmlsearch.desktop
+++ b/khelpcenter/htmlsearch/htmlsearch.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell htmlsearch
 Icon=help_index
 Type=Application
-DocPath=kcontrol/help-index.html
+X-DocPath=kcontrol/help-index.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=htmlsearch
diff --git a/khelpcenter/khelpcenter.desktop b/khelpcenter/khelpcenter.desktop
index 8fba4bb2f..e001282a6 100644
--- a/khelpcenter/khelpcenter.desktop
+++ b/khelpcenter/khelpcenter.desktop
@@ -124,7 +124,7 @@ Comment[zh_CN]=Trinity 帮助中心
 Comment[zh_TW]=Trinity 求助中心
 Comment[zu]=Indawo Yosizi ye-Trinity
 Icon=khelpcenter
-DocPath=khelpcenter/index.html
+X-DocPath=khelpcenter/index.html
 Type=Service
 Terminal=false
 Exec=khelpcenter %u
diff --git a/khelpcenter/plugins/Manpages/man1.desktop b/khelpcenter/plugins/Manpages/man1.desktop
index e4b45a78f..7bc880c17 100644
--- a/khelpcenter/plugins/Manpages/man1.desktop
+++ b/khelpcenter/plugins/Manpages/man1.desktop
@@ -71,4 +71,4 @@ Name[wa]=(1) Comandes d' uzeu
 Name[zh_CN]=(1) 用户命令
 Name[zh_TW]=(1) 使用者命令
 
-DocPath=man:/(1)
+X-DocPath=man:/(1)
diff --git a/khelpcenter/plugins/Manpages/man2.desktop b/khelpcenter/plugins/Manpages/man2.desktop
index 8e1c68ab7..439c8d30c 100644
--- a/khelpcenter/plugins/Manpages/man2.desktop
+++ b/khelpcenter/plugins/Manpages/man2.desktop
@@ -72,4 +72,4 @@ Name[wa]=(2) Xhilete do sistinme
 Name[zh_CN]=(2) 系统调用
 Name[zh_TW]=(2) 系統呼叫
 
-DocPath=man:/(2)
+X-DocPath=man:/(2)
diff --git a/khelpcenter/plugins/Manpages/man3.desktop b/khelpcenter/plugins/Manpages/man3.desktop
index dba88eeb9..c5d454351 100644
--- a/khelpcenter/plugins/Manpages/man3.desktop
+++ b/khelpcenter/plugins/Manpages/man3.desktop
@@ -73,4 +73,4 @@ Name[zh_CN]=(3) 子例程
 Name[zh_TW]=(3) 子程式
 Name[zu]=(3) iqoqo lemisebenzana 
 
-DocPath=man:/(3)
+X-DocPath=man:/(3)
diff --git a/khelpcenter/plugins/Manpages/man4.desktop b/khelpcenter/plugins/Manpages/man4.desktop
index 22841b6ce..6542cd34f 100644
--- a/khelpcenter/plugins/Manpages/man4.desktop
+++ b/khelpcenter/plugins/Manpages/man4.desktop
@@ -78,4 +78,4 @@ Name[zh_CN]=(4) 设备
 Name[zh_TW]=(4) 裝置
 Name[zu]=(4) Amathuluzi anenjongo
 
-DocPath=man:/(4)
+X-DocPath=man:/(4)
diff --git a/khelpcenter/plugins/Manpages/man5.desktop b/khelpcenter/plugins/Manpages/man5.desktop
index 8b3fa916c..27defeda4 100644
--- a/khelpcenter/plugins/Manpages/man5.desktop
+++ b/khelpcenter/plugins/Manpages/man5.desktop
@@ -78,4 +78,4 @@ Name[zh_CN]=(5) 文件格式
 Name[zh_TW]=(5) 檔案格式
 Name[zu]=(5) Izakhiwo zamafayela
 
-DocPath=man:/(5)
+X-DocPath=man:/(5)
diff --git a/khelpcenter/plugins/Manpages/man6.desktop b/khelpcenter/plugins/Manpages/man6.desktop
index 415fe718f..2957b2a86 100644
--- a/khelpcenter/plugins/Manpages/man6.desktop
+++ b/khelpcenter/plugins/Manpages/man6.desktop
@@ -79,4 +79,4 @@ Name[zh_CN]=(6) 游戏
 Name[zh_TW]=(6) 遊戲
 Name[zu]=(6) Imidlalo
 
-DocPath=man:/(6)
+X-DocPath=man:/(6)
diff --git a/khelpcenter/plugins/Manpages/man7.desktop b/khelpcenter/plugins/Manpages/man7.desktop
index 24c6e14ef..ec5c7b660 100644
--- a/khelpcenter/plugins/Manpages/man7.desktop
+++ b/khelpcenter/plugins/Manpages/man7.desktop
@@ -77,4 +77,4 @@ Name[zh_CN]=(7) 杂项
 Name[zh_TW]=(7) 雜項
 Name[zu]=(7) Ingxubevange
 
-DocPath=man:/(7)
+X-DocPath=man:/(7)
diff --git a/khelpcenter/plugins/Manpages/man8.desktop b/khelpcenter/plugins/Manpages/man8.desktop
index 2caad71dd..d5d836824 100644
--- a/khelpcenter/plugins/Manpages/man8.desktop
+++ b/khelpcenter/plugins/Manpages/man8.desktop
@@ -76,4 +76,4 @@ Name[zh_CN]=(8) 系统管理
 Name[zh_TW]=(8) 系統管理
 Name[zu]=(8) Ukugcinwa kwesistimu
 
-DocPath=man:/(8)
+X-DocPath=man:/(8)
diff --git a/khelpcenter/plugins/Manpages/man9.desktop b/khelpcenter/plugins/Manpages/man9.desktop
index 9893a028f..90d639a8c 100644
--- a/khelpcenter/plugins/Manpages/man9.desktop
+++ b/khelpcenter/plugins/Manpages/man9.desktop
@@ -59,4 +59,4 @@ Name[wa]=(9) Fonccions do nawea linux
 Name[zh_CN]=(9) 内核
 Name[zh_TW]=(9) 核心
 
-DocPath=man:/(9)
+X-DocPath=man:/(9)
diff --git a/khelpcenter/plugins/Manpages/mann.desktop b/khelpcenter/plugins/Manpages/mann.desktop
index 75c1e227e..369737e6e 100644
--- a/khelpcenter/plugins/Manpages/mann.desktop
+++ b/khelpcenter/plugins/Manpages/mann.desktop
@@ -78,4 +78,4 @@ Name[zh_CN]=(n) 新建
 Name[zh_TW]=(n) 新
 Name[zu]=(n) Okusha
 
-DocPath=man:/(n)
+X-DocPath=man:/(n)
diff --git a/khelpcenter/plugins/adminguide.desktop b/khelpcenter/plugins/adminguide.desktop
index bf3c41814..a113c1289 100644
--- a/khelpcenter/plugins/adminguide.desktop
+++ b/khelpcenter/plugins/adminguide.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-DocPath=help:/khelpcenter/adminguide/index.html
+X-DocPath=help:/khelpcenter/adminguide/index.html
 
 Name=TDE Admininstrator Guide
 
diff --git a/khelpcenter/plugins/contact.desktop b/khelpcenter/plugins/contact.desktop
index 4c4a34eb6..cce358306 100644
--- a/khelpcenter/plugins/contact.desktop
+++ b/khelpcenter/plugins/contact.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-DocPath=help:/khelpcenter/index.html?anchor=contact
+X-DocPath=help:/khelpcenter/index.html?anchor=contact
 
 Name=Contact Information
 Name[af]=Kontak Informasie
diff --git a/khelpcenter/plugins/faq.desktop b/khelpcenter/plugins/faq.desktop
index 08e1a4969..b051327e1 100644
--- a/khelpcenter/plugins/faq.desktop
+++ b/khelpcenter/plugins/faq.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-DocPath=help:/khelpcenter/faq/index.html
+X-DocPath=help:/khelpcenter/faq/index.html
 
 Name=The TDE FAQ
 Name[af]=Die TDE Faq
diff --git a/khelpcenter/plugins/info.desktop b/khelpcenter/plugins/info.desktop
index a7e79046f..f9a4df508 100644
--- a/khelpcenter/plugins/info.desktop
+++ b/khelpcenter/plugins/info.desktop
@@ -75,6 +75,6 @@ Icon=contents2
 
 X-TDE-KHelpcenter-Special=info
 
-DocPath=info:/dir
+X-DocPath=info:/dir
 
 X-DOC-Weight=700
diff --git a/khelpcenter/plugins/links.desktop b/khelpcenter/plugins/links.desktop
index 13c838e7b..14e479e66 100644
--- a/khelpcenter/plugins/links.desktop
+++ b/khelpcenter/plugins/links.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-DocPath=help:/khelpcenter/index.html?anchor=links
+X-DocPath=help:/khelpcenter/index.html?anchor=links
 
 Name=TDE on the Web
 Name[af]=TDE op die Web
diff --git a/khelpcenter/plugins/quickstart.desktop b/khelpcenter/plugins/quickstart.desktop
index 717fd68dd..4fdfd93ed 100644
--- a/khelpcenter/plugins/quickstart.desktop
+++ b/khelpcenter/plugins/quickstart.desktop
@@ -78,7 +78,7 @@ Name[xh]=Isikhombisi Sesiqalo esikhawulezayo
 Name[zh_CN]=速成指南
 Name[zh_TW]=快速入門指南
 Name[zu]=Umbonisi wokuqala ngokushesha
-DocPath=help:/khelpcenter/quickstart/index.html
+X-DocPath=help:/khelpcenter/quickstart/index.html
 
 X-DOC-Weight=-2000
 Icon=kmenu
diff --git a/khelpcenter/plugins/support.desktop b/khelpcenter/plugins/support.desktop
index 5ae894de1..394d02b64 100644
--- a/khelpcenter/plugins/support.desktop
+++ b/khelpcenter/plugins/support.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-DocPath=help:/khelpcenter/index.html?anchor=support
+X-DocPath=help:/khelpcenter/index.html?anchor=support
 
 Name=Supporting TDE
 Name[af]=Ondersteun TDE
diff --git a/khelpcenter/plugins/userguide.desktop b/khelpcenter/plugins/userguide.desktop
index 94758edaf..eb72a5ea3 100644
--- a/khelpcenter/plugins/userguide.desktop
+++ b/khelpcenter/plugins/userguide.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-DocPath=help:/khelpcenter/userguide/index.html
+X-DocPath=help:/khelpcenter/userguide/index.html
 
 Name=TDE User Guide
 Name[af]=TDE gebruiker handleiding
diff --git a/khelpcenter/plugins/visualdict.desktop b/khelpcenter/plugins/visualdict.desktop
index ca7593032..7f70d255a 100644
--- a/khelpcenter/plugins/visualdict.desktop
+++ b/khelpcenter/plugins/visualdict.desktop
@@ -74,7 +74,7 @@ Name[xh]=Isikhombisi esibonakalayo se TDE
 Name[zh_CN]=TDE 可视化指南
 Name[zh_TW]=TDE 視覺指南
 Name[zu]=Umbonisi obonakalayo oya kwi-TDE
-DocPath=help:/khelpcenter/visualdict/index.html
+X-DocPath=help:/khelpcenter/visualdict/index.html
 
 X-DOC-Weight=-2500
 Icon=kmenu
diff --git a/khelpcenter/plugins/welcome.desktop b/khelpcenter/plugins/welcome.desktop
index b6c264efd..4847992d3 100644
--- a/khelpcenter/plugins/welcome.desktop
+++ b/khelpcenter/plugins/welcome.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-DocPath=help:/khelpcenter/index.html?anchor=welcome
+X-DocPath=help:/khelpcenter/index.html?anchor=welcome
 
 Name=Welcome to TDE
 Name[af]=Welkom by TDE
diff --git a/khotkeys/app/khotkeys.desktop b/khotkeys/app/khotkeys.desktop
index 7b9cc9330..cd2382e00 100644
--- a/khotkeys/app/khotkeys.desktop
+++ b/khotkeys/app/khotkeys.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Exec=khotkeys
 Type=Service
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=khotkeys
 X-TDE-FactoryName=khotkeys
 X-TDE-Kded-autoload=false
-DocPath=kcontrol/khotkeys/index.html
+X-DocPath=kcontrol/khotkeys/index.html
 
 Name=Input Actions
 Name[af]=Inset Aksies
diff --git a/khotkeys/kcontrol/khotkeys.desktop b/khotkeys/kcontrol/khotkeys.desktop
index 71d39991f..ade4ecf32 100644
--- a/khotkeys/kcontrol/khotkeys.desktop
+++ b/khotkeys/kcontrol/khotkeys.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell khotkeys
 Icon=khotkeys
 Type=Application
-DocPath=kcontrol/khotkeys/index.html
+X-DocPath=kcontrol/khotkeys/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=khotkeys
 X-TDE-Init-Library=khotkeys_init
diff --git a/kicker/kicker/kcmkicker.desktop b/kicker/kicker/kcmkicker.desktop
index 12fe7d9b1..c7d493997 100644
--- a/kicker/kicker/kcmkicker.desktop
+++ b/kicker/kicker/kcmkicker.desktop
@@ -76,6 +76,6 @@ Name[wa]=Apontyî li scriftôr
 Name[zh_CN]=配置面板
 Name[zh_TW]=設定面板
 X-TDE-StartupNotify=true
-DocPath=kicker/configuring.html
+X-DocPath=kicker/configuring.html
 OnlyShowIn=TDE;
 Categories=Qt;TDE;Settings;
diff --git a/kicker/kicker/panel.desktop b/kicker/kicker/panel.desktop
index 39451e726..20a582cdd 100644
--- a/kicker/kicker/panel.desktop
+++ b/kicker/kicker/panel.desktop
@@ -80,7 +80,7 @@ Name[zh_TW]=Trinity 面板
 Name[zu]=Iwindi lemininingwane le-Trinity
 X-DCOP-ServiceType=wait
 X-TDE-autostart-after=kdesktop
-DocPath=kicker/index.html
+X-DocPath=kicker/index.html
 Type=Service
 OnlyShowIn=TDE;
 X-TDE-autostart-phase=0
diff --git a/kicker/kicker/plugins/kickoffsearch_beagle.desktop b/kicker/kicker/plugins/kickoffsearch_beagle.desktop
index 50ef62b32..aa8bb5657 100644
--- a/kicker/kicker/plugins/kickoffsearch_beagle.desktop
+++ b/kicker/kicker/plugins/kickoffsearch_beagle.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Name=Beagle Search
 Comment=Beagle search plugin for Kickoff search
-ServiceTypes=KickoffSearch/Plugin
+X-TDE-ServiceTypes=KickoffSearch/Plugin
 Type=Service
 X-TDE-Library=kickoffsearch_beagle
diff --git a/kicker/menuext/find/kfind.desktop b/kicker/menuext/find/kfind.desktop
index 9363c1849..89aec1bac 100644
--- a/kicker/menuext/find/kfind.desktop
+++ b/kicker/menuext/find/kfind.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Exec=kfind %f
 Icon=kfind
-DocPath=kfind/index.html
+X-DocPath=kfind/index.html
 Path=
 Type=Application
 Terminal=false
diff --git a/klipper/klipper.desktop b/klipper/klipper.desktop
index 36cc043f9..a6b4df049 100644
--- a/klipper/klipper.desktop
+++ b/klipper/klipper.desktop
@@ -97,7 +97,7 @@ GenericName[zu]=Ithuluzi Lebhodi elibophayo
 Exec=klipper
 Icon=klipper
 Type=Application
-DocPath=klipper/index.html
+X-DocPath=klipper/index.html
 Terminal=false
 X-TDE-autostart-after=panel
 X-TDE-StartupNotify=false
diff --git a/kmenuedit/kmenuedit.desktop b/kmenuedit/kmenuedit.desktop
index 4aec88dc4..e95403953 100644
--- a/kmenuedit/kmenuedit.desktop
+++ b/kmenuedit/kmenuedit.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Exec=kmenuedit
 Icon=kmenuedit
-DocPath=kmenuedit/index.html
+X-DocPath=kmenuedit/index.html
 Type=Application
 X-TDE-StartupNotify=true
 OnlyShowIn=TDE;
diff --git a/knetattach/knetattach.desktop b/knetattach/knetattach.desktop
index 0b98dd833..6003b68e9 100644
--- a/knetattach/knetattach.desktop
+++ b/knetattach/knetattach.desktop
@@ -73,10 +73,10 @@ GenericName[wa]=Usteye d' ridant rantoele
 GenericName[zh_CN]=网络文件夹向导
 GenericName[zh_TW]=網路資料夾精靈
 Exec=knetattach
-InitialPreference=6
+X-TDE-InitialPreference=6
 Icon=knetattach
 Type=Application
 Terminal=false
 X-TDE-StartupNotify=true
 Categories=Qt;TDE;Network;
-DocPath=knetattach/index.html
+X-DocPath=knetattach/index.html
diff --git a/konqueror/about/konq_aboutpage.desktop b/konqueror/about/konq_aboutpage.desktop
index dadfdd615..da91b3a67 100644
--- a/konqueror/about/konq_aboutpage.desktop
+++ b/konqueror/about/konq_aboutpage.desktop
@@ -80,7 +80,7 @@ Name[xh]=Malunga-Nephepha le Konqueror
 Name[zh_CN]=Konqueror 的关于页面
 Name[zh_TW]=Konqueror 相關資訊
 Name[zu]=Mayelana-nekhasi le-Konqueror
-ServiceTypes=KonqAboutPage,KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KonqAboutPage,KParts/ReadOnlyPart
 X-TDE-Library=konq_aboutpage
 X-TDE-BrowserView-HideFromMenus=true
 X-TDE-BrowserView-Built-Into=konqueror
diff --git a/konqueror/iconview/konq_iconview.desktop b/konqueror/iconview/konq_iconview.desktop
index 38d9d5690..524efb6d6 100644
--- a/konqueror/iconview/konq_iconview.desktop
+++ b/konqueror/iconview/konq_iconview.desktop
@@ -80,10 +80,10 @@ Name[zh_CN]=图标视图
 Name[zh_TW]=圖示瀏覽
 Name[zu]=Umbukiso wophawu lwesithombe
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=konq_iconview
 X-TDE-BrowserView-AllowAsDefault=true
 X-TDE-BrowserView-HideFromMenus=true
 X-TDE-BrowserView-Args=IconView
 Icon=view_icon
-InitialPreference=10
+X-TDE-InitialPreference=10
diff --git a/konqueror/iconview/konq_multicolumnview.desktop b/konqueror/iconview/konq_multicolumnview.desktop
index 2a71a42f6..70523fc6a 100644
--- a/konqueror/iconview/konq_multicolumnview.desktop
+++ b/konqueror/iconview/konq_multicolumnview.desktop
@@ -80,10 +80,10 @@ Name[zh_CN]=多列视图
 Name[zh_TW]=多列瀏覽
 Name[zu]=Umbukiso onamakholumu amaningi
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=konq_iconview
 X-TDE-BrowserView-AllowAsDefault=true
 X-TDE-BrowserView-HideFromMenus=true
 X-TDE-BrowserView-Args=MultiColumnView
 Icon=view_multicolumn
-InitialPreference=9
+X-TDE-InitialPreference=9
diff --git a/konqueror/kfmclient.desktop b/konqueror/kfmclient.desktop
index 7407c5953..6ef381e09 100644
--- a/konqueror/kfmclient.desktop
+++ b/konqueror/kfmclient.desktop
@@ -4,7 +4,7 @@ Type=Application
 Exec=kfmclient openURL %u
 Icon=konqueror
 Terminal=false
-InitialPreference=9
+X-TDE-InitialPreference=9
 NoDisplay=true
 Name=Konqueror
 Name[bn]=কনকরার
diff --git a/konqueror/kfmclient_dir.desktop b/konqueror/kfmclient_dir.desktop
index 6ccb07e90..4d7c06645 100644
--- a/konqueror/kfmclient_dir.desktop
+++ b/konqueror/kfmclient_dir.desktop
@@ -4,7 +4,7 @@ Exec=kfmclient openURL %u inode/directory
 Icon=konqueror
 Terminal=false
 MimeType=inode/directory;
-InitialPreference=9
+X-TDE-InitialPreference=9
 NoDisplay=true
 Name=Konqueror
 Name[bn]=কনকরার
diff --git a/konqueror/kfmclient_html.desktop b/konqueror/kfmclient_html.desktop
index e2e4177c6..70594802c 100644
--- a/konqueror/kfmclient_html.desktop
+++ b/konqueror/kfmclient_html.desktop
@@ -4,7 +4,7 @@ Exec=kfmclient openURL %u text/html
 Icon=konqueror
 Terminal=false
 MimeType=text/html;application/xhtml+xml;text/xml;
-InitialPreference=9
+X-TDE-InitialPreference=9
 NoDisplay=true
 Name=Konqueror
 Name[bn]=কনকরার
diff --git a/konqueror/kfmclient_war.desktop b/konqueror/kfmclient_war.desktop
index bece31386..665ba2ade 100644
--- a/konqueror/kfmclient_war.desktop
+++ b/konqueror/kfmclient_war.desktop
@@ -4,7 +4,7 @@ Exec=kfmclient openURL %u application/x-webarchive
 Icon=konqueror
 Terminal=false
 MimeType=application/x-webarchive;
-InitialPreference=9
+X-TDE-InitialPreference=9
 NoDisplay=true
 Name=Konqueror
 Name[bn]=কনকরার
diff --git a/konqueror/konqbrowser.desktop b/konqueror/konqbrowser.desktop
index 8545abec8..034039a26 100644
--- a/konqueror/konqbrowser.desktop
+++ b/konqueror/konqbrowser.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=kfmclient openProfile webbrowsing
 Icon=konqueror
-DocPath=konqueror/index.html
+X-DocPath=konqueror/index.html
 
 Name=Konqueror
 Name[bn]=কনকরার
diff --git a/konqueror/konqfilemgr.desktop b/konqueror/konqfilemgr.desktop
index 3b10dc9e0..90759b0d1 100644
--- a/konqueror/konqfilemgr.desktop
+++ b/konqueror/konqfilemgr.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=kfmclient openProfile filemanagement
 Icon=kfm
-DocPath=konqueror/index.html
+X-DocPath=konqueror/index.html
 
 Name=File Manager
 Name[af]=Lêer Bestuurder
diff --git a/konqueror/konquerorsu.desktop b/konqueror/konquerorsu.desktop
index 58bb4ff8e..fdf7b8e03 100644
--- a/konqueror/konquerorsu.desktop
+++ b/konqueror/konquerorsu.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Exec=konqueror --profile filemanagement
-DocPath=konqueror/index.html
+X-DocPath=konqueror/index.html
 Icon=kfm
 X-TDE-SubstituteUID=true
 
diff --git a/konqueror/listview/konq_detailedlistview.desktop b/konqueror/listview/konq_detailedlistview.desktop
index 626c67d57..2e16d061f 100644
--- a/konqueror/listview/konq_detailedlistview.desktop
+++ b/konqueror/listview/konq_detailedlistview.desktop
@@ -80,9 +80,9 @@ Name[zh_CN]=细节列表视图
 Name[zh_TW]=詳細的清單檢視
 Name[zu]=Umbukiso Woluhlu Oluneminingwane
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=konq_listview
 X-TDE-BrowserView-Args=DetailedList
 X-TDE-BrowserView-HideFromMenus=true
 Icon=view_detailed
-InitialPreference=7
+X-TDE-InitialPreference=7
diff --git a/konqueror/listview/konq_infolistview.desktop b/konqueror/listview/konq_infolistview.desktop
index e4477e548..b076af7db 100644
--- a/konqueror/listview/konq_infolistview.desktop
+++ b/konqueror/listview/konq_infolistview.desktop
@@ -78,9 +78,9 @@ Name[zh_CN]=信息列表视图
 Name[zh_TW]=資訊清單檢視
 Name[zu]=Umbukiso wohlu lolwazi
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=konq_listview
 X-TDE-BrowserView-Args=InfoListView
 X-TDE-BrowserView-HideFromMenus=true
 Icon=view_detailed
-InitialPreference=7
+X-TDE-InitialPreference=7
diff --git a/konqueror/listview/konq_textview.desktop b/konqueror/listview/konq_textview.desktop
index b522bec7e..3f44f0543 100644
--- a/konqueror/listview/konq_textview.desktop
+++ b/konqueror/listview/konq_textview.desktop
@@ -81,9 +81,9 @@ Name[zh_CN]=文本视图
 Name[zh_TW]=文字檢視
 Name[zu]=Umbukiso wombhalo
 MimeType=inode/directory
-ServiceTypes=Browser/View
+X-TDE-ServiceTypes=Browser/View
 X-TDE-Library=konq_listview
 X-TDE-BrowserView-Args=TextView
 X-TDE-BrowserView-HideFromMenus=true
 Icon=view_text
-InitialPreference=6
+X-TDE-InitialPreference=6
diff --git a/konqueror/listview/konq_treeview.desktop b/konqueror/listview/konq_treeview.desktop
index 7f4d3eb68..3169cba48 100644
--- a/konqueror/listview/konq_treeview.desktop
+++ b/konqueror/listview/konq_treeview.desktop
@@ -80,10 +80,10 @@ Name[zh_CN]=树视图
 Name[zh_TW]=樹狀瀏覽
 Name[zu]=Umbukiso Wesihlahla
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=konq_listview
 X-TDE-BrowserView-Args=MixedTree
 X-TDE-BrowserView-HideFromMenus=true
 X-TDE-BrowserView-HierarchicalView=true
 Icon=view_tree
-InitialPreference=8
+X-TDE-InitialPreference=8
diff --git a/konqueror/preloader/konqy_preloader.desktop b/konqueror/preloader/konqy_preloader.desktop
index 1aad1ed7a..e23ebc7f4 100644
--- a/konqueror/preloader/konqy_preloader.desktop
+++ b/konqueror/preloader/konqy_preloader.desktop
@@ -138,7 +138,7 @@ Comment[vi]=Giảm thời gian khởi động Konqueror
 Comment[wa]=Fwait enonder pus raddimint Konqueror
 Comment[zh_CN]=减少 Konqueror 启动时间
 Comment[zh_TW]=減少 Konqueror 啟動時間
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=konqy_preloader
 X-TDE-FactoryName=konqy_preloader
diff --git a/konqueror/quickprint/text-ada-print.desktop b/konqueror/quickprint/text-ada-print.desktop
index 74f9acb7a..6801f3499 100644
--- a/konqueror/quickprint/text-ada-print.desktop
+++ b/konqueror/quickprint/text-ada-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-adasrc
+X-TDE-ServiceTypes=text/x-adasrc
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-c++-print.desktop b/konqueror/quickprint/text-c++-print.desktop
index 311d214b3..4c4f04a01 100644
--- a/konqueror/quickprint/text-c++-print.desktop
+++ b/konqueror/quickprint/text-c++-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-c++src
+X-TDE-ServiceTypes=text/x-c++src
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-c++h-print.desktop b/konqueror/quickprint/text-c++h-print.desktop
index 4ae52ca22..f9533cd14 100644
--- a/konqueror/quickprint/text-c++h-print.desktop
+++ b/konqueror/quickprint/text-c++h-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-c++hdr
+X-TDE-ServiceTypes=text/x-c++hdr
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-c-print.desktop b/konqueror/quickprint/text-c-print.desktop
index 0dfb482fb..06371cbae 100644
--- a/konqueror/quickprint/text-c-print.desktop
+++ b/konqueror/quickprint/text-c-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-csrc
+X-TDE-ServiceTypes=text/x-csrc
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-ch-print.desktop b/konqueror/quickprint/text-ch-print.desktop
index 373cc2df8..fa945f606 100644
--- a/konqueror/quickprint/text-ch-print.desktop
+++ b/konqueror/quickprint/text-ch-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-chdr
+X-TDE-ServiceTypes=text/x-chdr
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-css-print.desktop b/konqueror/quickprint/text-css-print.desktop
index 9e05d8886..d91780694 100644
--- a/konqueror/quickprint/text-css-print.desktop
+++ b/konqueror/quickprint/text-css-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/css
+X-TDE-ServiceTypes=text/css
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-diff-print.desktop b/konqueror/quickprint/text-diff-print.desktop
index 7f85c4585..a11ec5024 100644
--- a/konqueror/quickprint/text-diff-print.desktop
+++ b/konqueror/quickprint/text-diff-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-diff
+X-TDE-ServiceTypes=text/x-diff
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-html-print.desktop b/konqueror/quickprint/text-html-print.desktop
index 0be07c3bf..9f07c0c72 100644
--- a/konqueror/quickprint/text-html-print.desktop
+++ b/konqueror/quickprint/text-html-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/html
+X-TDE-ServiceTypes=text/html
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-java-print.desktop b/konqueror/quickprint/text-java-print.desktop
index a6563212b..a27a79781 100644
--- a/konqueror/quickprint/text-java-print.desktop
+++ b/konqueror/quickprint/text-java-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-java
+X-TDE-ServiceTypes=text/x-java
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-log-print.desktop b/konqueror/quickprint/text-log-print.desktop
index b524d6488..6a2e1fb1a 100644
--- a/konqueror/quickprint/text-log-print.desktop
+++ b/konqueror/quickprint/text-log-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-log
+X-TDE-ServiceTypes=text/x-log
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-makefile-print.desktop b/konqueror/quickprint/text-makefile-print.desktop
index 886bb3b3a..b58f71928 100644
--- a/konqueror/quickprint/text-makefile-print.desktop
+++ b/konqueror/quickprint/text-makefile-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-makefile
+X-TDE-ServiceTypes=text/x-makefile
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-pas-print.desktop b/konqueror/quickprint/text-pas-print.desktop
index 075c5cb65..91fbeffa6 100644
--- a/konqueror/quickprint/text-pas-print.desktop
+++ b/konqueror/quickprint/text-pas-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-pascal
+X-TDE-ServiceTypes=text/x-pascal
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-perl-print.desktop b/konqueror/quickprint/text-perl-print.desktop
index cb0305c6c..4f5e238b6 100644
--- a/konqueror/quickprint/text-perl-print.desktop
+++ b/konqueror/quickprint/text-perl-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-perl
+X-TDE-ServiceTypes=text/x-perl
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-print.desktop b/konqueror/quickprint/text-print.desktop
index 8ec33665d..c90f794c4 100644
--- a/konqueror/quickprint/text-print.desktop
+++ b/konqueror/quickprint/text-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/plain
+X-TDE-ServiceTypes=text/plain
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-python-print.desktop b/konqueror/quickprint/text-python-print.desktop
index d439f3ed0..142168352 100644
--- a/konqueror/quickprint/text-python-print.desktop
+++ b/konqueror/quickprint/text-python-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-python
+X-TDE-ServiceTypes=text/x-python
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-tcl-print.desktop b/konqueror/quickprint/text-tcl-print.desktop
index 4914f1edb..4e3dde72e 100644
--- a/konqueror/quickprint/text-tcl-print.desktop
+++ b/konqueror/quickprint/text-tcl-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-tcl
+X-TDE-ServiceTypes=text/x-tcl
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-tex-print.desktop b/konqueror/quickprint/text-tex-print.desktop
index 3cc4f9493..be580d912 100644
--- a/konqueror/quickprint/text-tex-print.desktop
+++ b/konqueror/quickprint/text-tex-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-tex
+X-TDE-ServiceTypes=text/x-tex
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-xml-print.desktop b/konqueror/quickprint/text-xml-print.desktop
index b559d2fbe..568141e86 100644
--- a/konqueror/quickprint/text-xml-print.desktop
+++ b/konqueror/quickprint/text-xml-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-xml
+X-TDE-ServiceTypes=text/x-xml
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/quickprint/text-xslt-print.desktop b/konqueror/quickprint/text-xslt-print.desktop
index c0ac5cb82..c20debb2c 100644
--- a/konqueror/quickprint/text-xslt-print.desktop
+++ b/konqueror/quickprint/text-xslt-print.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/x-xslt
+X-TDE-ServiceTypes=text/x-xslt
 Actions=Print;
 
 [Desktop Action Print]
diff --git a/konqueror/sidebar/konq_sidebartng.desktop b/konqueror/sidebar/konq_sidebartng.desktop
index 1138395e3..e3536a391 100644
--- a/konqueror/sidebar/konq_sidebartng.desktop
+++ b/konqueror/sidebar/konq_sidebartng.desktop
@@ -80,7 +80,7 @@ Name[zh_CN]=导航面板
 Name[zh_TW]=導覽面板
 Name[zu]=Iwindi lemininingwane Lokuzula
 MimeType=inode/directory
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=konq_sidebar
 X-TDE-BrowserView-AllowAsDefault=false
 X-TDE-BrowserView-HideFromMenus=true
diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.desktop b/konqueror/sidebar/trees/history_module/kcmhistory.desktop
index 2672bd32c..6c278e177 100644
--- a/konqueror/sidebar/trees/history_module/kcmhistory.desktop
+++ b/konqueror/sidebar/trees/history_module/kcmhistory.desktop
@@ -2,7 +2,7 @@
 Icon=history
 Type=Application
 Exec=tdecmshell kcmhistory
-DocPath=kcontrol/kcmhistory/index.html
+X-DocPath=kcontrol/kcmhistory/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=history
 X-TDE-FactoryName=history
diff --git a/konsole/konsole-script.desktop b/konsole/konsole-script.desktop
index 3159016bd..eb1bc1d73 100644
--- a/konsole/konsole-script.desktop
+++ b/konsole/konsole-script.desktop
@@ -2,7 +2,7 @@
 Type=Service
 Exec=konsole --script
 Icon=konsole
-DocPath=konsole/index.html
+X-DocPath=konsole/index.html
 Terminal=false
 X-TDE-StartupNotify=true
 
diff --git a/konsole/konsole.desktop b/konsole/konsole.desktop
index e94000b36..408a4df11 100644
--- a/konsole/konsole.desktop
+++ b/konsole/konsole.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=konsole
 Icon=konsole
-DocPath=konsole/index.html
+X-DocPath=konsole/index.html
 Terminal=false
 X-TDE-StartupNotify=true
 
diff --git a/konsole/konsolehere.desktop b/konsole/konsolehere.desktop
index 1d357fb47..5bf32424a 100644
--- a/konsole/konsolehere.desktop
+++ b/konsole/konsolehere.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=inode/directory
+X-TDE-ServiceTypes=inode/directory
 Actions=openTerminalHere;
 X-TDE-AuthorizeAction=shell_access
 Type=Application
diff --git a/konsole/konsolepart.desktop b/konsole/konsolepart.desktop
index 2b4da88f2..a1ddc9a6c 100644
--- a/konsole/konsolepart.desktop
+++ b/konsole/konsolepart.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Icon=konsole
-ServiceTypes=KParts/ReadOnlyPart,Browser/View,inode/directory,TerminalEmulator
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View,inode/directory,TerminalEmulator
 
 X-TDE-Library=libkonsolepart
 X-TDE-BrowserView-AllowAsDefault=false
diff --git a/konsole/konsolesu.desktop b/konsole/konsolesu.desktop
index 7cd4e4e46..dc906b804 100644
--- a/konsole/konsolesu.desktop
+++ b/konsole/konsolesu.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=konsole --type su
 Icon=konsole
-DocPath=konsole/index.html
+X-DocPath=konsole/index.html
 MimeType=application/x-konsole;
 Terminal=false
 OnlyShowIn=TDE;
diff --git a/konsole/kwrited.desktop b/konsole/kwrited.desktop
index c01b3613d..cf8761d82 100644
--- a/konsole/kwrited.desktop
+++ b/konsole/kwrited.desktop
@@ -138,7 +138,7 @@ Comment[wa]=Riwaite après les messaedjes des locås uzeus evoyîs avou write (1
 Comment[zh_CN]=监视本地用户发出的 write(1) 或 wall(1)
 Comment[zh_TW]=監控本地使用者以 write(1) 或 wall(1) 傳送的郵件
 Type=Service
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-Library=kwrited
 X-TDE-FactoryName=kwrited
 X-TDE-Kded-autoload=true
diff --git a/kpager/kpager.desktop b/kpager/kpager.desktop
index 67cd979ea..5e3ffb277 100644
--- a/kpager/kpager.desktop
+++ b/kpager/kpager.desktop
@@ -99,7 +99,7 @@ GenericName[zu]=I-Pager ye-Desktop
 Icon=kpager
 Type=Application
 Exec=kpager
-DocPath=kpager/index.html
+X-DocPath=kpager/index.html
 Terminal=false
 X-TDE-StartupNotify=false
 X-DCOP-ServiceType=Unique
diff --git a/ksplashml/kcmksplash/ksplashthememgr.desktop b/ksplashml/kcmksplash/ksplashthememgr.desktop
index e9503655b..de413b402 100644
--- a/ksplashml/kcmksplash/ksplashthememgr.desktop
+++ b/ksplashml/kcmksplash/ksplashthememgr.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=ksplash
 Exec=tdecmshell ksplashthememgr
-DocPath=ksplashml/index.html
+X-DocPath=ksplashml/index.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=ksplashthemes
diff --git a/ksplashml/themeengine/default/ksplashdefault.desktop b/ksplashml/themeengine/default/ksplashdefault.desktop
index 2f4f3d236..079f29e92 100644
--- a/ksplashml/themeengine/default/ksplashdefault.desktop
+++ b/ksplashml/themeengine/default/ksplashdefault.desktop
@@ -90,7 +90,7 @@ Name[ta]=Kஸ்ப்ளாஷ் Legacy
 Name[tg]=МеросиKSplash
 Name[vi]=Chào mừng TDE Gia tài
 Name[wa]=KSplashTayons
-ServiceTypes=KSplash/Plugin
+X-TDE-ServiceTypes=KSplash/Plugin
 X-TDE-Library=ksplashdefault
 X-KSplash-Default=true
 X-KSplash-PluginName=Default
diff --git a/ksplashml/themeengine/redmond/ksplashredmond.desktop b/ksplashml/themeengine/redmond/ksplashredmond.desktop
index 1494342a5..12b2dbd7a 100644
--- a/ksplashml/themeengine/redmond/ksplashredmond.desktop
+++ b/ksplashml/themeengine/redmond/ksplashredmond.desktop
@@ -89,7 +89,7 @@ Name[tg]=РайдмондиKSplash
 Name[th]=KSplash แบบเรดมอนด์
 Name[vi]=Chào mừng TDE Redmond
 Name[zh_TW]=KSplachRedmond
-ServiceTypes=KSplash/Plugin
+X-TDE-ServiceTypes=KSplash/Plugin
 X-TDE-Library=ksplashredmond
 X-KSplash-Default=true
 X-KSplash-PluginName=Redmond
diff --git a/ksplashml/themeengine/standard/ksplashstandard.desktop b/ksplashml/themeengine/standard/ksplashstandard.desktop
index 91fffeb12..78b9c559b 100644
--- a/ksplashml/themeengine/standard/ksplashstandard.desktop
+++ b/ksplashml/themeengine/standard/ksplashstandard.desktop
@@ -90,7 +90,7 @@ Name[tg]=СтандартиKSplash
 Name[th]=KSplash แบบมาตรฐาน
 Name[vi]=Chào mừng TDE Tiêu chuẩn
 Name[wa]=KSplashStandård
-ServiceTypes=KSplash/Plugin
+X-TDE-ServiceTypes=KSplash/Plugin
 X-TDE-Library=ksplashstandard
 X-KSplash-Default=true
 X-KSplash-PluginName=Standard
diff --git a/ksplashml/themeengine/unified/ksplashunified.desktop b/ksplashml/themeengine/unified/ksplashunified.desktop
index 08d298f0a..6b263eef2 100644
--- a/ksplashml/themeengine/unified/ksplashunified.desktop
+++ b/ksplashml/themeengine/unified/ksplashunified.desktop
@@ -71,7 +71,7 @@ Comment[wa]=Tchôke-divins KSplash (waitroûle d' enondaedje)
 Comment[zh_CN]=KSplash 插件
 Comment[zh_TW]=KSplash 外掛程式
 Name=KSplashUnified
-ServiceTypes=KSplash/Plugin
+X-TDE-ServiceTypes=KSplash/Plugin
 X-TDE-Library=ksplashunified
 X-KSplash-Default=true
 X-KSplash-PluginName=Unified
diff --git a/ksysguard/gui/ksysguard.desktop b/ksysguard/gui/ksysguard.desktop
index a0b5ea113..cfffc7d9f 100644
--- a/ksysguard/gui/ksysguard.desktop
+++ b/ksysguard/gui/ksysguard.desktop
@@ -94,7 +94,7 @@ Exec=ksysguard %U
 Icon=ksysguard
 Type=Application
 MimeType=application/x-ksysguard;
-DocPath=ksysguard/index.html
+X-DocPath=ksysguard/index.html
 Terminal=false
 Path=
 X-TDE-StartupNotify=true
diff --git a/kxkb/keyboard.desktop b/kxkb/keyboard.desktop
index 47e84d724..3d321b80f 100644
--- a/kxkb/keyboard.desktop
+++ b/kxkb/keyboard.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell keyboard
 Icon=keyboard
 Type=Application
-DocPath=kcontrol/keyboard/index.html
+X-DocPath=kcontrol/keyboard/index.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=keyboard
diff --git a/kxkb/keyboard_layout.desktop b/kxkb/keyboard_layout.desktop
index ded3fe4c7..c71f08ac5 100644
--- a/kxkb/keyboard_layout.desktop
+++ b/kxkb/keyboard_layout.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell keyboard_layout
 Icon=keyboard
 Type=Application
-DocPath=kxkb/index.html
+X-DocPath=kxkb/index.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=keyboard
diff --git a/libkonq/favicons/favicons.desktop b/libkonq/favicons/favicons.desktop
index 37a2ce078..a266a74f3 100644
--- a/libkonq/favicons/favicons.desktop
+++ b/libkonq/favicons/favicons.desktop
@@ -140,7 +140,7 @@ Comment[vi]=Hỗ trợ biểu tượng giúp truy cập nhanh
 Comment[wa]=Sopoirt imådjetes rascourtis
 Comment[zh_CN]=快捷图标支持
 Comment[zh_TW]=捷徑圖示支援
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=favicons
 X-TDE-FactoryName=favicons
diff --git a/libkonq/servicemenus/edit-as-root.desktop b/libkonq/servicemenus/edit-as-root.desktop
index e3df17006..f927ac1cd 100644
--- a/libkonq/servicemenus/edit-as-root.desktop
+++ b/libkonq/servicemenus/edit-as-root.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=text/*,application/x-desktop
+X-TDE-ServiceTypes=text/*,application/x-desktop
 Actions=Editassu
 
 [Desktop Action Editassu]
diff --git a/nsplugins/tdehtml_plugins.desktop b/nsplugins/tdehtml_plugins.desktop
index dd2dde9bc..b2dc4420e 100644
--- a/nsplugins/tdehtml_plugins.desktop
+++ b/nsplugins/tdehtml_plugins.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/tdehtml/index.html#kbrowse-plugins
+X-DocPath=kcontrol/tdehtml/index.html#kbrowse-plugins
 Icon=konqueror
 Exec=tdecmshell tdehtml_plugins
 
diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.desktop b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
index e3f97c0f1..9b8ef0818 100644
--- a/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
+++ b/tdeioslave/cgi/kcmcgi/kcmcgi.desktop
@@ -2,7 +2,7 @@
 Icon=run
 Type=Application
 Exec=tdecmshell kcmcgi
-DocPath=kcontrol/kcmcgi/index.html
+X-DocPath=kcontrol/kcmcgi/index.html
 X-TDE-ModuleType=Library
 X-TDE-Library=cgi
 
diff --git a/tdeioslave/home/kdedmodule/homedirnotify.desktop b/tdeioslave/home/kdedmodule/homedirnotify.desktop
index aec11b69f..7be0303ee 100644
--- a/tdeioslave/home/kdedmodule/homedirnotify.desktop
+++ b/tdeioslave/home/kdedmodule/homedirnotify.desktop
@@ -53,7 +53,7 @@ Name[wa]=Notifieu di l' URL di båze del måjhon KDED
 Name[zh_CN]=KDED 主页基 URL 通知器
 Name[zh_TW]=KDED 家用基礎 URL 通知程式
 Comment=Provides change notification for user's home folder ($HOME)
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=homedirnotify
 X-TDE-FactoryName=homedirnotify
diff --git a/tdeioslave/man/kmanpart.desktop b/tdeioslave/man/kmanpart.desktop
index 220e19b84..8c70f3881 100644
--- a/tdeioslave/man/kmanpart.desktop
+++ b/tdeioslave/man/kmanpart.desktop
@@ -87,5 +87,5 @@ Name[pt_BR]=Componente KMan
 Name[ro]=Componentă  KMan
 Name[sv]=Kman-del
 Name[te]=కెమేన్ భాగం
-ServiceTypes=KParts/ReadOnlyPart,Browser/View
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,Browser/View
 X-TDE-Library=libkmanpart
diff --git a/tdeioslave/media/mediamanager/mediamanager.desktop b/tdeioslave/media/mediamanager/mediamanager.desktop
index 48261e428..e189bd9de 100644
--- a/tdeioslave/media/mediamanager/mediamanager.desktop
+++ b/tdeioslave/media/mediamanager/mediamanager.desktop
@@ -132,7 +132,7 @@ Comment[vi]=Theo dõi các hoạt động của ổ lưu trữ và cho phép l�
 Comment[wa]=Wåde li trace des activités media eyet permete di (dis)monter (media:/)
 Comment[zh_CN]=跟踪介质活动并允许挂载或卸载(media:/)
 Comment[zh_TW]=持續追蹤媒體活動並允許(解除)掛載 (media:/)
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=mediamanager
 X-TDE-FactoryName=mediamanager
diff --git a/tdeioslave/media/medianotifier/medianotifier.desktop b/tdeioslave/media/medianotifier/medianotifier.desktop
index 8cbf6063a..09f987749 100644
--- a/tdeioslave/media/medianotifier/medianotifier.desktop
+++ b/tdeioslave/media/medianotifier/medianotifier.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Service
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=medianotifier
 X-TDE-FactoryName=medianotifier
diff --git a/tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop b/tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop
index 2b24348c5..e3460510e 100644
--- a/tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop
+++ b/tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop
@@ -99,4 +99,4 @@ Comment[wa]=Tchôke-divins di dvize di prôpietés Konqueror po-z apontyî l' du
 Comment[zh_CN]=配置挂载行为的 Konqueror 属性对话框插件
 Comment[zh_TW]=Konqueror 內容對話框外掛程式，用於設定掛載的行為
 X-TDE-Library=media_propsdlgplugin
-ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/hdd_mounted_decrypted,media/hdd_unmounted_decrypted,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_mounted_decrypted,media/cdrom_unmounted_decrypted,media/cdwriter_mounted,media/cdwriter_mounted_decrypted,media/nfs_mounted,media/cdwriter_unmounted,media/cdwriter_unmounted_decrypted,media/nfs_unmounted,media/removable_mounted,media/removable_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/dvd_unmounted,media/dvd_unmounted_decrypted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted
+X-TDE-ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/hdd_mounted_decrypted,media/hdd_unmounted_decrypted,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_mounted_decrypted,media/cdrom_unmounted_decrypted,media/cdwriter_mounted,media/cdwriter_mounted_decrypted,media/nfs_mounted,media/cdwriter_unmounted,media/cdwriter_unmounted_decrypted,media/nfs_unmounted,media/removable_mounted,media/removable_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/dvd_unmounted,media/dvd_unmounted_decrypted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted
diff --git a/tdeioslave/media/services/media_decrypt.desktop b/tdeioslave/media/services/media_decrypt.desktop
index 4adef7d90..a3b331ac7 100644
--- a/tdeioslave/media/services/media_decrypt.desktop
+++ b/tdeioslave/media/services/media_decrypt.desktop
@@ -6,4 +6,4 @@ Name[de]=Entschlüsseln
 
 [Desktop Entry]
 Actions=Decrypt
-ServiceTypes=media/removable_unmounted_encrypted,media/hdd_unmounted_encrypted,media/cdrom_unmounted_encrypted,media/cdwriter_unmounted_encrypted,media/dvd_unmounted_encrypted
+X-TDE-ServiceTypes=media/removable_unmounted_encrypted,media/hdd_unmounted_encrypted,media/cdrom_unmounted_encrypted,media/cdwriter_unmounted_encrypted,media/dvd_unmounted_encrypted
diff --git a/tdeioslave/media/services/media_eject.desktop b/tdeioslave/media/services/media_eject.desktop
index 121f83340..067bd7656 100644
--- a/tdeioslave/media/services/media_eject.desktop
+++ b/tdeioslave/media/services/media_eject.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_mounted_decrypted,media/cdrom_unmounted_decrypted,media/cdrom_unmounted_encrypted,media/cdwriter_mounted,media/cdwriter_unmounted,media/cdwriter_mounted_decrypted,media/cdwriter_unmounted_decrypted,media/cdwriter_unmounted_encrypted,media/dvd_mounted,media/dvd_unmounted,media/dvd_mounted_decrypted,media/dvd_unmounted_decrypted,media/dvd_unmounted_encrypted,media/audiocd,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
+X-TDE-ServiceTypes=media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_mounted_decrypted,media/cdrom_unmounted_decrypted,media/cdrom_unmounted_encrypted,media/cdwriter_mounted,media/cdwriter_unmounted,media/cdwriter_mounted_decrypted,media/cdwriter_unmounted_decrypted,media/cdwriter_unmounted_encrypted,media/dvd_mounted,media/dvd_unmounted,media/dvd_mounted_decrypted,media/dvd_unmounted_decrypted,media/dvd_unmounted_encrypted,media/audiocd,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
 Actions=MediaEject;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
diff --git a/tdeioslave/media/services/media_mount.desktop b/tdeioslave/media/services/media_mount.desktop
index a8a943bb8..9b23f6526 100644
--- a/tdeioslave/media/services/media_mount.desktop
+++ b/tdeioslave/media/services/media_mount.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/cdrom_unmounted,media/cdrom_unmounted_decrypted,media/cdwriter_unmounted,media/cdwriter_unmounted_decrypted,media/dvd_unmounted,media/dvd_unmounted_decrypted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/hdd_unmounted_decrypted,media/nfs_unmounted,media/removable_unmounted,media/removable_unmounted_decrypted,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted
+X-TDE-ServiceTypes=media/cdrom_unmounted,media/cdrom_unmounted_decrypted,media/cdwriter_unmounted,media/cdwriter_unmounted_decrypted,media/dvd_unmounted,media/dvd_unmounted_decrypted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/hdd_unmounted_decrypted,media/nfs_unmounted,media/removable_unmounted,media/removable_unmounted_decrypted,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted
 Actions=MediaMount;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
diff --git a/tdeioslave/media/services/media_safelyremove.desktop b/tdeioslave/media/services/media_safelyremove.desktop
index 37f3d3b7b..d5a928df9 100644
--- a/tdeioslave/media/services/media_safelyremove.desktop
+++ b/tdeioslave/media/services/media_safelyremove.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/camera_mounted,media/camera_unmounted
+X-TDE-ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/camera_mounted,media/camera_unmounted
 Actions=MediaSafelyRemove;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
diff --git a/tdeioslave/media/services/media_unmount.desktop b/tdeioslave/media/services/media_unmount.desktop
index 47eae4624..dd8914b4e 100644
--- a/tdeioslave/media/services/media_unmount.desktop
+++ b/tdeioslave/media/services/media_unmount.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/cdrom_mounted,media/cdrom_mounted_decrypted,media/cdwriter_mounted,media/cdwriter_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/hdd_mounted_decrypted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/vcd,media/svcd,media/dvdvideo
+X-TDE-ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/cdrom_mounted,media/cdrom_mounted_decrypted,media/cdwriter_mounted,media/cdwriter_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/hdd_mounted_decrypted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/vcd,media/svcd,media/dvdvideo
 Actions=MediaUnmount;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
diff --git a/tdeioslave/media/tdecmodule/media.desktop b/tdeioslave/media/tdecmodule/media.desktop
index 204e7b91d..8fc5ef758 100644
--- a/tdeioslave/media/tdecmodule/media.desktop
+++ b/tdeioslave/media/tdecmodule/media.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Type=Application
-DocPath=kcontrol/media/index.html
+X-DocPath=kcontrol/media/index.html
 Icon=system
 Exec=tdecmshell media
 X-TDE-Library=media
diff --git a/tdeioslave/media/tdefile-plugin/tdefile_media.desktop b/tdeioslave/media/tdefile-plugin/tdefile_media.desktop
index 7d652e09a..af5088b84 100644
--- a/tdeioslave/media/tdefile-plugin/tdefile_media.desktop
+++ b/tdeioslave/media/tdefile-plugin/tdefile_media.desktop
@@ -70,6 +70,6 @@ Name[vi]=Thông tin về Ổ lưu trữ
 Name[wa]=Informåcions sol mediom
 Name[zh_CN]=介质信息
 Name[zh_TW]=媒體資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_media
 MimeType=media/audiocd;media/hdd_mounted;media/hdd_mounted_decrypted;media/blankcd;media/hdd_unmounted;media/hdd_unmounted_decrypted;media/blankdvd;media/cdrom_mounted;media/cdrom_mounted_decrypted;media/cdrom_unmounted;media/cdrom_unmounted_decrypted;media/cdwriter_mounted;media/cdwriter_mounted_decrypted;media/nfs_mounted;media/cdwriter_unmounted;media/cdwriter_unmounted_decrypted;media/nfs_unmounted;media/removable_mounted;media/removable_mounted_decrypted;media/dvd_mounted;media/dvd_mounted_decrypted;media/removable_unmounted;media/removable_unmounted_decrypted;media/dvd_unmounted;media/dvd_unmounted_decrypted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted
diff --git a/tdeioslave/remote/kdedmodule/remotedirnotify.desktop b/tdeioslave/remote/kdedmodule/remotedirnotify.desktop
index 24cc5e73f..cdcc216d9 100644
--- a/tdeioslave/remote/kdedmodule/remotedirnotify.desktop
+++ b/tdeioslave/remote/kdedmodule/remotedirnotify.desktop
@@ -109,7 +109,7 @@ Comment[uk]=Сповіщення про зміну стану мережевих
 Comment[x-test]=xxProvides change notification for network foldersxx
 Comment[zh_CN]=为网络文件夹提供更改通知
 Comment[zh_TW]=提供網路資料夾的變更通知
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=remotedirnotify
 X-TDE-FactoryName=remotedirnotify
diff --git a/tdeioslave/system/kdedmodule/systemdirnotify.desktop b/tdeioslave/system/kdedmodule/systemdirnotify.desktop
index e319717eb..3db54eb71 100644
--- a/tdeioslave/system/kdedmodule/systemdirnotify.desktop
+++ b/tdeioslave/system/kdedmodule/systemdirnotify.desktop
@@ -57,7 +57,7 @@ Name[wa]=Notifiaedje KDED d' URL sistinme di båze
 Name[zh_CN]=KDED 系统基 URL 通知器
 Name[zh_TW]=KDED 系統基礎 URL 通知程式
 Comment=Provides change notification for folders monitored by the system:/ tdeio plugin
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=systemdirnotify
 X-TDE-FactoryName=systemdirnotify
diff --git a/tdeioslave/thumbnail/cursorthumbnail.desktop b/tdeioslave/thumbnail/cursorthumbnail.desktop
index 8aead0601..36aa6eb2a 100644
--- a/tdeioslave/thumbnail/cursorthumbnail.desktop
+++ b/tdeioslave/thumbnail/cursorthumbnail.desktop
@@ -74,7 +74,7 @@ Name[vi]=Tập tin Con trỏ
 Name[wa]=Fitchîs cursoe
 Name[zh_CN]=光标文件
 Name[zh_TW]=游標檔案
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=image/x-xcursor
 X-TDE-Library=cursorthumbnail
 CacheThumbnail=false
diff --git a/tdeioslave/thumbnail/djvuthumbnail.desktop b/tdeioslave/thumbnail/djvuthumbnail.desktop
index 8608da662..b620c2586 100644
--- a/tdeioslave/thumbnail/djvuthumbnail.desktop
+++ b/tdeioslave/thumbnail/djvuthumbnail.desktop
@@ -74,7 +74,7 @@ Name[vi]=Tập tin DjVu
 Name[wa]=Fitchîs DjVu
 Name[zh_CN]=DjVu 文件
 Name[zh_TW]=DjVu 檔案
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=image/x-djvu,image/x.djvu,image/vnd.djvu
 X-TDE-Library=djvuthumbnail
 CacheThumbnail=true
diff --git a/tdeioslave/thumbnail/exrthumbnail.desktop b/tdeioslave/thumbnail/exrthumbnail.desktop
index a1ec416a1..2314961d0 100644
--- a/tdeioslave/thumbnail/exrthumbnail.desktop
+++ b/tdeioslave/thumbnail/exrthumbnail.desktop
@@ -72,7 +72,7 @@ Name[vi]=Ảnh EXR
 Name[wa]=Imådjes EXR
 Name[zh_CN]=EXR Emacs
 Name[zh_TW]=EXR 影像
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=image/x-exr
 X-TDE-Library=exrthumbnail
 CacheThumbnail=true
diff --git a/tdeioslave/thumbnail/htmlthumbnail.desktop b/tdeioslave/thumbnail/htmlthumbnail.desktop
index 084673f57..ae097396b 100644
--- a/tdeioslave/thumbnail/htmlthumbnail.desktop
+++ b/tdeioslave/thumbnail/htmlthumbnail.desktop
@@ -80,7 +80,7 @@ Name[xh]=Iifayile ze HTML
 Name[zh_CN]=HTML 文件
 Name[zh_TW]=HTML 檔案
 Name[zu]=Amafayela e-HTML
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=text/html
 X-TDE-Library=htmlthumbnail
 CacheThumbnail=true
diff --git a/tdeioslave/thumbnail/imagethumbnail.desktop b/tdeioslave/thumbnail/imagethumbnail.desktop
index ca76f4d59..3854146c1 100644
--- a/tdeioslave/thumbnail/imagethumbnail.desktop
+++ b/tdeioslave/thumbnail/imagethumbnail.desktop
@@ -79,7 +79,7 @@ Name[xh]=Imifanekiso
 Name[zh_CN]=图像
 Name[zh_TW]=影像
 Name[zu]=Izithombe
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=image/cgm,image/fax-g3,image/gif,image/jp2,image/jpeg,image/pjpeg,image/png,image/tiff,image/x-bmp,image/x-dds,image/x-ico,image/x-jng,image/x-pcx,image/x-photo-cd,image/x-portable-bitmap,image/x-portable-greymap,image/x-portable-pixmap,image/x-rgb,image/x-targa,image/x-wmf,image/x-xbm,image/x-xcf-gimp,image/x-xfig,image/x-xpm
 X-TDE-Library=imagethumbnail
 CacheThumbnail=true
diff --git a/tdeioslave/thumbnail/textthumbnail.desktop b/tdeioslave/thumbnail/textthumbnail.desktop
index 16fa73a8b..63bdf5fd1 100644
--- a/tdeioslave/thumbnail/textthumbnail.desktop
+++ b/tdeioslave/thumbnail/textthumbnail.desktop
@@ -81,7 +81,7 @@ Name[xh]=Iifayile Zombhalo
 Name[zh_CN]=文本文件
 Name[zh_TW]=文字檔案
 Name[zu]=Amafayela Ombhalo
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=text/plain
 X-TDE-Library=textthumbnail
 CacheThumbnail=false
diff --git a/tdeioslave/trash/tdefile-plugin/tdefile_trash.desktop b/tdeioslave/trash/tdefile-plugin/tdefile_trash.desktop
index 18416c2f0..c6f8f8900 100644
--- a/tdeioslave/trash/tdefile-plugin/tdefile_trash.desktop
+++ b/tdeioslave/trash/tdefile-plugin/tdefile_trash.desktop
@@ -72,7 +72,7 @@ Name[vi]=Thông tin về Tập tin trong Thùng rác
 Name[wa]=Informåcion sol fitchî batch
 Name[zh_CN]=回收站文件信息
 Name[zh_TW]=資源回收桶檔案資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_trash
 X-TDE-Protocol=trash
 PreferredGroups=General
diff --git a/tdeioslave/trash/tdefile-plugin/tdefile_trash_system.desktop b/tdeioslave/trash/tdefile-plugin/tdefile_trash_system.desktop
index 3413db36c..db9669a71 100644
--- a/tdeioslave/trash/tdefile-plugin/tdefile_trash_system.desktop
+++ b/tdeioslave/trash/tdefile-plugin/tdefile_trash_system.desktop
@@ -72,7 +72,7 @@ Name[vi]=Thông tin về Tập tin trong Thùng rác
 Name[wa]=Informåcion sol fitchî batch
 Name[zh_CN]=回收站文件信息
 Name[zh_TW]=資源回收桶檔案資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_trash
 X-TDE-Protocol=system
 PreferredGroups=General
diff --git a/tdepasswd/kcm/kcm_useraccount.desktop b/tdepasswd/kcm/kcm_useraccount.desktop
index 88b3f6ac7..9de027040 100644
--- a/tdepasswd/kcm/kcm_useraccount.desktop
+++ b/tdepasswd/kcm/kcm_useraccount.desktop
@@ -5,7 +5,7 @@ X-TDE-ParentApp=kcontrol
 X-TDE-Library=useraccount
 Type=Application
 Exec=tdecmshell kcm_useraccount
-DocPath=kcontrol/useraccount/index.html
+X-DocPath=kcontrol/useraccount/index.html
 
 Name=Password & User Account
 Name[af]=Gebruiker rekening en Wagwoord
diff --git a/tdeprint/kjobviewer/kjobviewer.desktop b/tdeprint/kjobviewer/kjobviewer.desktop
index 6ef5a215a..838087215 100644
--- a/tdeprint/kjobviewer/kjobviewer.desktop
+++ b/tdeprint/kjobviewer/kjobviewer.desktop
@@ -90,4 +90,4 @@ GenericName[zh_TW]=列印工作
 
 X-DCOP-ServiceType=Unique
 Categories=Qt;TDE;Utility;X-TDE-Utilities-Peripherals;
-DocPath=kjobviewer/index.html
+X-DocPath=kjobviewer/index.html
diff --git a/tdeprint/kprinter/kprinter.desktop b/tdeprint/kprinter/kprinter.desktop
index 538419293..1cf34074c 100644
--- a/tdeprint/kprinter/kprinter.desktop
+++ b/tdeprint/kprinter/kprinter.desktop
@@ -3,7 +3,7 @@ Exec=kprinter
 Icon=kjobviewer
 Terminal=false
 Type=Application
-DocPath=tdeprint/index.html
+X-DocPath=tdeprint/index.html
 X-TDE-StartupNotify=true
 Name=KPrinter
 Name[af]=KDrukker
diff --git a/tdeprint/printmgr/printers.desktop b/tdeprint/printmgr/printers.desktop
index 40fce09bd..f4a363d1a 100644
--- a/tdeprint/printmgr/printers.desktop
+++ b/tdeprint/printmgr/printers.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell printers
 Icon=printmgr
 Type=Application
-DocPath=tdeprint/index.html
+X-DocPath=tdeprint/index.html
 MimeType=print/manager;
 
 X-TDE-ModuleType=Library
diff --git a/tdeprint/tdeprint_part/tdeprint_part.desktop b/tdeprint/tdeprint_part/tdeprint_part.desktop
index 9920fc5c7..8d52f3af9 100644
--- a/tdeprint/tdeprint_part/tdeprint_part.desktop
+++ b/tdeprint/tdeprint_part/tdeprint_part.desktop
@@ -79,7 +79,7 @@ Name[zh_CN]=打印管理工具
 Name[zh_TW]=列印管理工具
 Name[zu]=Ithuluzi Lokuphathwa Koshicilelo
 MimeType=print/manager
-ServiceTypes=Browser/View,KParts/ReadOnlyPart
+X-TDE-ServiceTypes=Browser/View,KParts/ReadOnlyPart
 X-TDE-Library=libtdeprint_part
 Icon=printmgr
-InitialPreference=12
+X-TDE-InitialPreference=12
diff --git a/tqt3integration/module/kdeintegration.desktop b/tqt3integration/module/kdeintegration.desktop
index d8d10c851..406c1fd39 100644
--- a/tqt3integration/module/kdeintegration.desktop
+++ b/tqt3integration/module/kdeintegration.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Service
 
-ServiceTypes=KDEDModule
+X-TDE-ServiceTypes=KDEDModule
 X-TDE-ModuleType=Library
 X-TDE-Library=kdeintegration
 X-TDE-Factory=kdeintegration
diff --git a/twin/kcmtwin/twindecoration/twindecoration.desktop b/twin/kcmtwin/twindecoration/twindecoration.desktop
index 2fd03b2b2..9e2e90999 100644
--- a/twin/kcmtwin/twindecoration/twindecoration.desktop
+++ b/twin/kcmtwin/twindecoration/twindecoration.desktop
@@ -2,7 +2,7 @@
 Exec=tdecmshell twindecoration
 Icon=kcmkwm
 Type=Application
-DocPath=kcontrol/twindecoration/index.html
+X-DocPath=kcontrol/twindecoration/index.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=twindecoration
diff --git a/twin/kcmtwin/twinoptions/twinactions.desktop b/twin/kcmtwin/twinoptions/twinactions.desktop
index 931b92936..3e2422a0c 100644
--- a/twin/kcmtwin/twinoptions/twinactions.desktop
+++ b/twin/kcmtwin/twinoptions/twinactions.desktop
@@ -2,7 +2,7 @@
 Icon=kcmkwm
 Type=Application
 Exec=tdecmshell twinactions
-DocPath=kcontrol/windowbehavior/index.html#action-actions
+X-DocPath=kcontrol/windowbehavior/index.html#action-actions
 
 X-TDE-ModuleType=Library
 X-TDE-Library=twinoptions
diff --git a/twin/kcmtwin/twinoptions/twinadvanced.desktop b/twin/kcmtwin/twinoptions/twinadvanced.desktop
index 73574e950..97f37789e 100644
--- a/twin/kcmtwin/twinoptions/twinadvanced.desktop
+++ b/twin/kcmtwin/twinoptions/twinadvanced.desktop
@@ -2,7 +2,7 @@
 Icon=kcmkwm
 Type=Application
 Exec=tdecmshell twinadvanced
-DocPath=kcontrol/windowbehavior/index.html#action-advanced
+X-DocPath=kcontrol/windowbehavior/index.html#action-advanced
 
 X-TDE-ModuleType=Library
 X-TDE-Library=twinoptions
diff --git a/twin/kcmtwin/twinoptions/twinfocus.desktop b/twin/kcmtwin/twinoptions/twinfocus.desktop
index 5dd756c47..f22b8459d 100644
--- a/twin/kcmtwin/twinoptions/twinfocus.desktop
+++ b/twin/kcmtwin/twinoptions/twinfocus.desktop
@@ -2,7 +2,7 @@
 Icon=kcmkwm
 Type=Application
 Exec=tdecmshell twinfocus
-DocPath=kcontrol/windowbehavior/index.html#action-focus
+X-DocPath=kcontrol/windowbehavior/index.html#action-focus
 
 X-TDE-ModuleType=Library
 X-TDE-Library=twinoptions
diff --git a/twin/kcmtwin/twinoptions/twinmoving.desktop b/twin/kcmtwin/twinoptions/twinmoving.desktop
index a4608b5bd..b1dfb6e72 100644
--- a/twin/kcmtwin/twinoptions/twinmoving.desktop
+++ b/twin/kcmtwin/twinoptions/twinmoving.desktop
@@ -2,7 +2,7 @@
 Icon=kcmkwm
 Type=Application
 Exec=tdecmshell twinmoving
-DocPath=kcontrol/windowbehavior/index.html#action-moving
+X-DocPath=kcontrol/windowbehavior/index.html#action-moving
 
 X-TDE-ModuleType=Library
 X-TDE-Library=twinoptions
diff --git a/twin/kcmtwin/twinoptions/twinoptions.desktop b/twin/kcmtwin/twinoptions/twinoptions.desktop
index 65cef1c9d..640b0ebc6 100644
--- a/twin/kcmtwin/twinoptions/twinoptions.desktop
+++ b/twin/kcmtwin/twinoptions/twinoptions.desktop
@@ -2,7 +2,7 @@
 Icon=kcmkwm
 Type=Application
 Exec=tdecmshell twinoptions
-DocPath=kcontrol/windowbehavior/index.html
+X-DocPath=kcontrol/windowbehavior/index.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=twinoptions
diff --git a/twin/kcmtwin/twinoptions/twintranslucency.desktop b/twin/kcmtwin/twinoptions/twintranslucency.desktop
index b1901e712..d06bd09e0 100644
--- a/twin/kcmtwin/twinoptions/twintranslucency.desktop
+++ b/twin/kcmtwin/twinoptions/twintranslucency.desktop
@@ -2,7 +2,7 @@
 Icon=kcmkwm
 Type=Application
 Exec=tdecmshell twintranslucency
-DocPath=kompmgr/index.html
+X-DocPath=kompmgr/index.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=twinoptions
diff --git a/twin/kcmtwin/twinrules/twinrules.desktop b/twin/kcmtwin/twinrules/twinrules.desktop
index dddbe7b80..d68103357 100644
--- a/twin/kcmtwin/twinrules/twinrules.desktop
+++ b/twin/kcmtwin/twinrules/twinrules.desktop
@@ -2,7 +2,7 @@
 Icon=kcmkwm
 Type=Application
 Exec=tdecmshell twinrules
-DocPath=kcontrol/windowmanagement/index.html
+X-DocPath=kcontrol/windowmanagement/index.html
 
 X-TDE-ModuleType=Library
 X-TDE-Library=twinrules