diff --git a/file-integration/basketthumbcreator.desktop b/file-integration/basketthumbcreator.desktop
index 0db2907..27a0f64 100644
--- a/file-integration/basketthumbcreator.desktop
+++ b/file-integration/basketthumbcreator.desktop
@@ -12,7 +12,7 @@ Name[nn]=Korgarkiv og korgmalar
 Name[pt]=Arquivos e modelos de cestos
 Name[ru]=Шаблоны и контейнеры Basket
 Name[tr]=Basket Arşivleri & Şablonları
-ServiceTypes=ThumbCreator
+X-TDE-ServiceTypes=ThumbCreator
 MimeTypes=application/x-basket-archive,application/x-basket-template
 CacheThumbnail=true
 X-TDE-Library=basketthumbcreator
diff --git a/kontact_plugin/basket.desktop b/kontact_plugin/basket.desktop
index 32ea15b..0d8661a 100644
--- a/kontact_plugin/basket.desktop
+++ b/kontact_plugin/basket.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Service
 Icon=basket
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_basket
 X-TDE-KontactPluginVersion=5
diff --git a/kontact_plugin/basket_v4.desktop b/kontact_plugin/basket_v4.desktop
index ebd898f..24a2676 100644
--- a/kontact_plugin/basket_v4.desktop
+++ b/kontact_plugin/basket_v4.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Service
 Icon=basket
-ServiceTypes=Kontact/Plugin,KPluginInfo
+X-TDE-ServiceTypes=Kontact/Plugin,KPluginInfo
 
 X-TDE-Library=libkontact_basket
 X-TDE-KontactPluginVersion=4
diff --git a/src/basket.desktop b/src/basket.desktop
index 51af156..68eb849 100644
--- a/src/basket.desktop
+++ b/src/basket.desktop
@@ -34,4 +34,4 @@ Comment[tr]=Not Tutma Aracı
 Categories=TDE;Application;Office;
 
 GenericName=Note Manager
-DocPath=basket/index.html
+X-DocPath=basket/index.html
diff --git a/src/basket_config_apps.desktop b/src/basket_config_apps.desktop
index 821883e..6fc657f 100644
--- a/src/basket_config_apps.desktop
+++ b/src/basket_config_apps.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Icon=run
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
diff --git a/src/basket_config_baskets.desktop b/src/basket_config_baskets.desktop
index 352b1fb..4dc96bb 100644
--- a/src/basket_config_baskets.desktop
+++ b/src/basket_config_baskets.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Icon=basket
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
diff --git a/src/basket_config_general.desktop b/src/basket_config_general.desktop
index 080d229..05c8b4d 100644
--- a/src/basket_config_general.desktop
+++ b/src/basket_config_general.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Icon=configure
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
diff --git a/src/basket_config_new_notes.desktop b/src/basket_config_new_notes.desktop
index 2175a21..c60173e 100644
--- a/src/basket_config_new_notes.desktop
+++ b/src/basket_config_new_notes.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Icon=filenew
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
diff --git a/src/basket_config_notes_appearance.desktop b/src/basket_config_notes_appearance.desktop
index 160b0de..a8dce3c 100644
--- a/src/basket_config_notes_appearance.desktop
+++ b/src/basket_config_notes_appearance.desktop
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Icon=colorize
 Type=Service
-ServiceTypes=TDECModule
+X-TDE-ServiceTypes=TDECModule
 
 X-TDE-ModuleType=Library
 X-TDE-Library=basket
diff --git a/src/basket_part.desktop b/src/basket_part.desktop
index ed6d3b3..3eb22f5 100644
--- a/src/basket_part.desktop
+++ b/src/basket_part.desktop
@@ -16,6 +16,6 @@ Name[ta]=basketபாகம்
 Name[tr]=basket Bileşeni
 Name[ru]=Модуль basket
 MimeType=application/x-basket;
-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart
 X-TDE-Library=libbasketpart
 Type=Service