diff --git a/kaffeine/servicemenus/kaffeine_append_file.desktop b/kaffeine/servicemenus/kaffeine_append_file.desktop
index 72b7103..902ddf3 100644
--- a/kaffeine/servicemenus/kaffeine_append_file.desktop
+++ b/kaffeine/servicemenus/kaffeine_append_file.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=application/x-ogg,audio/basic,audio/vnd.rn-realaudio,audio/x-aiff,audio/x-mp3,audio/x-mpeg,audio/x-mpegurl,audio/x-ms-wma,audio/x-ogg,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,audio/x-scpls,audio/x-wav,audio/x-flac,video/x-matroska,audio/x-matroska,video/mpeg,video/msvideo,video/quicktime,video/vnd.rn-realvideo,video/x-avi,video/x-fli,video/x-flic,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-mplayer2,application/smil,application/x-kaffeine,audio/x-musepack
+X-TDE-ServiceTypes=application/x-ogg,audio/basic,audio/vnd.rn-realaudio,audio/x-aiff,audio/x-mp3,audio/x-mpeg,audio/x-mpegurl,audio/x-ms-wma,audio/x-ogg,audio/x-pn-realaudio,audio/x-pn-realaudio-plugin,audio/x-scpls,audio/x-wav,audio/x-flac,video/x-matroska,audio/x-matroska,video/mpeg,video/msvideo,video/quicktime,video/vnd.rn-realvideo,video/x-avi,video/x-fli,video/x-flic,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-mplayer2,application/smil,application/x-kaffeine,audio/x-musepack
 Actions=kaffeine_append_file;
 Encoding=UTF-8
 
diff --git a/kaffeine/servicemenus/kaffeine_open_directory.desktop b/kaffeine/servicemenus/kaffeine_open_directory.desktop
index ab09b0a..64231fe 100644
--- a/kaffeine/servicemenus/kaffeine_open_directory.desktop
+++ b/kaffeine/servicemenus/kaffeine_open_directory.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=inode/directory
+X-TDE-ServiceTypes=inode/directory
 Actions=kaffeine_open_dir;
 Encoding=UTF-8
 
diff --git a/kaffeine/servicemenus/kaffeine_play_audiocd.desktop b/kaffeine/servicemenus/kaffeine_play_audiocd.desktop
index 693331b..6a22a77 100644
--- a/kaffeine/servicemenus/kaffeine_play_audiocd.desktop
+++ b/kaffeine/servicemenus/kaffeine_play_audiocd.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/audiocd
+X-TDE-ServiceTypes=media/audiocd
 Actions=Play;
 Encoding=UTF-8
 X-TDE-Priority=TopLevel
diff --git a/kaffeine/servicemenus/kaffeine_play_dvd.desktop b/kaffeine/servicemenus/kaffeine_play_dvd.desktop
index 8b5c25b..090d499 100644
--- a/kaffeine/servicemenus/kaffeine_play_dvd.desktop
+++ b/kaffeine/servicemenus/kaffeine_play_dvd.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/dvdvideo
+X-TDE-ServiceTypes=media/dvdvideo
 Actions=Play;
 Encoding=UTF-8
 X-TDE-Priority=TopLevel
diff --git a/kaffeine/servicemenus/kaffeine_play_vcd.desktop b/kaffeine/servicemenus/kaffeine_play_vcd.desktop
index df416a6..32b5370 100644
--- a/kaffeine/servicemenus/kaffeine_play_vcd.desktop
+++ b/kaffeine/servicemenus/kaffeine_play_vcd.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-ServiceTypes=media/svcd,media/vcd
+X-TDE-ServiceTypes=media/svcd,media/vcd
 Actions=Play;
 Encoding=UTF-8
 X-TDE-Priority=TopLevel
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/kaffeinemp3lame.desktop b/kaffeine/src/input/disc/plugins/mp3lame/kaffeinemp3lame.desktop
index aa9158f..5460493 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/kaffeinemp3lame.desktop
+++ b/kaffeine/src/input/disc/plugins/mp3lame/kaffeinemp3lame.desktop
@@ -7,6 +7,6 @@ Name[ka]=Lame-ის mp3
 Name[nb]=LAME MP3
 Name[pt]=MP3 do LAME
 Name[xx]=xxLame mp3xx
