diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt
index 170b3e712..b22e99dbf 100644
--- a/krunner/CMakeLists.txt
+++ b/krunner/CMakeLists.txt
@@ -1,41 +1,43 @@
 set(krunner_SRCS
     main.cpp
     view.cpp
 )
 
 set(krunner_dbusAppXML dbus/org.kde.krunner.App.xml)
 qt5_add_dbus_adaptor(krunner_SRCS ${krunner_dbusAppXML} view.h View)
 configure_file(dbus/org.kde.krunner.service.in
                ${CMAKE_CURRENT_BINARY_DIR}/org.kde.krunner.service)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.krunner.service
         DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
 
 
 add_executable(krunner ${krunner_SRCS})
 
 target_link_libraries(krunner
     Qt5::Quick
     KF5::Declarative
     KF5::I18n
     KF5::PlasmaQuick
     KF5::DBusAddons
     KF5::Crash
     KF5::WaylandClient
     KF5::QuickAddons
     PW::KWorkspace
 )
 target_compile_definitions(krunner PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}")
 
 install(TARGETS krunner ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES ${krunner_dbusAppXML} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} )
-install(FILES krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel)
+
+configure_file(krunner.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel)
 
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KRunnerAppDBusInterface")
 configure_package_config_file(KRunnerAppDBusInterfaceConfig.cmake.in
     "${CMAKE_CURRENT_BINARY_DIR}/KRunnerAppDBusInterfaceConfig.cmake"
     PATH_VARS KDE_INSTALL_DBUSINTERFACEDIR
     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KRunnerAppDBusInterfaceConfig.cmake
     DESTINATION ${CMAKECONFIG_INSTALL_DIR})
 
 add_subdirectory(update)
diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop.cmake
similarity index 95%
rename from krunner/krunner.desktop
rename to krunner/krunner.desktop.cmake
index 93247f7a0..91cb9e87d 100644
--- a/krunner/krunner.desktop
+++ b/krunner/krunner.desktop.cmake
@@ -1,78 +1,79 @@
 [Desktop Entry]
-Exec=krunner
+Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner
 Name=KRunner
 Name[ar]=مشغّل.ك
 Name[bs]=KPokretač
 Name[ca]=KRunner
 Name[ca@valencia]=KRunner
 Name[cs]=KRunner
 Name[da]=KRunner
 Name[de]=KRunner
 Name[el]=KRunner
 Name[en_GB]=KRunner
 Name[es]=KRunner
 Name[et]=KRunner
 Name[eu]=KRunner
 Name[fi]=KRunner
 Name[fr]=KRunner
 Name[gl]=KRunner
 Name[hu]=KRunner
 Name[id]=KRunner
 Name[is]=KRunner
 Name[it]=KRunner
 Name[ja]=KRunner
 Name[ko]=KRunner
 Name[lt]=KRunner
 Name[nb]=KRunner
 Name[nds]=KRunner
 Name[nl]=KRunner
 Name[nn]=KRunner
 Name[pa]=ਕੇਰਨਰ
 Name[pl]=KRunner
 Name[pt]=KRunner
 Name[pt_BR]=KRunner
 Name[ru]=KRunner
 Name[sk]=KRunner
 Name[sl]=KRunner
 Name[sr]=К‑извођач
 Name[sr@ijekavian]=К‑извођач
 Name[sr@ijekavianlatin]=K‑izvođač
 Name[sr@latin]=K‑izvođač
 Name[sv]=Kör program
 Name[tr]=KRunner
 Name[uk]=KRunner
 Name[x-test]=xxKRunnerxx
 Name[zh_CN]=KRunner
 Name[zh_TW]=KRunner
 OnlyShowIn=KDE;
 Type=Application
 X-DBUS-StartupType=Unique
 X-DBUS-ServiceName=org.kde.krunner
 X-KDE-StartupNotify=false
 X-KDE-Shortcuts=Alt+Space,Alt+F2,Search
 Actions=RunClipboard
