diff --git a/blinken/src/blinken.desktop b/blinken/src/blinken.desktop
index eb0f32f6..6d0ccab8 100644
--- a/blinken/src/blinken.desktop
+++ b/blinken/src/blinken.desktop
@@ -5,7 +5,7 @@ Name[eo]=Blinkeno
 Name[ne]=झिमझिम
 Name[pa]=ਬਲਿਨਕਿਨ
 Name[tr]=Blinken
-DocPath=blinken/index.html
+X-DocPath=blinken/index.html
 GenericName=Simon Says Game
 GenericName[be]=Гульня "Сайман кажа"
 GenericName[bg]=Игра за паметта
diff --git a/kalzium/src/kalzium.desktop b/kalzium/src/kalzium.desktop
index e72bb004..cc7e6fb8 100644
--- a/kalzium/src/kalzium.desktop
+++ b/kalzium/src/kalzium.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=kalzium -caption "%c" %i %m
 Icon=kalzium
-DocPath=kalzium/index.html
+X-DocPath=kalzium/index.html
 Comment=TDE Periodic Table of Elements
 Comment[be]=Перыядычная табліца элементаў TDE
 Comment[bg]=Таблица на химическите елементи
diff --git a/kanagram/src/kanagram.desktop b/kanagram/src/kanagram.desktop
index 65a9ed17..08a21d76 100644
--- a/kanagram/src/kanagram.desktop
+++ b/kanagram/src/kanagram.desktop
@@ -8,7 +8,7 @@ Name[ne]=कानाग्राम
 Exec=kanagram
 Icon=kanagram
 Type=Application
-DocPath=kanagram/index.html
+X-DocPath=kanagram/index.html
 Comment=TDE Letter Order Game
 Comment[be]=Гульня з перамяшчэннем літар
 Comment[bg]=Игра за подредба на букви
diff --git a/kbruch/src/kbruch.desktop b/kbruch/src/kbruch.desktop
index 2bbf0ce1..f84bee1b 100644
--- a/kbruch/src/kbruch.desktop
+++ b/kbruch/src/kbruch.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=kbruch -caption "%c" %i %m
 Icon=kbruch
-DocPath=kbruch/index.html
+X-DocPath=kbruch/index.html
 GenericName=Exercise Fractions
 GenericName[af]=Oefen Breuke
 GenericName[ar]=تمرين على الكسور
diff --git a/keduca/keduca/keduca_part.desktop b/keduca/keduca/keduca_part.desktop
index 7ae05268..8df753cf 100644
--- a/keduca/keduca/keduca_part.desktop
+++ b/keduca/keduca/keduca_part.desktop
@@ -12,5 +12,5 @@ Name[sv]=Keduca
 Name[ta]=கேயுடியுகா
 Name[ven]=Pfunzo ya K
 MimeType=application/x-edu
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libkeducapart
diff --git a/keduca/resources/keduca.desktop b/keduca/resources/keduca.desktop
index 64d17a5a..5a948002 100644
--- a/keduca/resources/keduca.desktop
+++ b/keduca/resources/keduca.desktop
@@ -127,7 +127,7 @@ Name[pa]=ਕੇ-ਸਿੱਖਿਆ
 Name[sv]=Keduca
 Name[ta]=கேயுடியுகா
 Name[ven]=Pfunzo ya K
-DocPath=keduca/index.html
+X-DocPath=keduca/index.html
 Path=
 Terminal=false
 Type=Application
diff --git a/keduca/resources/keducabuilder.desktop b/keduca/resources/keducabuilder.desktop
index da56b4d0..a2ab0822 100644
--- a/keduca/resources/keducabuilder.desktop
+++ b/keduca/resources/keducabuilder.desktop
@@ -117,7 +117,7 @@ Name[xh]=KEduca-Umhleli
 Name[zh_CN]=KEduca 编辑器
 Name[zh_TW]=KEduca-編輯器
 Name[zu]=Umhleli we-KEduca
-DocPath=keduca/index.html
+X-DocPath=keduca/index.html
 Path=
 Terminal=false
 Type=Application
diff --git a/kgeography/src/kgeography.desktop b/kgeography/src/kgeography.desktop
index 6aa46575..568834d9 100644
--- a/kgeography/src/kgeography.desktop
+++ b/kgeography/src/kgeography.desktop
@@ -111,6 +111,6 @@ Comment[zh_TW]=學習地理的程式
 Exec=kgeography
 Icon=kgeography
 Type=Application
-DocPath=kgeography/index.html
+X-DocPath=kgeography/index.html
 Terminal=false
 Categories=Qt;TDE;Education;
diff --git a/khangman/khangman/khangman.desktop b/khangman/khangman/khangman.desktop
index 0a324954..0551e165 100644
--- a/khangman/khangman/khangman.desktop
+++ b/khangman/khangman/khangman.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=khangman -caption "%c" %i %m
 Icon=khangman
