diff --git a/plasma-desktop-5.8-default_favorites.patch b/plasma-desktop-5.8-default_favorites.patch
index cb57c76..e2f29f4 100644
--- a/plasma-desktop-5.8-default_favorites.patch
+++ b/plasma-desktop-5.8-default_favorites.patch
@@ -1,13 +1,13 @@
 diff --git a/applets/kickoff/package/contents/config/main.xml b/applets/kickoff/package/contents/config/main.xml
-index 3ca76f0..258149c 100644
+index 2ac27a9..142ba25 100644
 --- a/applets/kickoff/package/contents/config/main.xml
 +++ b/applets/kickoff/package/contents/config/main.xml
-@@ -20,7 +20,7 @@
-     </entry>
-     <entry name="favorites" type="StringList">
-       <label>List of general favorites. Supported values are menu id's (usually .desktop file names), special URLs that expand into default applications (e.g. preferred://browser), document URLs and KPeople contact URIs.</label>
--      <default>preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover.desktop</default>
-+      <default>preferred://browser,org.kde.kontact.desktop,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.ktpcontactlist.desktop,ktpcontactlist.desktop,org.kde.kate.desktop,kate.desktop,org.kde.konsole.desktop,org.kde.apper.desktop,apper.desktop,org.kde.discover.desktop</default>
-     </entry>
-     <entry name="favoritesPortedToKAstats" type="Bool">
-       <label>Are the favorites ported to use KActivitiesStats to allow per-activity favorites</label>
+@@ -15,7 +15,7 @@
+         </entry>
+         <entry name="favorites" type="StringList">
+             <label>List of general favorites. Supported values are menu id's (usually .desktop file names), special URLs that expand into default applications (e.g. preferred://browser), document URLs and KPeople contact URIs.</label>
+-            <default>preferred://browser,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,ktp-contactlist.desktop,org.kde.kate.desktop,org.kde.discover.desktop</default>
++            <default>preferred://browser,org.kde.kontact.desktop,kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.ktpcontactlist.desktop,ktpcontactlist.desktop,org.kde.kate.desktop,kate.desktop,org.kde.konsole.desktop,org.kde.apper.desktop,apper.desktop,org.kde.discover.desktop</default>
+         </entry>
+         <entry name="systemFavorites" type="StringList">
+             <label>List of system action favorites.</label>
diff --git a/plasma-desktop-missing-include.patch b/plasma-desktop-missing-include.patch
new file mode 100644
index 0000000..53d3ec3
--- /dev/null
+++ b/plasma-desktop-missing-include.patch
@@ -0,0 +1,13 @@
+diff --git a/kcms/autostart/autostartmodel.cpp b/kcms/autostart/autostartmodel.cpp
+index bb15ffe..94d800c 100644
+--- a/kcms/autostart/autostartmodel.cpp
++++ b/kcms/autostart/autostartmodel.cpp
+@@ -35,6 +35,8 @@
+ #include <KOpenWithDialog>
+ #include <KPropertiesDialog>
+ 
++#include <optional>
++
+ // FDO user autostart directories are
+ // .config/autostart which has .desktop files executed by klaunch
+ 
diff --git a/plasma-desktop-python-shebang.patch b/plasma-desktop-python-shebang.patch
new file mode 100644
index 0000000..330b4e9
--- /dev/null
+++ b/plasma-desktop-python-shebang.patch
@@ -0,0 +1,20 @@
+diff --git a/kcms/keyboard/kcminputrc_migrate_repeat_value.py b/kcms/keyboard/kcminputrc_migrate_repeat_value.py
+index 6515cff..8016e60 100755
+--- a/kcms/keyboard/kcminputrc_migrate_repeat_value.py
++++ b/kcms/keyboard/kcminputrc_migrate_repeat_value.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ import sys
+ 
+ for line in sys.stdin:
+diff --git a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py b/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py
+index a019986..cec9c78 100644
+--- a/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py
++++ b/kcms/ksmserver/kconf_update/ksmserver_update_loginMode_value.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python3
++#!/usr/bin/python3
+ import fileinput
+ 
+ for line in fileinput.input():
diff --git a/plasma-desktop.spec b/plasma-desktop.spec
index 4e56a20..137f7df 100644
--- a/plasma-desktop.spec
+++ b/plasma-desktop.spec
@@ -36,6 +36,9 @@ Patch100: plasma-desktop-5.8-default_favorites.patch
 
 ## upstreamable patches
 Patch200: https://gitweb.gentoo.org/proj/kde.git/plain/kde-plasma/plasma-desktop/files/plasma-desktop-5.18.4.1-override-include-dirs.patch
+Patch201: plasma-desktop-missing-include.patch
+Patch202: plasma-desktop-python-shebang.patch
+
 # use this bundled copy (from f31) if not provided already
 Source200: synaptics-properties.h
 
@@ -199,6 +202,9 @@ BuildArch: noarch
 
 ## upstreamable patches
 %patch200 -p1
+%patch201 -p1
+%patch202 -p1
+
 %if ! 0%{?synaptics}
 install -pD %{SOURCE200} 3rdparty/xorg/synaptics-properties.h
 %endif
@@ -257,6 +263,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.knetattach.d
 %{_bindir}/solid-action-desktop-gen
 %{_bindir}/ibus-ui-emojier-plasma
 %{_bindir}/tastenbrett
+%{_bindir}/krunner-plugininstaller
 %{_kf5_libexecdir}/kauth/kcmdatetimehelper
 %{_libexecdir}/kimpanel-ibus-panel
 %{_libexecdir}/kimpanel-ibus-panel-launcher
@@ -283,20 +290,21 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/org.kde.knetattach.d
 %{_kf5_bindir}/kapplymousetheme
 %{_kf5_datadir}/kcmmouse/
 %endif
-%{_datadir}/config.kcfg/browser_settings.kcfg
 %{_datadir}/config.kcfg/kactivitymanagerd_plugins_settings.kcfg
 %{_datadir}/config.kcfg/kactivitymanagerd_settings.kcfg
 %{_datadir}/config.kcfg/splashscreensettings.kcfg
-%{_datadir}/config.kcfg/terminal_settings.kcfg
 %{_datadir}/config.kcfg/workspaceoptions_kdeglobalssettings.kcfg
 %{_datadir}/config.kcfg/workspaceoptions_plasmasettings.kcfg
 %{_datadir}/config.kcfg/launchfeedbacksettingsbase.kcfg
+%{_datadir}/config.kcfg/kcmaccessibilitybell.kcfg
+%{_datadir}/config.kcfg/kcmaccessibilitykeyboard.kcfg
+%{_datadir}/config.kcfg/kcmaccessibilitymouse.kcfg
+%{_datadir}/config.kcfg/kcmaccessibilityscreenreader.kcfg
 %{_datadir}/kglobalaccel/org.kde.plasma.emojier.desktop
 %{_datadir}/qlogging-categories5/kcmkeys.categories
 %{_datadir}/qlogging-categories5/kcmusers.categories
 %{_kf5_datadir}/kconf_update/*
 %{_kf5_datadir}/kcmkeys
-%{_kf5_datadir}/kcm_componentchooser
 %{_kf5_datadir}/kcmkeyboard
 %{_kf5_datadir}/kpackage/kcms/*
 %{_kf5_datadir}/knsrcfiles/