diff --git a/profiles/templates/3.2/6_ac_update_sync/world/0-ini b/profiles/templates/3.2/6_ac_update_sync/world/0-ini
index 60db1cd..03fde32 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/0-ini
+++ b/profiles/templates/3.2/6_ac_update_sync/world/0-ini
@@ -1,4 +1,4 @@
-# Calculate path=/etc/calculate name=ini.env format=samba cl_update_world!=update||ini(overlay-distros.world)==
+# Calculate path=/etc/calculate name=ini.env format=samba cl_update_world==rebuild||cl_update_world==merge||ini(overlay-distros.world)==
 
 [overlay-distros]
-world = 17
+world = 18
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/07 b/profiles/templates/3.2/6_ac_update_sync/world/update/07
deleted file mode 100644
index 432abc6..0000000
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/07
+++ /dev/null
@@ -1,21 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<7
-
-#-ini(overlay-distros.world,7)-#
-
-!media-gfx/splash-themes-calculate
-!media-gfx/splashutils
-#?pkg(sys-kernel/calculate-sources-dev)!=#
-!sys-kernel/calculate-sources-dev
-sys-kernel/calculate-sources
-#pkg#
-
-sys-auth/pam_update
-
-#?in(os_linux_pkglist,CLD,CLDX)!=#
-sys-apps/keyexec
-dev-qt/qtdbus
-#in#
-
-#?in(os_linux_pkglist,CLDX)!=#
-media-gfx/lightdm-themes-calculate
-#in#
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/08 b/profiles/templates/3.2/6_ac_update_sync/world/update/08
deleted file mode 100644
index c03d0f4..0000000
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/08
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<8
-
-#-ini(overlay-distros.world,8)-#
-
-#?in(os_linux_pkglist, CLD, CLDX, CMC)!=#
-!sys-power/cpufrequtils
-sys-power/cpupower
-#in#
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/09 b/profiles/templates/3.2/6_ac_update_sync/world/update/09
deleted file mode 100644
index 724f229..0000000
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/09
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<9
-
-#-ini(overlay-distros.world,9)-#
-
-#?in(os_linux_pkglist, CLD, CLDX)!=#
-!sys-auth/thinkfinger
-#in#
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/11 b/profiles/templates/3.2/6_ac_update_sync/world/update/11
deleted file mode 100644
index a607ed8..0000000
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/11
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<11
-
-#-ini(overlay-distros.world,11)-#
-
-#?in(os_linux_pkglist, CLDX)!=#
-!media-gfx/eog
-!net-news/liferea
-!app-text/evince
-media-gfx/nomacs
-app-text/qpdfview
-#in#
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/12 b/profiles/templates/3.2/6_ac_update_sync/world/update/12
deleted file mode 100644
index eacecd6..0000000
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/12
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<12
-
-#-ini(overlay-distros.world,12)-#
-
-#?in(os_linux_pkglist, CLDX)!=#
-!media-gfx/shotwell
-!media-gfx/gtkam
-#in#
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/13 b/profiles/templates/3.2/6_ac_update_sync/world/update/13
deleted file mode 100644
index 256019b..0000000
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/13
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<13
-
-#-ini(overlay-distros.world,13)-#
-
-#?in(os_linux_pkglist, CLS)!=#
-!media-gfx/calculate-wallpapers
-#in#
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/14 b/profiles/templates/3.2/6_ac_update_sync/world/update/14
deleted file mode 100644
index 6dbc4fa..0000000
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/14
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<14
-
-#-ini(overlay-distros.world,14)-#
-
-#?in(os_linux_pkglist, CLD, CLDX, CMC)!=#
-!sys-power/acpid
-#in#
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/15 b/profiles/templates/3.2/6_ac_update_sync/world/update/15
deleted file mode 100644
index b4f6beb..0000000
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/15
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<15
-
-#-ini(overlay-distros.world,15)-#
-
-#?in(os_linux_pkglist, CLD, CLDX)!=#
-!net-wireless/madwimax
-#in#
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/16 b/profiles/templates/3.2/6_ac_update_sync/world/update/16
deleted file mode 100644
index a35041e..0000000
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/16
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<16
-
-#-ini(overlay-distros.world,16)-#
-
-#?in(os_linux_pkglist, CLS)!=#
-media-video/ffmpeg
-#in#
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/17 b/profiles/templates/3.2/6_ac_update_sync/world/update/17
deleted file mode 100644
index 5e073d0..0000000
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/17
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<17
-
-#-ini(overlay-distros.world,17)-#
-
-#?in(os_linux_pkglist, CLD, CLDX, CMC, CDS, CSS, CLS)!=#
-dev-util/ccache
-#in#
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/update/10 b/profiles/templates/3.2/6_ac_update_sync/world/update/18
similarity index 50%
rename from profiles/templates/3.2/6_ac_update_sync/world/update/10
rename to profiles/templates/3.2/6_ac_update_sync/world/update/18
index e8fe50a..0bf0132 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/update/10
+++ b/profiles/templates/3.2/6_ac_update_sync/world/update/18
@@ -1,6 +1,11 @@
-# Calculate format=world name=world ini(overlay-distros.world)<10
+# Calculate format=world name=world ini(overlay-distros.world)<15
 
-#-ini(overlay-distros.world,10)-#
+#-ini(overlay-distros.world,15)-#
+
+#?pkg(sys-kernel/calculate-sources-dev)!=#
+!sys-kernel/calculate-sources-dev
+sys-kernel/calculate-sources
+#pkg#
 
 #?in(os_linux_pkglist, base)!=#
 !app-i18n/man-pages-de
@@ -9,6 +14,19 @@
 !app-i18n/man-pages-pl
 !app-i18n/man-pages-ro
 !app-i18n/man-pages-ru
+!media-gfx/splash-themes-calculate
+!media-gfx/splashutils
+sys-auth/pam_update
+#in#
+
+#?in(os_linux_pkglist, CLD, CLDX, CMC, CDS, CSS, CLS)!=#
+dev-util/ccache
+#in#
+
+#?in(os_linux_pkglist, CLD, CLDX, CMC)!=#
+!sys-power/acpid
+!sys-power/cpufrequtils
+sys-power/cpupower
 #in#
 
 #?in(os_linux_pkglist, CLD, CLDX)!=#
@@ -23,7 +41,6 @@
 !app-dicts/aspell-ro
 !app-dicts/aspell-ru
 !app-dicts/aspell-uk
-
 !app-dicts/myspell-bg
 !app-dicts/myspell-de
 !app-dicts/myspell-en
@@ -36,4 +53,24 @@
 !app-dicts/myspell-ro
 !app-dicts/myspell-ru
 !app-dicts/myspell-uk
+!net-wireless/madwimax
+!sys-auth/thinkfinger
+dev-qt/qtdbus
+sys-apps/keyexec
+#in#
+
+#?in(os_linux_pkglist, CLDX)!=#
+!app-text/evince
+!media-gfx/eog
+!media-gfx/gtkam
+!media-gfx/shotwell
+!net-news/liferea
+app-text/qpdfview
+media-gfx/lightdm-themes-calculate
+media-gfx/nomacs
+#in#
+
+#?in(os_linux_pkglist, CLS)!=#
+!media-gfx/calculate-wallpapers
+media-video/ffmpeg
 #in#