+X-KDE-Wayland-Interfaces=org_kde_plasma_window_management
 
 [Desktop Action RunClipboard]
 Exec=krunner -c
 Name=Run command on clipboard contents
 Name[ca]=Executa una ordre al contingut del porta-retalls
 Name[ca@valencia]=Executa una ordre al contingut del porta-retalls
 Name[es]=Ejecutar orden sobre el contenido del portapapeles
 Name[eu]=Exekutatu komandoa arbelaren edukiaren gain
 Name[fr]=Exécuter la commande en utilisant le contenu du presse-papier
 Name[id]=Jalankan perintah pada konten-konten papan-klip
 Name[it]=Esegui comando sui contenuti degli appunti
 Name[ko]=클립보드 내용에서 명령 실행하기
 Name[nl]=Commando uitvoeren op klembordinhoud
 Name[nn]=Køyr kommando på innhaldet på utklippstavla
 Name[pl]=Wykonaj polecenie na zawartości schowka
 Name[pt]=Executar o comando no conteúdo da área de transferência
 Name[pt_BR]=Executar comando no conteúdo da área de transferência
 Name[ru]=Запуск команды из буфера обмена
 Name[sk]=Spustiť príkaz na obsahu schránky
 Name[sv]=Kör kommando med klippbordets innehåll
 Name[uk]=Виконати команду над вмістом буфера обміну
 Name[x-test]=xxRun command on clipboard contentsxx
 Name[zh_CN]=在剪贴板内容上运行命令
 Name[zh_TW]=執行剪貼簿內容中的指令
 X-KDE-Shortcuts=Alt+Shift+F2
diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt
index b7ce9dfe6..99ba538c1 100644
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -1,96 +1,98 @@
 configure_file(config-ktexteditor.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ktexteditor.h )
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-plasma.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-plasma.h)
 
 add_definitions(-DPLASMA_DEPRECATED=)
 
 set(scripting_SRC
     scripting/appinterface.cpp
     scripting/applet.cpp
     scripting/containment.cpp
     scripting/configgroup.cpp
     scripting/panel.cpp
     scripting/scriptengine.cpp
     scripting/scriptengine_v1.cpp
     scripting/widget.cpp
 )
 
 set(plasmashell_dbusXML dbus/org.kde.PlasmaShell.xml)
 qt5_add_dbus_adaptor(scripting_SRC ${plasmashell_dbusXML} shellcorona.h ShellCorona plasmashelladaptor)
 
 ecm_qt_declare_logging_category(plasmashell HEADER debug.h
                                                IDENTIFIER PLASMASHELL
                                                CATEGORY_NAME kde.plasmashell
                                                DEFAULT_SEVERITY Info)
 
 set (plasma_shell_SRCS
     alternativeshelper.cpp
     main.cpp
     containmentconfigview.cpp
     currentcontainmentactionsmodel.cpp
     desktopview.cpp
     panelview.cpp
     panelconfigview.cpp
     panelshadows.cpp
     shellcorona.cpp
     shellmanager.cpp
     standaloneappcorona
     osd.cpp
     coronatesthelper.cpp
     debug.cpp
     screenpool.cpp
     softwarerendernotifier.cpp
     ${scripting_SRC}
 )
 
 set(krunner_xml ${plasma-workspace_SOURCE_DIR}/krunner/dbus/org.kde.krunner.App.xml)
 qt5_add_dbus_interface(plasma_shell_SRCS ${krunner_xml} krunner_interface)
 
 add_executable(plasmashell
     ${plasma_shell_SRCS}
 )
 
 target_link_libraries(plasmashell
  Qt5::Quick
  Qt5::DBus
  KF5::KIOCore
  KF5::WindowSystem
  KF5::Crash
  KF5::Plasma
  KF5::PlasmaQuick
  KF5::Solid
  KF5::Declarative
  KF5::I18n
  KF5::IconThemes
  KF5::Activities
  KF5::GlobalAccel
  KF5::CoreAddons
  KF5::DBusAddons
  KF5::QuickAddons
  KF5::XmlGui
  KF5::Package
  KF5::WaylandClient
  KF5::Notifications
  PW::KWorkspace
 )
 target_include_directories(plasmashell PRIVATE "${CMAKE_BINARY_DIR}")
 target_compile_definitions(plasmashell PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION}")
 
 if(HAVE_X11)
   target_link_libraries(plasmashell ${X11_LIBRARIES} ${XCB_LIBRARIES} )
   target_link_libraries(plasmashell Qt5::X11Extras)
 endif()
 
