diff --git a/kate/src/data/kate.desktop b/kate/src/data/kate.desktop
index b4334a53..fcd5abaf 100755
--- a/kate/src/data/kate.desktop
+++ b/kate/src/data/kate.desktop
@@ -126,6 +126,4 @@ X-DocPath=kate/index.html
 Type=Application
 Terminal=false
 InitialPreference=9
-X-DBUS-StartupType=Multi
-X-DBUS-ServiceName=org.kde.kate
 Categories=Qt;KDE;Utility;TextEditor;
diff --git a/kcontrol/access/kaccess.desktop b/kcontrol/access/kaccess.desktop
index 095a2a5c..7b019d8c 100644
--- a/kcontrol/access/kaccess.desktop
+++ b/kcontrol/access/kaccess.desktop
@@ -92,7 +92,7 @@ Name[zh_CN]=KDE 辅助工具
 Name[zh_TW]=KDE 無障礙工具
 Exec=kaccess
 Icon=preferences-desktop-accessibility
-X-DBUS-StartupType=None
+StartupNotify=false
 X-KDE-Library=kcm_access
 X-KDE-ParentApp=kcontrol
 X-DocPath=kcontrol/kcmaccess/index.html
diff --git a/kdepasswd/kdepasswd.desktop b/kdepasswd/kdepasswd.desktop
index 0eb69c0b..3a64372e 100755
--- a/kdepasswd/kdepasswd.desktop
+++ b/kdepasswd/kdepasswd.desktop
@@ -4,8 +4,7 @@ Icon=preferences-desktop-user-password
 Type=Application
 Categories=Qt;KDE;Settings;
 NoDisplay=true
-X-DBUS-ServiceName=org.kde.kdepasswd
-X-DBUS-StartupType=Unique
+StartupNotify=true
 Name=Change Password
 Name[af]=Verander Wagwoord
 Name[ar]=غيّر كلمة السر
diff --git a/kglobalaccel/kglobalaccel.desktop b/kglobalaccel/kglobalaccel.desktop
index 8121bc3c..f2ae4d31 100644
--- a/kglobalaccel/kglobalaccel.desktop
+++ b/kglobalaccel/kglobalaccel.desktop
@@ -3,8 +3,6 @@ Type=Service
 Icon=preferences-desktop-keyboard
 Exec=kglobalaccel
 X-KDE-autostart-phase=1
-X-DBUS-ServiceName=org.kde.kglobalaccel
-X-DBUS-StartupType=Unique
 X-KDE-ServiceTypes=
 StartupNotify=false
 
diff --git a/kinfocenter/kinfocenter.desktop b/kinfocenter/kinfocenter.desktop
index 094154a5..2e3d1ec1 100755
--- a/kinfocenter/kinfocenter.desktop
+++ b/kinfocenter/kinfocenter.desktop
@@ -188,6 +188,4 @@ GenericName[x-test]=xxInfo Centerxx
 GenericName[zh_CN]=信息中心
 GenericName[zh_TW]=資訊中心
 
-X-DBUS-ServiceName=org.kde.kinfocenter
-X-DBUS-StartupType=Multi
 Categories=Qt;KDE;System;
diff --git a/klipper/klipper.desktop b/klipper/klipper.desktop
index d3707888..46773004 100755
--- a/klipper/klipper.desktop
+++ b/klipper/klipper.desktop
@@ -182,10 +182,7 @@ Icon=klipper
 Type=Application
 X-DocPath=klipper/index.html
 Terminal=false
-StartupNotify=false
-X-DBUS-ServiceName=org.kde.klipper
-X-DBUS-StartupType=Unique
-X-KDE-UniqueApplet=true
+StartupNotify=true
 X-KDE-autostart-condition=klipperrc:General:AutoStart:true
 OnlyShowIn=KDE;
 Categories=Qt;KDE;Utility;X-KDE-Utilities-Desktop;
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index d2f7aaa0..90a6aec4 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -385,7 +385,7 @@ void BasicTab::setEntryInfo(MenuEntryInfo *entryInfo)
     _termOptEdit->setText(df->desktopGroup().readEntry("TerminalOptions"));
     _uidEdit->setText(df->desktopGroup().readEntry("X-KDE-Username"));
 
-    _launchCB->setChecked(df->desktopGroup().readEntry("StartupNotify", true));
+    _launchCB->setChecked(df->desktopGroup().readEntry("StartupNotify", false));
 
     _onlyShowInKdeCB->setChecked( df->desktopGroup().readXdgListEntry("OnlyShowIn").contains( "KDE" ) ); // or maybe enable only if it contains nothing but KDE?
 
diff --git a/kmenuedit/kmenuedit.desktop b/kmenuedit/kmenuedit.desktop
index 4d59bbb7..a003fd71 100755
--- a/kmenuedit/kmenuedit.desktop
+++ b/kmenuedit/kmenuedit.desktop
@@ -98,7 +98,5 @@ Name[x-test]=xxMenu Editorxx
 Name[zh_CN]=菜单编辑器
 Name[zh_TW]=選單編輯器
 
-X-DBUS-ServiceName=org.kde.kmenuedit
-X-DBUS-StartupType=Unique
 Categories=Qt;KDE;Settings;
 NoDisplay=true
