diff --git a/kcms/colors/Messages.sh b/kcms/colors/Messages.sh
index c356f2b1bdd9facc639a78bee7b960d833b90b14..91361002bf39f3a5fea745842a142ce4e521f3a4 100644
--- a/kcms/colors/Messages.sh
+++ b/kcms/colors/Messages.sh
@@ -1,4 +1,4 @@
#! /usr/bin/env bash
-$EXTRACTRC `find . -name "*.ui"` >> rc.cpp
+$EXTRACTRC `find . -name "*.ui" -o -name "*.kcfg"` >> rc.cpp
$XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcm_colors.pot
rm -f rc.cpp
diff --git a/kcms/componentchooser/Messages.sh b/kcms/componentchooser/Messages.sh
index ef984bf19f913230ded79de9c3cda9075fb83be4..4547a7c9248a97905cdd42692a394516e428de4a 100644
--- a/kcms/componentchooser/Messages.sh
+++ b/kcms/componentchooser/Messages.sh
@@ -1,3 +1,3 @@
#! /usr/bin/env bash
-$EXTRACTRC *.ui >> rc.cpp
+$EXTRACTRC `find . -name \*.ui -o -name \*.kcfg` >> rc.cpp
$XGETTEXT *.cpp -o $podir/kcm5_componentchooser.pot
diff --git a/kcms/cursortheme/Messages.sh b/kcms/cursortheme/Messages.sh
index 3841c243b927d3a3021b21fefa8e6f0a174c1927..0f9b7449d673ac52e356505d53a834993a572bab 100644
--- a/kcms/cursortheme/Messages.sh
+++ b/kcms/cursortheme/Messages.sh
@@ -1,2 +1,3 @@
#! /usr/bin/env bash
+$EXTRACTRC `find . -name \*.kcfg` >> rc.cpp
$XGETTEXT `find . -name \*.cpp -o -name \*.qml` -o $podir/kcm_cursortheme.pot
diff --git a/kcms/fonts/Messages.sh b/kcms/fonts/Messages.sh
index 334d8a1371a0eb66161295bf690d66448e49f424..a4b197d61c396eb2da5bc5593ce54ad58408ee1d 100644
--- a/kcms/fonts/Messages.sh
+++ b/kcms/fonts/Messages.sh
@@ -1,2 +1,3 @@
#! /usr/bin/env bash
+$EXTRACTRC `find . -name \*.kcfg` >> rc.cpp
$XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcm_fonts.pot
diff --git a/kcms/icons/Messages.sh b/kcms/icons/Messages.sh
index 7fc4f949e847ba6cdf61d43233b452d96ae78708..c3dcc12bc2254592a85a29bf642eef12c0325757 100644
--- a/kcms/icons/Messages.sh
+++ b/kcms/icons/Messages.sh
@@ -1,2 +1,3 @@
#! /usr/bin/env bash
+$EXTRACTRC `find . -name \*.kcfg` >> rc.cpp
$XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcm5_icons.pot
diff --git a/kcms/ksmserver/Messages.sh b/kcms/ksmserver/Messages.sh
index 9de7c66196c7775b4b20f2ee1826dca7ce856f2c..72a157a0d4c04c3a217bbb8a9798ddefa2721efd 100644
--- a/kcms/ksmserver/Messages.sh
+++ b/kcms/ksmserver/Messages.sh
@@ -1,5 +1,3 @@
#! /usr/bin/env bash
-$EXTRACTRC *.ui >> rc.cpp
+$EXTRACTRC `find . -name \*.ui -o -name \*.kcfg` >> rc.cpp
$XGETTEXT *.cpp -o $podir/kcmsmserver.pot
-rm -f rc.cpp
-
diff --git a/kcms/ksplash/Messages.sh b/kcms/ksplash/Messages.sh
old mode 100755
new mode 100644
index dc0cb674fc7f4e4e03976eba45a91ea2bc4ed182..a80097b3724085196e3c3203c3a77b188f40fed2
--- a/kcms/ksplash/Messages.sh
+++ b/kcms/ksplash/Messages.sh
@@ -1,2 +1,3 @@
#! /usr/bin/env bash
+$EXTRACTRC `find . -name \*.kcfg` >> rc.cpp
$XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcm_splashscreen.pot
diff --git a/kcms/ksplash/splashscreensettings.kcfg b/kcms/ksplash/splashscreensettings.kcfg
index 7cfdf801130be71a062e7a3c4865f722470a6794..87e2684b660d7b7352351f26158fd8f8f1c56285 100644
--- a/kcms/ksplash/splashscreensettings.kcfg
+++ b/kcms/ksplash/splashscreensettings.kcfg
@@ -9,7 +9,7 @@
-
+
theme() == QStringLiteral("None") ? QStringLiteral("none") : QStringLiteral("KSplashQML")
diff --git a/kcms/launch/Messages.sh b/kcms/launch/Messages.sh
index 71d9b7d85dcccbced5265090b8031591412b305b..4f86f99766e803686d0be18e1710a04f17daf936 100644
--- a/kcms/launch/Messages.sh
+++ b/kcms/launch/Messages.sh
@@ -1,2 +1,3 @@
#! /usr/bin/env bash
+$EXTRACTRC `find . -name \*.kcfg` >> rc.cpp
$XGETTEXT `find . -name \*.cpp -o -name \*.qml` -o $podir/kcm_launchfeedback.pot
diff --git a/kcms/lookandfeel/Messages.sh b/kcms/lookandfeel/Messages.sh
old mode 100755
new mode 100644
index a4b19b1bbc0a9838d5158e2f67de3461f9ba8f0a..6d4996b1c6e47b39e8eb1952215fb5a095b4e0fa
--- a/kcms/lookandfeel/Messages.sh
+++ b/kcms/lookandfeel/Messages.sh
@@ -1,2 +1,3 @@
#! /usr/bin/env bash
+$EXTRACTRC `find . -name \*.kcfg` >> rc.cpp
$XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcm_lookandfeel.pot
diff --git a/kcms/qtquicksettings/Messages.sh b/kcms/qtquicksettings/Messages.sh
index b53565f9a374e98cc4e234cfcfc37438a75270f2..0c5069be36d19366027751b34576022246d8e0a2 100644
--- a/kcms/qtquicksettings/Messages.sh
+++ b/kcms/qtquicksettings/Messages.sh
@@ -1,4 +1,3 @@
#! /usr/bin/env bash
-$EXTRACTRC *.ui >> rc.cpp
+$EXTRACTRC `find . -name \*.ui -o -name \*.kcfg` >> rc.cpp
$XGETTEXT *.cpp -o $podir/kcmqtquicksettings.pot
-rm -f rc.cpp
diff --git a/kcms/style/Messages.sh b/kcms/style/Messages.sh
index 8496bf6d4759358fd1e324dbda4c45f5a2747630..9bf529c4a2fa637ff863355f1cc1ac58a84e7cbe 100644
--- a/kcms/style/Messages.sh
+++ b/kcms/style/Messages.sh
@@ -1,4 +1,3 @@
#! /usr/bin/env bash
-$EXTRACTRC *.ui >> rc.cpp
+$EXTRACTRC `find . -name \*.ui -o -name \*.kcfg` >> rc.cpp
$XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcm_style.pot
-rm -f rc.cpp
diff --git a/kcms/workspaceoptions/Messages.sh b/kcms/workspaceoptions/Messages.sh
index 69ba853c7676e37574d42b7feaa8da9021fd0a08..db0ad56a4fa815911536fb84babb7a043a5b27d2 100644
--- a/kcms/workspaceoptions/Messages.sh
+++ b/kcms/workspaceoptions/Messages.sh
@@ -1,2 +1,3 @@
#! /usr/bin/env bash
+$EXTRACTRC `find . -name \*.kcfg` >> rc.cpp
$XGETTEXT `find . -name "*.cpp" -o -name "*.qml"` -o $podir/kcm_workspace.pot
diff --git a/solid-device-automounter/kcm/Messages.sh b/solid-device-automounter/kcm/Messages.sh
index 0853e367c868a4506aeaa432f49f0f84a99d903a..8daa8840da608bb634f42bdfb5287aed0a933360 100644
--- a/solid-device-automounter/kcm/Messages.sh
+++ b/solid-device-automounter/kcm/Messages.sh
@@ -1,3 +1,3 @@
#! /bin/sh
-$EXTRACTRC *.ui *.kcfg >> rc.cpp
+$EXTRACTRC `find . -name \*.ui -o -name \*.kcfg` >> rc.cpp
$XGETTEXT *.cpp -o $podir/kcm5_device_automounter.pot