$ git diff --patch-with-stat --summary a72a05c912dc9a863d6d4dcb8faabd9fe6d55cd6..39c7e6790ad574510036a11b04da98e4535e4e65

 .abf.yml            |  2 +-
 distro-release.spec | 38 +++++++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/.abf.yml b/.abf.yml
index dd4f555..1e519dc 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
 sources:
-  distro-release-4.50.tar.gz: 2f279b18b1c9d816f5b26f35e481423cf7fcdc18
+  distro-release-4.50.tar.gz: 1181967e547c7221a376c7fa3b752bc056db3abb
diff --git a/distro-release.spec b/distro-release.spec
index 5b6d68f..084c48d 100644
--- a/distro-release.spec
+++ b/distro-release.spec
@@ -16,8 +16,8 @@
 %define new_disturl http://openmandriva.org/
 %define new_bugurl http://issues.openmandriva.org/
 
-%define am_i_cooker 0
-%define am_i_rolling 1
+%define am_i_cooker 1
+%define am_i_rolling 0
 %if %am_i_cooker
 %define distrib Cooker
 %else
@@ -80,7 +80,7 @@ DistTag:	%{shorttag}%{distro_tag}
 # (can't be done for 4.2 because already were at 0.8/0.3 before adding this
 # comment -- but it's something to keep in mind for 5.0)
 %if 0%am_i_cooker
-Release:	0.2.6
+Release:	0.2.10
 %else
 %if 0%am_i_rolling
 Release:	0.1.3
@@ -194,10 +194,12 @@ BuildRequires:	fonts-ttf-dejavu
 BuildRequires:	urw-fonts
 Provides:	plymouth(system-theme)
 Requires:	%{name}
-%ifnarch %{arm} %{riscv}
+%ifnarch %{armx} %{riscv}
 Requires:	plymouth-plugin-script
 Requires(post):	plymouth-scripts
 Requires:	grub2
+%else
+Requires:	plymouth-theme-bgrt
 %endif
 %rename		distro-theme
 %rename		grub2-theme
@@ -705,6 +707,7 @@ ln -s ../kde5/menus/kde-applications.menu %{buildroot}%{_sysconfdir}/xdg/menus/g
 mkdir -p %{buildroot}%{_sysconfdir}/xdg
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/KDE
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/QtProject
+mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart-scripts
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env
 mkdir -p %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/shutdown
 mkdir -p %{buildroot}%{_datadir}/kservices5
@@ -721,8 +724,10 @@ install -m 0644 desktops/Plasma/metadata.desktop %{buildroot}%{_datadir}/kservic
 install -m 0644 desktops/Plasma/org.kde.plasma.desktop-layout.js %{buildroot}%{_datadir}/plasma/shells/org.kde.plasma.desktop/contents/layout.js
 install -m 0644 desktops/Plasma/org.openmandriva.plasma.desktop.defaultPanel-layout.js %{buildroot}%{_datadir}/plasma/layout-templates/org.openmandriva.plasma.desktop.defaultPanel/contents/layout.js
 install -m 0644 desktops/Plasma/plasma-firstsetup.sh %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env/plasma-firstsetup.sh
+ln -sf %{_sysconfdir}/xdg/plasma-workspace/env/plasma-firstsetup.sh %{buildroot}%{_sysconfdir}/xdg/autostart-scripts/plasma-firstsetup.sh
 install -m 0644 desktops/Plasma/Sonnet.conf %{buildroot}%{_sysconfdir}/xdg/KDE/Sonnet.conf
 install -m 0644 desktops/Plasma/kdeglobals.sh %{buildroot}%{_sysconfdir}/xdg/plasma-workspace/env/kdeglobals.sh
+ln -sf %{_sysconfdir}/xdg/plasma-workspace/env/kdeglobals.sh %{buildroot}%{_sysconfdir}/xdg/autostart-scripts/kdeglobals.sh
 install -m 0644 desktops/Plasma/qtlogging.ini %{buildroot}%{_sysconfdir}/xdg/QtProject/qtlogging.ini
 install -m 0644 desktops/Plasma/OMV.profile %{buildroot}%{_datadir}/konsole/OMV.profile
 mkdir -p %{buildroot}%{_datadir}/plasma/layout-templates/org.openmandriva.plasma.desktop.globalMenuPanel/contents