-DocPath=khangman/index.html
+X-DocPath=khangman/index.html
 GenericName=Hangman Game
 GenericName[af]=Hangman Speletjie
 GenericName[ar]=لعبة الشنق
diff --git a/kig/kig/kig.desktop b/kig/kig/kig.desktop
index e477f1b7..f5d5b650 100644
--- a/kig/kig/kig.desktop
+++ b/kig/kig/kig.desktop
@@ -116,6 +116,6 @@ Exec=kig %i %m -caption "%c"
 MimeType=application/x-kig;application/x-kgeo;
 Icon=kig
 Type=Application
-DocPath=kig/index.html
+X-DocPath=kig/index.html
 Terminal=false
 Categories=Qt;TDE;Education;Math;
diff --git a/kig/kig/kig_part.desktop b/kig/kig/kig_part.desktop
index c5217057..0382846c 100644
--- a/kig/kig/kig_part.desktop
+++ b/kig/kig/kig_part.desktop
@@ -10,7 +10,7 @@ Name[ta]=கிக்பகுதி
 Name[ven]=TshipidatshaKig
 Name[zh_CN]=Kig 组件
 MimeType=application/x-kig;application/x-kgeo;
-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-TDE-Library=libkigpart
 Type=Service
 Icon=kig
diff --git a/kig/tdefile/tdefile_drgeo.desktop b/kig/tdefile/tdefile_drgeo.desktop
index fc06ea50..9cad81fc 100644
--- a/kig/tdefile/tdefile_drgeo.desktop
+++ b/kig/tdefile/tdefile_drgeo.desktop
@@ -48,7 +48,7 @@ Name[uk]=Інформація для Dr. Geo
 Name[vi]=Tiến sĩ Thông tin Hình học
 Name[zh_CN]=Dr. Geo 信息
 Name[zh_TW]=Dr. Geo 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_drgeo
 MimeType=application/x-drgeo
 PreferredGroups=DrgeoInfo
diff --git a/kig/tdefile/tdefile_kig.desktop b/kig/tdefile/tdefile_kig.desktop
index ac5597f8..42441306 100644
--- a/kig/tdefile/tdefile_kig.desktop
+++ b/kig/tdefile/tdefile_kig.desktop
@@ -47,7 +47,7 @@ Name[uk]=Інформація для Kig
 Name[vi]=Thông tin Kig
 Name[zh_CN]=Kig 信息
 Name[zh_TW]=Kig 資訊
-ServiceTypes=KFilePlugin
+X-TDE-ServiceTypes=KFilePlugin
 X-TDE-Library=tdefile_kig
 MimeType=application/x-kig
 PreferredGroups=KigInfo
diff --git a/kiten/kiten.desktop b/kiten/kiten.desktop
index 0fa0457e..cb49c887 100644
--- a/kiten/kiten.desktop
+++ b/kiten/kiten.desktop
@@ -101,7 +101,7 @@ Comment[tr]=Japonca Referans ve Çalışma Aracı
 Comment[uk]=Програма вивчення японської мови
 Comment[zh_CN]=日语参考/学习工具
 Comment[zh_TW]=日語參考/學習工具
-DocPath=kiten/index.html
+X-DocPath=kiten/index.html
 Exec=kiten -caption "%c" %i %m
 Name=Kiten
 Name[af]=Katjie
diff --git a/klatin/klatin/klatin.desktop b/klatin/klatin/klatin.desktop
index 3f39410c..c78cdf17 100644
--- a/klatin/klatin/klatin.desktop
+++ b/klatin/klatin/klatin.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=klatin -caption "%c" %i %m
 Icon=klatin
-DocPath=klatin/index.html
+X-DocPath=klatin/index.html
 Comment=A program to help revise Latin
 Comment[af]='n Program om Latyn te help hersien
 Comment[be]=Праграма, якая дапамагае вывучыць латынь
diff --git a/klettres/klettres/klettres.desktop b/klettres/klettres/klettres.desktop
index bbeee8c6..38eccb84 100644
--- a/klettres/klettres/klettres.desktop
+++ b/klettres/klettres/klettres.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=klettres -caption "%c" %i %m
 Icon=klettres
-DocPath=klettres/index.html
+X-DocPath=klettres/index.html
 Comment= a TDE program to learn the alphabet
 Comment[be]=Праграма TDE для вывучэння алфавіту
 Comment[bg]=Учене на азбуката
diff --git a/kmplot/kmplot/kmplot.desktop b/kmplot/kmplot/kmplot.desktop
index 93858e90..8bebafb0 100644
--- a/kmplot/kmplot/kmplot.desktop
+++ b/kmplot/kmplot/kmplot.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=kmplot
 Icon=kmplot