diff --git a/knotify/knotify4.desktop b/knotify/knotify4.desktop
index f0c8e3a7..8eb1a0a7 100644
--- a/knotify/knotify4.desktop
+++ b/knotify/knotify4.desktop
@@ -174,7 +174,5 @@ Comment[x-test]=xxKDE Notification Daemonxx
 Comment[zh_CN]=KDE 通知守护程序
 Comment[zh_TW]=KDE Notification 伺服程式
 Icon=preferences-desktop-notification
-X-DBUS-ServiceName=org.kde.knotify
-X-DBUS-StartupType=Unique
 StartupNotify=false
 X-KDE-MediaPlayer=knotify
diff --git a/konsole/desktop/konsole.desktop b/konsole/desktop/konsole.desktop
index 1ae80d3b..c9faabc6 100755
--- a/konsole/desktop/konsole.desktop
+++ b/konsole/desktop/konsole.desktop
@@ -7,8 +7,6 @@ Terminal=false
 Categories=Qt;KDE;System;TerminalEmulator;
 Actions=NewWindow;
 X-DocPath=konsole/index.html
-X-DBUS-ServiceName=org.kde.konsole
-X-DBUS-StartupType=Multi
 StartupNotify=true
 
 Name=Konsole
diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop
index 2f13cbf3..d6e63cdf 100644
--- a/krunner/krunner.desktop
+++ b/krunner/krunner.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=krunner
-X-DBUS-StartupType=none
+StartupNotify=false
 Name=Command Runner
 Name[ar]=منفّذ الأوامر
 Name[ast]=Execución d'órdenes
diff --git a/ksysguard/gui/ksysguard.cpp b/ksysguard/gui/ksysguard.cpp
index 7a1bf117..3953177c 100644
--- a/ksysguard/gui/ksysguard.cpp
+++ b/ksysguard/gui/ksysguard.cpp
@@ -536,7 +536,7 @@ int main( int argc, char** argv )
   options.add("+[worksheet]", ki18n( "Optional worksheet files to load" ));
   KCmdLineArgs::addCmdLineOptions( options );
   // initialize KDE application
-  KApplication *app = new KApplication;
+  KApplication *app = new KApplication();
 
   KSGRD::SensorMgr = new KSGRD::SensorManager();
   KSGRD::Style = new KSGRD::StyleEngine();
diff --git a/ksysguard/gui/ksysguard.desktop b/ksysguard/gui/ksysguard.desktop
index ba55f37a..98e5efd8 100755
--- a/ksysguard/gui/ksysguard.desktop
+++ b/ksysguard/gui/ksysguard.desktop
@@ -174,6 +174,4 @@ MimeType=application/x-ksysguard;
 X-DocPath=ksysguard/index.html
 Terminal=false
 StartupNotify=true
-X-DBUS-ServiceName=org.kde.ksysguard
-X-DBUS-StartupType=Multi
 Categories=Qt;KDE;System;
diff --git a/kuiserver/kuiserver.desktop b/kuiserver/kuiserver.desktop
index f0b3ab46..25068172 100644
--- a/kuiserver/kuiserver.desktop
+++ b/kuiserver/kuiserver.desktop
@@ -165,7 +165,5 @@ Comment[x-test]=xxKDE's Progress Info UI serverxx
 Comment[zh_CN]=KDE 的进程信息用户界面服务器
 Comment[zh_TW]=KDE 的進度資訊介面伺服器
 X-KDE-ServiceTypes=
-X-DBUS-ServiceName=org.kde.kuiserver
 # It is a server
-X-DBUS-StartupType=Unique
 StartupNotify=false
diff --git a/plasma/shells/plasma-desktop/data/plasma-desktop.desktop b/plasma/shells/plasma-desktop/data/plasma-desktop.desktop
index bac63939..ff848238 100644
--- a/plasma/shells/plasma-desktop/data/plasma-desktop.desktop
+++ b/plasma/shells/plasma-desktop/data/plasma-desktop.desktop
@@ -1,7 +1,5 @@
 [Desktop Entry]
 Exec=plasma-desktop
-X-DBUS-ServiceName=org.kde.plasma-desktop
-X-DBUS-StartupType=multi
 Name=Plasma Desktop Workspace
 Name[ar]=مساحة عمل بلازما
 Name[ast]=Espaciu de trabayu del escritoriu Plasma
diff --git a/systemsettings/app/kdesystemsettings.desktop b/systemsettings/app/kdesystemsettings.desktop
index b58965f6..996707bc 100755
--- a/systemsettings/app/kdesystemsettings.desktop
+++ b/systemsettings/app/kdesystemsettings.desktop
@@ -109,6 +109,4 @@ Name[x-test]=xxKDE System Settingsxx
 Name[zh_CN]=KDE 系统设置
 Name[zh_TW]=KDE 系統設定
 
-X-DBUS-ServiceName=org.kde.systemsettings
-X-DBUS-StartupType=Unique
 Categories=Qt;KDE;Settings;
diff --git a/systemsettings/app/systemsettings.desktop b/systemsettings/app/systemsettings.desktop
index 5452d00e..d51ad66f 100755
--- a/systemsettings/app/systemsettings.desktop
+++ b/systemsettings/app/systemsettings.desktop
@@ -174,6 +174,4 @@ Name[x-test]=xxSystem Settingsxx
 Name[zh_CN]=系统设置
 Name[zh_TW]=系統設定
 
-X-DBUS-ServiceName=org.kde.systemsettings
-X-DBUS-StartupType=Unique
 Categories=Qt;KDE;Settings;