diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/plymouth-calculate-plugin b/profiles/templates/3.6/2_ac_install_merge/Depends/plymouth-calculate-plugin
new file mode 100644
index 000000000..de4149c2f
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/Depends/plymouth-calculate-plugin
@@ -0,0 +1 @@
+# Calculate append=skip merge(sys-boot/plymouth-calculate-plugin)!= merge=sys-boot/plymouth,sys-kernel/dracut
diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/splash-themes-calculate b/profiles/templates/3.6/2_ac_install_merge/Depends/splash-themes-calculate
index 521207992..e525dc0b5 100644
--- a/profiles/templates/3.6/2_ac_install_merge/Depends/splash-themes-calculate
+++ b/profiles/templates/3.6/2_ac_install_merge/Depends/splash-themes-calculate
@@ -1 +1 @@
-# Calculate append=skip merge(media-gfx/splash-themes-calculate)!= merge=media-gfx/splashutils,sys-boot/grub
+# Calculate append=skip merge(media-gfx/splash-themes-calculate)!= merge=media-gfx/splashutils,sys-boot/grub,sys-boot/plymouth-calculate-plugin
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/.calculate_directory
new file mode 100644
index 000000000..38b058bb0
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate mergepkg()!= append=skip
+
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/.shutdown.remove/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/.shutdown.remove/.calculate_directory
new file mode 100644
index 000000000..2b5cde54b
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/.shutdown.remove/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=remove path=/usr/share/plymouth/themes/calculate name=.shutdown ini(theme.splash-shutdown-background)==||exists(#-ini(theme.splash-shutdown-background)-#)==
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/.shutdown/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/.shutdown/.calculate_directory
new file mode 100644
index 000000000..34a529912
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/.shutdown/.calculate_directory
@@ -0,0 +1 @@
+# Calculate ini(theme.splash-shutdown-background)!=&&exists(#-ini(theme.splash-shutdown-background)-#)!=
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/.shutdown/0-images b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/.shutdown/0-images
new file mode 100644
index 000000000..c25aa7967
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/.shutdown/0-images
@@ -0,0 +1,33 @@
+# Calculate format=backgrounds convert=png stretch path=/usr/share/plymouth/themes/calculate/.shutdown name= link=#-ini(theme.splash-shutdown-background)-# mirror exists(#-ini(theme.splash-shutdown-background)-#)!=
+#?cl_chroot_status==on#
+1024x768
+640x480
+800x480
+800x600
+1024x576
+1024x600
+1200x800
+1280x800
+1280x720
+1280x768
+1280x1024
+1360x768
+1366x768
+1368x768
+1400x1050
+1440x900
+1680x945
+1680x1050
+1920x1080
+1920x1200
+1600x768
+1600x900
+1600x1200
+2048x1152
+2560x1440
+2560x1600
+#!cl_chroot_status#
+#-os_install_fb_resolution-#
+#-os_install_x11_resolution-#
+1024x768
+#cl_chroot_status#
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/boot.remove/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/boot.remove/.calculate_directory
new file mode 100644
index 000000000..1c2a03c6d
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/boot.remove/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=remove path=/usr/share/plymouth/themes/calculate name=boot ini(theme.splash-silent-background)==||exists(#-ini(theme.splash-silent-background)-#)==
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/boot/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/boot/.calculate_directory
new file mode 100644
index 000000000..ba376db18
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/boot/.calculate_directory
@@ -0,0 +1 @@
+# Calculate ini(theme.splash-silent-background)!=&&exists(#-ini(theme.splash-silent-background)-#)!=
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/boot/0-images b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/boot/0-images
new file mode 100644
index 000000000..5d4b513cc
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/boot/0-images
@@ -0,0 +1,33 @@
+# Calculate format=backgrounds convert=png stretch path=/usr/share/plymouth/themes/calculate/boot name= link=#-ini(theme.splash-silent-background)-# mirror exists(#-ini(theme.splash-silent-background)-#)!=
+#?cl_chroot_status==on#
+1024x768
+640x480
+800x480
+800x600
+1024x576
+1024x600
+1200x800
+1280x800
+1280x720
+1280x768
+1280x1024
+1360x768
+1366x768
+1368x768
+1400x1050
+1440x900
+1680x945
+1680x1050
+1920x1080
+1920x1200
+1600x768
+1600x900
+1600x1200
+2048x1152
+2560x1440
+2560x1600
+#!cl_chroot_status#
+#-os_install_fb_resolution-#
+#-os_install_x11_resolution-#
+1024x768
+#cl_chroot_status#
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth
new file mode 100644
index 000000000..e9e98396a
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth
@@ -0,0 +1,39 @@
+# Calculate format=kde path=/usr/share/plymouth/themes/calculate
+[Plymouth Theme]
+Name=Calculate
+Description=Simple theme that shows progressbar, image and text for shutdown
+ModuleName=calculate
+
+[calculate]
+ImageDir=/usr/share/plymouth/themes/calculate
+BackgroundStartColor=0x000000
+BackgroundEndColor=0x000000
+#?ini(theme.splash-silent-progress-color-begin)!=&&ini(theme.splash-silent-progress-color-begin)!=off#
+BootProgressbarColor=0x#-ini(theme.splash-silent-progress-color-begin)-#
+#ini#
+#?ini(theme.splash-silent-progress-color-begin)==off#
+BootProgressbarColor=off
+#ini#
+#?ini(theme.splash-silent-progress-color-begin)==#
+!BootProgressbarColor=
+#ini#
+#?ini(theme.splash-shutdown-progress-color-begin)!=&&ini(theme.splash-shutdown-progress-color-begin)!=off#
+ShutdownProgressbarColor=0x#-ini(theme.splash-shutdown-progress-color-begin)-#
+#ini#
+#?ini(theme.splash-shutdown-progress-color-begin)==off#
+ShutdownProgressbarColor=off
+#ini#
+#?ini(theme.splash-shutdown-progress-color-begin)==#
+!ShutdownProgressbarColor=
+#ini#
+#?ini(theme.splash-silent-background)!=#
+BootImage=/usr/share/plymouth/themes/calculate/boot
+#!ini#
+!BootImage=
+#ini#
+#?ini(theme.splash-shutdown-background)!=#
+ShutdownImage=/usr/share/plymouth/themes/calculate/.shutdown
+#!ini#
+!ShutdownImage=
+#ini#
+ShutdownTextColor=0x#-ini(theme.splash-shutdown-text-color)-#
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth/.calculate_directory b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth/.calculate_directory
new file mode 100644
index 000000000..38b058bb0
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate mergepkg()!= append=skip
+
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth/plymouthd.defaults b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth/plymouthd.defaults
new file mode 100644
index 000000000..943bba73e
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-boot/plymouth/plymouthd.defaults
@@ -0,0 +1,10 @@
+# Calculate format=kde path=/usr/share/plymouth
+[Daemon]
+#?pkg(sys-boot/plymouth-calculate-plugin)!=#
+Theme=calculate
+#!pkg#
+Theme=spinner
+#pkg#
+ShowDelay=1
+FBDeviceTimeout=2
+DeviceTimeout=20
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/50plymouth/module-setup.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/50plymouth/module-setup.sh
new file mode 100644
index 000000000..58376d815
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/50plymouth/module-setup.sh
@@ -0,0 +1,8 @@
+# Calculate format=patch
+(inst_hook emergency 50 "\$moddir"/plymouth-emergency.sh
+)\s*
+(\s*)(inst_multiple readlink)
+\1
+\2inst_rules /lib/udev/rules.d/71-udev-seat.rules
+
+\2\3
diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/50plymouth/plymouth-pretrigger.sh b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/50plymouth/plymouth-pretrigger.sh
new file mode 100644
index 000000000..387aa6c4e
--- /dev/null
+++ b/profiles/templates/3.6/2_ac_install_merge/sys-kernel/dracut/50plymouth/plymouth-pretrigger.sh
@@ -0,0 +1,10 @@
+# Calculate format=patch
+\n(\s+)(plymouthd)(\s*--attach-to-session)(\s*--pid-file\s*\S+)
+
+\1if getargbool 0 quiet
+\1then
+\1\1\2\4\3
+\1else
+\1\1\2\4
+\1fi
+
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/.calculate_directory
similarity index 100%
rename from profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/.calculate_directory
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/.calculate_directory
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/create_hostonly b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/create_hostonly
similarity index 100%
rename from profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/create_hostonly
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/create_hostonly
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/default.grub
similarity index 70%
rename from profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/default.grub
index d0f15386f..47315978d 100644
--- a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/default.grub
@@ -9,7 +9,18 @@ GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resum
#?ini(theme.splash-silent-background)==&&ini(theme.splash-verbose-background)==||ini(theme.splash-silent-background)==&&exists(#-ini(theme.splash-verbose-background)-#)==||ini(theme.splash-verbose-background)==&&exists(#-ini(theme.splash-silent-background)-#)==||exists(#-ini(theme.splash-verbose-background)-#)==&&exists(#-ini(theme.splash-silent-background)-#)==#
GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash=off console=tty1 quiet"
#ini#
-#!pkg#
+#pkg#
+
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)!=#
+#?ini(theme.splash-silent-background)!=&&exists(#-ini(theme.splash-silent-background)-#)!=#
+GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash=silent quiet"
+#ini#
+#?ini(theme.splash-silent-background)==&&ini(theme.splash-verbose-background)==||ini(theme.splash-silent-background)==&&exists(#-ini(theme.splash-verbose-background)-#)==||ini(theme.splash-verbose-background)==&&exists(#-ini(theme.splash-silent-background)-#)==||exists(#-ini(theme.splash-verbose-background)-#)==&&exists(#-ini(theme.splash-silent-background)-#)==#
+GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# console=tty1 rd.plymouth=0 quiet"
+#ini#
+#pkg#
+
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)==#
GRUB_CMDLINE_LINUX="video=#-os_install_fb_resolution-# #-os_install_kernel_resume-# #-os_install_kernel_attr-# calculate=video:#-os_install_x11_video_drv-# splash=off console=tty1 quiet"
#pkg#
GRUB_GFXMODE="#-os_install_fb_resolution-#"
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.default b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/default.grub.default
similarity index 100%
rename from profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.default
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/default.grub.default
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.usbhdd b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/default.grub.usbhdd
similarity index 100%
rename from profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splashutils/default.grub.usbhdd
rename to profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/grub/splash/default.grub.usbhdd
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/plymouth-calculate-plugin/.calculate_directory b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/plymouth-calculate-plugin/.calculate_directory
new file mode 100644
index 000000000..38b058bb0
--- /dev/null
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/plymouth-calculate-plugin/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate mergepkg()!= append=skip
+
diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth
new file mode 100644
index 000000000..2d351a86f
--- /dev/null
+++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-boot/plymouth-calculate-plugin/calculate.plymouth
@@ -0,0 +1,12 @@
+# Calculate format=kde path=/usr/share/plymouth/themes/calculate
+[calculate]
+#?os_install_locale_lang==ru_RU#
+ShutdownText=З а в е р ш е н и е р а б о т ы
+#os_install_locale_lang#
+#?os_install_locale_lang==fr_FR#
+ShutdownText=A r r ê t e n c o u r s
+#os_install_locale_lang#
+#?os_install_locale_lang!=ru_RU&&os_install_locale_lang!=fr_FR#
+ShutdownText=S h u t t i n g d o w n
+#os_install_locale_lang#
+ShutdownFont=DroidSans #-sum(yres,,#-cut(1,x,#-list(cl_resolutions,0)-#)-#)-##-sum(km,,1000-yres*1000/1080)-##-sum(km,,1000-km/25)-##-sum(km,km*30/1000,km)-#
diff --git a/profiles/templates/3.6/3_ac_install_live/Depends/splash-themes-calculate b/profiles/templates/3.6/3_ac_install_live/Depends/splash-themes-calculate
index 171cd55e0..122ba5faf 100644
--- a/profiles/templates/3.6/3_ac_install_live/Depends/splash-themes-calculate
+++ b/profiles/templates/3.6/3_ac_install_live/Depends/splash-themes-calculate
@@ -1 +1 @@
-# Calculate append=skip merge(media-gfx/splash-themes-calculate)!= merge=sys-boot/grub,media-gfx/splashutils
+# Calculate append=skip merge(media-gfx/splash-themes-calculate)!= merge=sys-boot/grub,media-gfx/splashutils,sys-boot/plymouth-calculate-plugin
diff --git a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config
index 877d2e078..37cb92c4f 100644
--- a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config
+++ b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config
@@ -11,7 +11,11 @@ cld;
/boot/initrd;
#?pkg(media-gfx/splashutils)!=#
#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1;
-#!pkg#
+#pkg#
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)!=#
+#-load(/bootmenu/bootparam.config)-# splash=silent;
+#pkg#
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)==#
#-load(/bootmenu/bootparam.config)-# verbose;
#pkg#
@@ -26,7 +30,11 @@ cld-docache;
/boot/initrd;
#?pkg(media-gfx/splashutils)!=#
#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 docache;
-#!pkg#
+#pkg#
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)!=#
+#-load(/bootmenu/bootparam.config)-# splash=silent docache;
+#pkg#
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)==#
#-load(/bootmenu/bootparam.config)-# verbose docache;
#pkg#
@@ -41,7 +49,11 @@ cld-nox;
/boot/initrd;
#?pkg(media-gfx/splashutils)!=#
#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 nox;
-#!pkg#
+#pkg#
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)!=#
+#-load(/bootmenu/bootparam.config)-# splash=silent nox;
+#pkg#
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)==#
#-load(/bootmenu/bootparam.config)-# verbose nox;
#pkg#
diff --git a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
index 7e7cb6aac..8b3069861 100644
--- a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
+++ b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/desktop.config.gfxboot
@@ -11,8 +11,12 @@ cl;
/boot/initrd;
#?pkg(media-gfx/splashutils)!=#
#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1;
-#!pkg#
-#-load(/bootmenu/bootparam.config)-# splash=off;
+#pkg#
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)!=#
+#-load(/bootmenu/bootparam.config)-# splash=silent;
+#pkg#
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)==#
+#-load(/bootmenu/bootparam.config)-# verbose;
#pkg#
#-livemenu(submenu)-#
diff --git a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/server.config b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/server.config
index cec97422f..b6787b11e 100644
--- a/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/server.config
+++ b/profiles/templates/3.6/6_ac_builder_iso/0_bootmenu/server.config
@@ -7,7 +7,11 @@ cds;
/boot/initrd;
#?pkg(media-gfx/splashutils)!=#
#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1;
-#!pkg#
+#pkg#
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)!=#
+#-load(/bootmenu/bootparam.config)-# splash=silent;
+#pkg#
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)==#
#-load(/bootmenu/bootparam.config)-# verbose;
#pkg#
@@ -18,7 +22,11 @@ cds-docache;
/boot/initrd;
#?pkg(media-gfx/splashutils)!=#
#-load(/bootmenu/bootparam.config)-# splash=silent,theme:calculate console=tty1 docache;
-#!pkg#
+#pkg#
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)!=#
+#-load(/bootmenu/bootparam.config)-# splash=silent docache;
+#pkg#
+#?pkg(media-gfx/splashutils)==&&pkg(sys-boot/plymouth)==#
#-load(/bootmenu/bootparam.config)-# verbose docache;
#pkg#
@@ -28,7 +36,7 @@ cds-nofb;
/boot/vmlinuz;
#?pkg(sys-kernel/dracut)==#root=/dev/ram0#!pkg#root=#-cl_builder_root_param-##pkg#;
/boot/initrd;
-#-load(/bootmenu/bootparam.config)-# verbose splash=off;
+#-load(/bootmenu/bootparam.config)-# rd.plymouth=0 verbose splash=off;
#pkg#
#-livemenu(submenu)-#
diff --git a/profiles/templates/3.6/6_ac_install_configure/themes b/profiles/templates/3.6/6_ac_install_configure/themes
index 4d0048bbb..3fa35e749 100644
--- a/profiles/templates/3.6/6_ac_install_configure/themes
+++ b/profiles/templates/3.6/6_ac_install_configure/themes
@@ -1,2 +1,2 @@
-# Calculate merge=x11-base/xorg-server,media-gfx/splashutils,sys-boot/grub,media-gfx/dm-themes-calculate,lxqt-base/lxqt-common,x11-misc/lightdm-gtk-greeter,x11-themes/gnome-themes-standard,x11-misc/sddm,media-gfx/plasma-themes-calculate,x11-misc/lightdm,gnome-base/gconf,media-gfx/gfxboot-themes-calculate,sys-apps/calculate-utils cl_setup==themes||cl_setup==video||cl_setup== append=skip
+# Calculate merge=x11-base/xorg-server,media-gfx/splashutils,sys-boot/grub,media-gfx/dm-themes-calculate,lxqt-base/lxqt-common,x11-misc/lightdm-gtk-greeter,x11-themes/gnome-themes-standard,x11-misc/sddm,media-gfx/plasma-themes-calculate,x11-misc/lightdm,gnome-base/gconf,media-gfx/gfxboot-themes-calculate,sys-boot/plymouth,sys-boot/plymouth-calculate-plugin,sys-apps/calculate-utils cl_setup==themes||cl_setup==video||cl_setup== append=skip