-DocPath=kmplot/index.html
+X-DocPath=kmplot/index.html
 Comment=Function Plotter
 Comment[af]=Funksieplotter
 Comment[ar]=مخطط وظيفة
diff --git a/kmplot/kmplot/kmplot_part.desktop b/kmplot/kmplot/kmplot_part.desktop
index 423de9ff..f7f329ed 100644
--- a/kmplot/kmplot/kmplot_part.desktop
+++ b/kmplot/kmplot/kmplot_part.desktop
@@ -10,6 +10,6 @@ Name[sv]=Kmplot-delprogram
 Name[ta]=கேஎம்பிளாட்பகுதி
 Name[vi]=Phần Đồ thị K
 MimeType=application/x-kmplot
-ServiceTypes=KParts/ReadOnlyPart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart
 X-TDE-Library=libkmplotpart
 Type=Service
diff --git a/kpercentage/kpercentage/kpercentage.desktop b/kpercentage/kpercentage/kpercentage.desktop
index bbbdc28c..e485af31 100644
--- a/kpercentage/kpercentage/kpercentage.desktop
+++ b/kpercentage/kpercentage/kpercentage.desktop
@@ -77,6 +77,6 @@ Exec=kpercentage
 Terminal=false
 Icon=kpercentage
 Type=Application
-DocPath=kpercentage/index.html
+X-DocPath=kpercentage/index.html
 
 Categories=Qt;TDE;Education;Math;
diff --git a/kstars/kstars/kstars.desktop b/kstars/kstars/kstars.desktop
index 377d7f50..8d30cce4 100644
--- a/kstars/kstars/kstars.desktop
+++ b/kstars/kstars/kstars.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=kstars -caption "%c" %i %m
 Icon=kstars
-DocPath=kstars/index.html
+X-DocPath=kstars/index.html
 Comment=Desktop Planetarium
 Comment[af]=Werkskerm Planetarium
 Comment[ar]=قبة سماوية لسطح المكتب
diff --git a/ktouch/ktouch.desktop b/ktouch/ktouch.desktop
index 7aeeafa2..982454fe 100644
--- a/ktouch/ktouch.desktop
+++ b/ktouch/ktouch.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=ktouch -caption "%c" %i %m
 Icon=ktouch
-DocPath=ktouch/index.html
+X-DocPath=ktouch/index.html
 GenericName=Touch Typing Tutor
 GenericName[af]=Raak-tik Afrigter
 GenericName[ar]=معلم الطباعة
diff --git a/kturtle/src/kturtle.desktop b/kturtle/src/kturtle.desktop
index 1748db15..c30f2352 100644
--- a/kturtle/src/kturtle.desktop
+++ b/kturtle/src/kturtle.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-DocPath=kturtle/index.html
+X-DocPath=kturtle/index.html
 Name=KTurtle
 Name[af]=KSkilpad
 Name[bn]=কে-টার্টল
diff --git a/kverbos/kverbos/kverbos.desktop b/kverbos/kverbos/kverbos.desktop
index c5469501..c944d907 100644
--- a/kverbos/kverbos/kverbos.desktop
+++ b/kverbos/kverbos/kverbos.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=kverbos -caption "%c" %i %m
 Icon=kverbos
-DocPath=kverbos/index.html
+X-DocPath=kverbos/index.html
 Comment=
 Comment[bn]=মন্তব্য
 Comment[sl]=Periodna tabela elementov
diff --git a/kvoctrain/kvoctrain/kvoctrain.desktop b/kvoctrain/kvoctrain/kvoctrain.desktop
index bc52e20e..a5e662ff 100644
--- a/kvoctrain/kvoctrain/kvoctrain.desktop
+++ b/kvoctrain/kvoctrain/kvoctrain.desktop
@@ -74,7 +74,7 @@ Name[zu]=KVocIsitimela
 MimeType=application/x-kvoctrain;text/x-kvtml;
 Exec=kvoctrain
 Icon=kvoctrain
-DocPath=kvoctrain/index.html
+X-DocPath=kvoctrain/index.html
 Type=Application
 Terminal=false
 Categories=Qt;TDE;Education;Languages;
diff --git a/kwordquiz/src/kwordquiz.desktop b/kwordquiz/src/kwordquiz.desktop
index 9a52c5a5..26176177 100644
--- a/kwordquiz/src/kwordquiz.desktop
+++ b/kwordquiz/src/kwordquiz.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Exec=kwordquiz -caption "%c" %i %m
 Icon=kwordquiz
-DocPath=kwordquiz/index.html
+X-DocPath=kwordquiz/index.html
 Comment=A flashcard and vocabulary learning program
 Comment[af]='n Flitskaart- en woordeskat-aanleerprogram
 Comment[be]=Праграма паляпшэння слоўнікавага запасу (флэшкарткі)