+configure_file(org.kde.plasmashell.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.desktop @ONLY)
+
 install(TARGETS plasmashell ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(FILES org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
 install( FILES dbus/org.kde.PlasmaShell.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} )
 
 install(FILES
    scripting/plasma-layouttemplate.desktop
    DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})
 
 add_subdirectory(packageplugins)
 if(BUILD_TESTING)
    add_subdirectory(autotests)
 endif()
diff --git a/shell/org.kde.plasmashell.desktop b/shell/org.kde.plasmashell.desktop.cmake
similarity index 94%
rename from shell/org.kde.plasmashell.desktop
rename to shell/org.kde.plasmashell.desktop.cmake
index 6c90794e0..9bd6fbe8d 100644
--- a/shell/org.kde.plasmashell.desktop
+++ b/shell/org.kde.plasmashell.desktop.cmake
@@ -1,58 +1,60 @@
 [Desktop Entry]
-Exec=plasmashell
+Exec=@CMAKE_INSTALL_PREFIX@/bin/plasmashell
 X-DBUS-StartupType=Unique
 Name=Plasma Desktop Workspace
 Name[ar]=مساحة عمل سطح مكتب بلازما
 Name[bs]=Radni prostor plazma radne površi
 Name[ca]=Espai de treball de l'escriptori Plasma
 Name[ca@valencia]=Espai de treball de l'escriptori Plasma
 Name[cs]=Pracovní plocha Plasma
 Name[da]=Plasma Desktop Workspace
 Name[de]=Plasma-Arbeitsflächenbereich
 Name[el]=Χώρος επιφάνειας εργασίας Plasma
 Name[en_GB]=Plasma Desktop Workspace
 Name[es]=Espacio de trabajo del escritorio Plasma
 Name[et]=Plasma töölaua töötsoon
 Name[eu]=Plasma mahaigainaren lanerako guneak
 Name[fi]=Plasma-työpöytä
 Name[fr]=Espace de travail Plasma
 Name[ga]=Spás Oibre Deisce Plasma
 Name[gl]=Espazo de traballo do escritorio Plasma
 Name[he]=תחנת עבודה של שולחן העבודה Plasma
 Name[hr]=Plasma radno okruženje
 Name[hu]=Plazma asztali munkaterület
 Name[ia]=Spatio de labor de scriptorio de Plasma
 Name[id]=Workspace Desktop Plasma
 Name[is]=Vinnurýmd Plasma skjáborðs
 Name[it]=Spazio di lavoro del desktop di Plasma
 Name[ja]=Plasma デスクトップワークスペース
 Name[ko]=Plasma 데스크톱 작업 공간
 Name[lt]=Plasma darbalaukio erdvė
 Name[nb]=Arbeidsrom for Plasma skrivebord
 Name[nds]=Plasma-Schriefdischarbeitrebeet
 Name[nl]=Plasma Bureaublad Werkplek
 Name[nn]=Arbeidsområde for Plasma-skrivebord
 Name[pa]=ਪਲਾਜ਼ਮਾ ਡੈਸਕਟਾਪ ਵਰਕਸਪੇਸ
 Name[pl]=Przestrzeń Robocza Pulpitu Plazmy
 Name[pt]=Área de Trabalho do Plasma
 Name[pt_BR]=Espaço de Trabalho Plasma
 Name[ru]=Рабочая среда Plasma
 Name[sk]=Pracovná plocha Plasma
 Name[sl]=Delovni prostor Plasma Desktop
 Name[sr]=Плазма, радни простор површи
 Name[sr@ijekavian]=Плазма, радни простор површи
 Name[sr@ijekavianlatin]=Plasma, radni prostor površi
 Name[sr@latin]=Plasma, radni prostor površi
 Name[sv]=Plasma arbetsområde för skrivbordet
 Name[tr]=Plasma Masaüstü Çalışma Alanı
 Name[uk]=Робочий простір Плазми для комп’ютерів
 Name[x-test]=xxPlasma Desktop Workspacexx
 Name[zh_CN]=Plasma 桌面工作空间
 Name[zh_TW]=Plasma 桌面工作空間
 Type=Application
 X-KDE-StartupNotify=false
 X-DBUS-ServiceName=org.kde.plasmashell
 OnlyShowIn=KDE;
 X-KDE-autostart-phase=0
 Icon=plasma
 NoDisplay=true
+
+X-KDE-Wayland-Interfaces=org_kde_plasma_window_management,org_kde_kwin_keystate