diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/boot/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory
similarity index 100%
rename from profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/boot/.calculate_directory
rename to profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/boot/.calculate_directory
diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/boot/xdm b/profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/boot/xdm
similarity index 100%
rename from profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/boot/xdm
rename to profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/boot/xdm
diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/boot/xdm.del b/profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del
similarity index 100%
rename from profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/boot/xdm.del
rename to profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/boot/xdm.del
diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/default/.calculate_directory b/profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory
similarity index 100%
rename from profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/default/.calculate_directory
rename to profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/default/.calculate_directory
diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/default/xdm.del b/profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/default/xdm.del
similarity index 100%
rename from profiles/templates/3.1/3_ac_install_live/1-live/x11-base/xorg-server/default/xdm.del
rename to profiles/templates/3.1/2_ac_install_merge/x11-base/xorg-server/default/xdm.del
diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/boot/preload b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/boot/preload
index 90019111b..8afb1e88b 100644
--- a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/boot/preload
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/boot/preload
@@ -1 +1 @@
-# Calculate link=/etc/init.d/preload symbolic os_install_root_type!=livecd
+# Calculate append=remove
diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/.calculate_directory b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/.calculate_directory
new file mode 100644
index 000000000..0f7257bce
--- /dev/null
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate path=/etc/runlevels
+
diff --git a/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/preload b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/preload
new file mode 100644
index 000000000..90019111b
--- /dev/null
+++ b/profiles/templates/3.1/3_ac_install_live/1-live/sys-apps/preload/default/preload
@@ -0,0 +1 @@
+# Calculate link=/etc/init.d/preload symbolic os_install_root_type!=livecd
diff --git a/profiles/templates/3.1/6_ac_update_sync/revision/21 b/profiles/templates/3.1/6_ac_update_sync/revision/21
new file mode 100644
index 000000000..656d15a42
--- /dev/null
+++ b/profiles/templates/3.1/6_ac_update_sync/revision/21
@@ -0,0 +1,5 @@
+# Calculate ini(update.rev)<21 format=samba path=/etc/calculate name=ini.env merge=x11-base/xorg-server,sys-auth/nss_ldap,sys-apps/prelink
+
+# update rules
+[update]
+rev = 21