@@ -749,11 +754,14 @@ ln -s hicolor/scalable/apps/openmandriva.svg %{buildroot}%{_iconsdir}/
 mkdir -p %{buildroot}%{_datadir}/wallpapers
 cp -a theme/backgrounds/*.*g %{buildroot}%{_datadir}/mdk/backgrounds
 cp -a theme/extra-backgrounds/*.*g %{buildroot}%{_datadir}/mdk/backgrounds
+
+%if %am_i_cooker || %am_i_rolling
 # (tpg) add flavour name on the wallapaer
 convert -fill white -pointsize 20 -gravity center -draw "text 565,560 '%{distrib}'" %{buildroot}%{_datadir}/mdk/backgrounds/%{vendor}-16x10.png %{buildroot}%{_datadir}/mdk/backgrounds/%{vendor}-16x10.png
 convert -fill white -pointsize 20 -gravity center -draw "text 300,410 '%{distrib}'" %{buildroot}%{_datadir}/mdk/backgrounds/%{vendor}-16x9.png %{buildroot}%{_datadir}/mdk/backgrounds/%{vendor}-16x9.png
 convert -fill white -pointsize 20 -gravity center -draw "text 700,500 '%{distrib}'" %{buildroot}%{_datadir}/mdk/backgrounds/%{vendor}-4x3.png %{buildroot}%{_datadir}/mdk/backgrounds/%{vendor}-4x3.png
 convert -fill white -pointsize 20 -gravity center -draw "text 500,370 '%{distrib}'" %{buildroot}%{_datadir}/mdk/backgrounds/%{vendor}-5x4.png %{buildroot}%{_datadir}/mdk/backgrounds/%{vendor}-5x4.png
+%endif
 ln -sf /usr/share/mdk/backgrounds/OpenMandriva-16x9.png %{buildroot}%{_datadir}/mdk/backgrounds/default.png
 ln -sf /usr/share/mdk/backgrounds/default.png %{buildroot}%{_datadir}/wallpapers/default.png
 ln -sf /usr/share/mdk/backgrounds/default.png %{buildroot}%{_datadir}/wallpapers/default.jpg
@@ -764,11 +772,17 @@ cp -a theme/screensaver/*.jpg %{buildroot}%{_datadir}/mdk/screensaver
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 cp -a theme/pixmaps/*.*g %{buildroot}%{_datadir}/pixmaps
 
+# (tpg) we are using bgrt plymouth theme
+%ifnarch %{armx} %{riscv}
 mkdir -p %{buildroot}%{_datadir}/plymouth/themes
 cp -a theme/plymouth/%{vendor} %{buildroot}%{_datadir}/plymouth/themes/
+%endif
+
+# (tpg) currently our os-image-builder tool supports:
+# uboot with extlinux
+# systemd-boot
 
-# (tpg) arm does not uses grub, but some aarch64 boards do
-%ifnarch %{arm}
+%ifnarch %{armx} %{riscv}
 mkdir -p %{buildroot}/boot/grub2/themes/%{vendor}
 cp -a theme/grub/%{vendor}/* %{buildroot}/boot/grub2/themes/%{vendor}
 rm -rf %{buildroot}/boot/grub2/themes/%{vendor}/05_theme
@@ -794,9 +808,11 @@ THEMEVER=$(echo %{version} |sed -e 's,\.,,g')
 %endif
 if [ -d theme-$THEMEVER ]; then
 	# Overwrite some stuff with version/branch specific artwork
-	cp -f theme-$THEMEVER/plymouth/* %{buildroot}%{_datadir}/plymouth/themes/%{vendor}/
 	cp -f theme-$THEMEVER/wallpapers/* %{buildroot}%{_datadir}/mdk/backgrounds/
+%ifnarch %{armx} %{riscv}
+	cp -f theme-$THEMEVER/plymouth/* %{buildroot}%{_datadir}/plymouth/themes/%{vendor}/
 	cp -f theme-$THEMEVER/grub/* %{buildroot}/boot/grub2/themes/%{vendor}/
+%endif
 	cp -f theme-$THEMEVER/splash-contents-previews/* %{buildroot}%{_datadir}/plasma/look-and-feel/org.openmandriva4.desktop/contents/previews/
 fi
 
@@ -1138,7 +1154,7 @@ esac
 %endif
 
 %post theme
-%ifnarch %{arm}
+%ifnarch %{armx} %{riscv}
 %{_sbindir}/plymouth-set-default-theme %{vendor}
 
 if test -f %{_sysconfdir}/default/grub ; then
@@ -1156,7 +1172,7 @@ update-alternatives --install %{_sysconfdir}/default/grub.vendor grub.vendor %{_
 %endif
 
 %postun theme
-%ifnarch %{arm}
+%ifnarch %{armx} %{riscv}
 if [ "$1" = "0" ]; then
     update-alternatives --remove grub.vendor %{_sysconfdir}/default/grub.%{vendor}
 fi
@@ -1221,10 +1237,10 @@ sed -i -e "s/#PRODUCT_ID/$(cat /etc/product.id)/" -e "s/#LANG/${LC_NAME/[-_]*}/g
 %{_iconsdir}/hicolor/*/apps/openmandriva.png
 %dir %{_datadir}/mdk/screensaver
 %{_datadir}/mdk/screensaver/*.jpg
-%{_datadir}/plymouth/themes/%{vendor}
 %optional %{_datadir}/pixmaps/system-logo-white.png
 
-%ifnarch %{arm}
+%ifnarch %{armx} %{riscv}
+%{_datadir}/plymouth/themes/%{vendor}
 %{_sysconfdir}/default/grub.%{vendor}
 %dir /boot/grub2/themes/%{vendor}
 /boot/grub2/themes/%{vendor}/*