-ServiceTypes=KaffeineAudioEncoder
+X-TDE-ServiceTypes=KaffeineAudioEncoder
 Type=Service
 X-TDE-Library=libkaffeinemp3lame
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/kaffeineoggvorbis.desktop b/kaffeine/src/input/disc/plugins/oggvorbis/kaffeineoggvorbis.desktop
index 2bb779e..22c5093 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/kaffeineoggvorbis.desktop
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/kaffeineoggvorbis.desktop
@@ -4,6 +4,6 @@ Name=Ogg Vorbis
 Name[nb]=OGG Vorbis
 Name[pa]=Ogg ਵੋਰਬਿਸ
 Name[xx]=xxOgg Vorbisxx
-ServiceTypes=KaffeineAudioEncoder
+X-TDE-ServiceTypes=KaffeineAudioEncoder
 Type=Service
 X-TDE-Library=libkaffeineoggvorbis
diff --git a/kaffeine/src/kaffeine.desktop b/kaffeine/src/kaffeine.desktop
index f99125f..9bca0ba 100644
--- a/kaffeine/src/kaffeine.desktop
+++ b/kaffeine/src/kaffeine.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;TDE;AudioVideo;Player;
-DocPath=kaffeine/index.html
+X-DocPath=kaffeine/index.html
 Exec=kaffeine %U
 GenericName=Media Player
 GenericName[af]=Media Speler
diff --git a/kaffeine/src/player-parts/dummy-part/dummy_part.desktop b/kaffeine/src/player-parts/dummy-part/dummy_part.desktop
index c9e692f..9b0cc8f 100644
--- a/kaffeine/src/player-parts/dummy-part/dummy_part.desktop
+++ b/kaffeine/src/player-parts/dummy-part/dummy_part.desktop
@@ -18,6 +18,6 @@ Name[uk]=Порожній компонент
 Name[xx]=xxDummyPartxx
 Name[zh_CN]=伪部件
 MimeType=audio/x-mp3
-ServiceTypes=KaffeinePart
+X-TDE-ServiceTypes=KaffeinePart
 Type=Service
 X-TDE-Library=libdummypart
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.desktop b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.desktop
index bf62787..2ac6a1b 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.desktop
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.desktop
@@ -42,7 +42,7 @@ Comment[tr]=GStreamer tabanlı bir Kaffeine motoru.
 Comment[uk]=Рушій Kaffeine, оснований на GStreamer.
 Comment[xx]=xxA Kaffeine engine based on GStreamer.xx
 MimeType=application/x-ogg;audio/basic;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-scpls;audio/x-wav;audio/x-flac;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine;audio/x-musepack;
-ServiceTypes=KParts/ReadOnlyPart,KaffeinePart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KaffeinePart
 Type=Service
 X-TDE-Library=libgstreamerpart
-InitialPreference=1
+X-TDE-InitialPreference=1
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.desktop b/kaffeine/src/player-parts/xine-part/xine_part.desktop
index d53b928..6b89461 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.desktop
+++ b/kaffeine/src/player-parts/xine-part/xine_part.desktop
@@ -40,7 +40,7 @@ Comment[th]=โปรแกรมประมวลผลของ Kaffeine โ
 Comment[tr]=xine tabanlı bir Kaffeine motoru.
 Comment[uk]=Рушій Kaffeine, оснований на xine.
 Comment[xx]=xxA Kaffeine engine based on xine.xx
-ServiceTypes=KParts/ReadOnlyPart,KaffeinePart
+X-TDE-ServiceTypes=KParts/ReadOnlyPart,KaffeinePart
 Type=Service
 X-TDE-Library=libxinepart
-InitialPreference=9
+X-TDE-InitialPreference=9