diff --git a/profiles/templates/3.5/6_ac_update_sync/world/0-ini b/profiles/templates/3.5/6_ac_update_sync/world/0-ini
index 9beff3b..bfe7ab1 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/0-ini
+++ b/profiles/templates/3.5/6_ac_update_sync/world/0-ini
@@ -1,4 +1,4 @@
 # Calculate path=/var/lib/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)==
 
 [overlay-distros]
-world = 20210415
+world = 20210421
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/xfce b/profiles/templates/3.5/6_ac_update_sync/world/create/xfce
index 62de2ac..7a3b426 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/create/xfce
+++ b/profiles/templates/3.5/6_ac_update_sync/world/create/xfce
@@ -4,6 +4,7 @@
 app-arch/xarchiver
 dev-util/catfish
 gnome-extra/polkit-gnome
+sys-power/acpid
 x11-misc/sw-notify-send
 x11-terms/xfce4-terminal
 xfce-base/xfce4-meta
@@ -15,6 +16,7 @@ xfce-extra/xfce4-clipman-plugin
 xfce-extra/xfce4-datetime-plugin
 xfce-extra/xfce4-notifyd
 xfce-extra/xfce4-power-manager
+xfce-extra/xfce4-screensaver
 xfce-extra/xfce4-screenshooter
 xfce-extra/xfce4-taskmanager
 xfce-extra/xfce4-xkb-plugin
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/xorg b/profiles/templates/3.5/6_ac_update_sync/world/create/xorg
index 61b4b5b..a66c368 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/create/xorg
+++ b/profiles/templates/3.5/6_ac_update_sync/world/create/xorg
@@ -8,6 +8,6 @@ app-misc/xorg-meta
 x11-misc/lightdm
 #in#
 
-#?in(os_linux_pkglist, CLDL, CLDX, CLDXS)!=#
+#?in(os_linux_pkglist, CLDL)!=#
 x11-misc/light-locker
 #in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2021/20210421 b/profiles/templates/3.5/6_ac_update_sync/world/update/2021/20210421
new file mode 100644
index 0000000..b96dc25
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_update_sync/world/update/2021/20210421
@@ -0,0 +1,10 @@
+# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
+
+#-ini(overlay-distros.world,#-cut()-#)-#
+
+#?in(os_linux_pkglist, CLDX, CLDXS)!=#
+!x11-misc/light-locker
+#!in#
+sys-power/acpid
+xfce-extra/xfce4-screensaver
+#in#