diff --git a/plymouth.spec b/plymouth.spec
index 98ef177..58ef949 100644
--- a/plymouth.spec
+++ b/plymouth.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package plymouth
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -73,7 +73,6 @@ BuildRequires:  pkgconfig(systemd) >= 186
 %if %{with x11_renderer}
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.14.0
 %endif
-
 Recommends:     %{name}-lang
 Requires:       %{name}-branding
 Requires:       systemd >= 186
@@ -425,19 +424,6 @@ fi
 %postun -n libply-splash-graphics%{so_version} -p /sbin/ldconfig
 %post -n libply%{so_version} -p /sbin/ldconfig
 %postun -n libply%{so_version} -p /sbin/ldconfig
-%post theme-spinfinity
-if [ $1 -eq 1 ]; then
-  set -x
-  export LIB=%{_libdir}
-  OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
-  if [ "$OTHEME" = "text" ]; then
-     if [ ! -e /.buildenv ]; then
-       %{_sbindir}/plymouth-set-default-theme -R spinfinity
-     else
-       %{_sbindir}/plymouth-set-default-theme spinfinity
-     fi
-  fi
-fi
 
 %postun theme-spinfinity
 if [ $1 -eq 0 ]; then
@@ -447,20 +433,6 @@ if [ $1 -eq 0 ]; then
     fi
 fi
 
-%post theme-fade-in
-if [ $1 -eq 1 ]; then
-  set -x
-  export LIB=%{_libdir}
-  OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
-  if [ "$OTHEME" = "text" ]; then
-     if [ ! -e /.buildenv ]; then
-       %{_sbindir}/plymouth-set-default-theme -R fade-in
-     else
-       %{_sbindir}/plymouth-set-default-theme fade-in
-     fi
-  fi
-fi
-
 %postun theme-fade-in
 if [ $1 -eq 0 ]; then
     export LIB=%{_libdir}
@@ -469,20 +441,6 @@ if [ $1 -eq 0 ]; then
     fi
 fi
 
-%post theme-solar
-if [ $1 -eq 1 ]; then
-  set -x
-  export LIB=%{_libdir}
-  OTHEME="$(%{_sbindir}/plymouth-set-default-theme)"
-  if [ "$OTHEME" = "text" ]; then
-     if [ ! -e /.buildenv ]; then
-       %{_sbindir}/plymouth-set-default-theme -R solar
-     else
-       %{_sbindir}/plymouth-set-default-theme solar
-     fi
-  fi
-fi
-
 %postun theme-solar
 if [ $1 -eq 0 ]; then
     export LIB=%{_libdir}
@@ -569,6 +527,18 @@ fi
 %files plugin-fade-throbber
 %{_libdir}/plymouth/fade-throbber.so
 
+%files plugin-space-flares
+%{_libdir}/plymouth/space-flares.so
+
+%files plugin-two-step
+%{_libdir}/plymouth/two-step.so
+
+%files plugin-tribar
+%{_libdir}/plymouth/tribar.so
+
+%files plugin-script
+%{_libdir}/plymouth/script.so
+
 %files theme-fade-in
 %dir %{_datadir}/plymouth/themes/fade-in
 %{_datadir}/plymouth/themes/fade-in/*
@@ -577,9 +547,6 @@ fi
 %dir %{_datadir}/plymouth/themes/spinfinity
 %{_datadir}/plymouth/themes/spinfinity/*
 
-%files plugin-space-flares
-%{_libdir}/plymouth/*
-
 %files theme-spinner
 %dir %{_datadir}/plymouth/themes/spinner
 %{_datadir}/plymouth/themes/spinner/*
@@ -592,15 +559,6 @@ fi
 %dir %{_datadir}/plymouth/themes/tribar
 %{_datadir}/plymouth/themes/tribar/*
 
-%files plugin-two-step
-%{_libdir}/plymouth/*
-
-%files plugin-tribar
-%{_libdir}/plymouth/*
-
-%files plugin-script
-%{_libdir}/plymouth/*
-
 %files theme-script
 %dir %{_datadir}/plymouth/themes/script/
 %{_datadir}/plymouth/themes/script/*