diff --git a/profiles/calculate/amd64/parent b/profiles/CLC/amd64/parent
similarity index 100%
rename from profiles/calculate/amd64/parent
rename to profiles/CLC/amd64/parent
diff --git a/profiles/calculate/calculate.env b/profiles/CLC/calculate.env
similarity index 60%
rename from profiles/calculate/calculate.env
rename to profiles/CLC/calculate.env
index 57f967e..7778907 100644
--- a/profiles/calculate/calculate.env
+++ b/profiles/CLC/calculate.env
@@ -1,3 +1,3 @@
 [main]
 os_linux_name = 'Calculate Linux Container'
-os_linux_shortname = 'calculate'
+os_linux_shortname = 'CLC'
diff --git a/profiles/calculate/parent b/profiles/CLC/parent
similarity index 100%
rename from profiles/calculate/parent
rename to profiles/CLC/parent
diff --git a/profiles/calculate/x86/parent b/profiles/CLC/x86/parent
similarity index 100%
rename from profiles/calculate/x86/parent
rename to profiles/CLC/x86/parent
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 2176907..998073e 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -7,9 +7,9 @@
 #arch		profile_directory				status
 
 # AMD64 Profiles
-amd64		calculate/amd64					dev
+amd64		CLC/amd64					dev
 
 # x86 Profiles
-x86		calculate/x86					dev
+x86		CLC/x86					dev
 
 # vim: set ts=8
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/create/base b/profiles/templates/3.5/6_ac_update_sync/world/create/base
index 46d6774..f3d720a 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/create/base
+++ b/profiles/templates/3.5/6_ac_update_sync/world/create/base
@@ -1,6 +1,6 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, calculate)!=#
+#?in(os_linux_pkglist, CLC)!=#
 !sys-boot/grub:2
 !sys-boot/os-prober
 !sys-kernel/calculate-sources
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory
deleted file mode 100644
index 86029cf..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip ini(overlay-distros.world)<20160101
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/209 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/209
deleted file mode 100644
index 465455f..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/209
+++ /dev/null
@@ -1,24 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLSK)!=#
-app-admin/sudo
-sys-apps/memtest86+
-sys-devel/prelink
-#in#
-
-#?in(os_linux_pkglist, CLDX+)!=#
-games-action/oolite
-x11-misc/idesk
-x11-misc/idesk-extras
-x11-misc/xvkbd
-x11-wm/dwm
-x11-wm/jwm
-#in#
-
-#?in(os_linux_pkglist, CDS+)!=#
-!net-p2p/btpd
-sys-apps/iucode_tool
-sys-apps/microcode-ctl
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/214 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/214
deleted file mode 100644
index 0c2c465..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/214
+++ /dev/null
@@ -1,25 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLDM)!=#
-!mate-extra/mate-user-guide
-#in#
-
-#?in(os_linux_pkglist, CLDM, CLDX+)!=#
-mate-extra/caja-extensions
-#in#
-
-#?in(os_linux_pkglist, CLD+)!=#
-mail-mta/ssmtp
-#in#
-
-#?in(os_linux_pkglist, CLDX+)!=#
-!media-sound/flacon
-gnome-base/dconf-editor
-mate-extra/caja-dropbox
-mate-extra/mate-user-guide
-net-im/gajim
-x11-themes/smplayer-skins
-x11-themes/smplayer-themes
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/218 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/218
deleted file mode 100644
index 8241550..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/218
+++ /dev/null
@@ -1,16 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=#
-!media-video/smtube
-media-video/smplayer
-#in#
-
-#?in(os_linux_pkglist, CLD, CLDX)!=#
-!mate-extra/mate-user-guide
-#in#
-
-#?in(os_linux_pkglist, CLDM)!=#
-mate-extra/mate-user-guide
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/219 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/219
deleted file mode 100644
index ee640e2..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/219
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLSK)!=#
-kde-apps/kde-l10n
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/233 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/233
deleted file mode 100644
index 51666be..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/233
+++ /dev/null
@@ -1,26 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLDX+, CDS+)!=#
-!net-p2p/bittorrent
-#in#
-
-#?in(os_linux_pkglist, CLDX+)!=#
-!media-sound/ardour
-!net-im/mcabber
-games-strategy/0ad
-lxqt-base/lxqt-sudo
-media-gfx/freecad
-media-gfx/librecad
-media-video/pitivi
-sys-power/powertop
-www-client/vivaldi
-www-plugins/adobe-flash
-x11-terms/qterminal
-#in#
-
-#?in(os_linux_pkglist, CDS+)!=#
-net-misc/minidlna
-www-client/w3m
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/234 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/234
deleted file mode 100644
index d574fc2..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/234
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK)!=&&pkg(www-client/qupzilla)!=#
-www-plugins/adobe-flash
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/238 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/238
deleted file mode 100644
index e76763e..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/238
+++ /dev/null
@@ -1,26 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=#
-!x11-themes/calculate-xcursors
-#in#
-
-#?in(os_linux_pkglist, CLD+)!=#
-!www-client/qupzilla
-www-plugins/adobe-flash
-#in#
-
-#?in(os_linux_pkglist, CLDX+)!=#
-app-admin/sysstat
-app-benchmarks/bootchart2
-dev-db/mysql-workbench
-net-analyzer/mbrowse
-net-misc/badvpn
-sys-fs/cryptsetup
-sys-process/atop
-#in#
-
-#?in(os_linux_pkglist, CDS+)!=#
-app-benchmarks/bootchart2
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/240 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/240
deleted file mode 100644
index e50f1cf..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/240
+++ /dev/null
@@ -1,17 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLSK, CLDX+)!=#
-!x11-themes/gnome-breeze
-#in#
-
-#?in(os_linux_pkglist, CLDX+)!=#
-!sci-geosciences/qgis
-#in#
-
-#?in(os_linux_pkglist, CLSK)!=#
-kde-apps/ark
-kde-apps/gwenview
-kde-apps/kcalc
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/241 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/241
deleted file mode 100644
index 4323b90..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/241
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC, CLSK, CLS)!=#
-sys-firmware/amdgpu-ucode
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/242 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/242
deleted file mode 100644
index ca3a120..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/242
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK)!=#
-#!net-ftp/filezilla
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/243 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/243
deleted file mode 100644
index bcdaa7c..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/243
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD)!=#
-kde-base/legacy-icons
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/245 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/245
deleted file mode 100644
index 5b97994..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/245
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLSK)!=#
-!kde-apps/ksnapshot
-kde-apps/spectacle
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/246 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/246
deleted file mode 100644
index 550aea5..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/246
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CMC, CLSK, CLS)!=#
-!sys-firmware/amdgpu-ucode
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/248 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/248
deleted file mode 100644
index e5f96b0..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/248
+++ /dev/null
@@ -1,75 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CMC)!=#
-!sys-devel/prelink
-#in#
-
-#?in(os_linux_pkglist, CLD)!=#
-!kde-apps/kcontrol
-!kde-apps/kde-apps-meta
-!kde-apps/kde-apps-meta
-!kde-apps/kdeartwork-styles
-!kde-apps/kdeedu-meta
-!kde-apps/kdegraphics-meta
-!kde-apps/kde-meta
-!kde-apps/kdepasswd
-!kde-apps/kdepim-icons
-!kde-apps/kdepim-icons
-!kde-apps/kdepim-wizards
-!kde-apps/kmix
-!kde-apps/ksnapshot
-!kde-apps/libkdeedu
-!kde-apps/libkdepim
-!kde-apps/libkgeomap
-!kde-apps/libkleo
-!kde-apps/libkpgp
-!kde-apps/marble
-
-!kde-base/freespacenotifier
-!kde-base/kcheckpass
-!kde-base/kcminit
-!kde-base/kdebase-cursors
-!kde-base/kdebase-startkde
-!kde-base/kdeplasma-addons
-!kde-base/kdm
-!kde-base/kephal
-!kde-base/khotkeys
-!kde-base/kinfocenter
-!kde-base/klipper
-!kde-base/kmenuedit
-!kde-base/krunner
-!kde-base/kscreensaver
-!kde-base/ksmserver
-!kde-base/ksplash
-!kde-base/kstartupconfig
-!kde-base/kstyles
-!kde-base/ksysguard
-!kde-base/ksystraycmd
-!kde-base/kwin
-!kde-base/kwrited
-!kde-base/legacy-icons
-!kde-base/libkworkspace
-!kde-base/liboxygenstyle
-!kde-base/libplasmaclock
-!kde-base/libplasmagenericshell
-!kde-base/libtaskmanager
-!kde-base/plasma-workspace
-!kde-base/powerdevil
-!kde-base/solid-actions-kcm
-!kde-base/systemsettings
-
-!kde-misc/synaptiks
-!media-gfx/kdm-themes-calculate
-!media-video/dvdauthor
-!media-video/dvgrab
-!media-video/kffmpegthumbnailer
-!x11-themes/oxygen-gtk:2
-!x11-themes/oxygen-gtk:3
-
-kde-apps/kde-l10n
-kde-apps/spectacle
-kde-plasma/plasma-meta
-media-gfx/plasma-themes-calculate
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/250 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/250
deleted file mode 100644
index 925aa00..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/250
+++ /dev/null
@@ -1,11 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD)!=#
-kde-apps/okular
-#in#
-
-#?in(os_linux_pkglist, CDS)!=#
-!net-proxy/havp
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/251 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/251
deleted file mode 100644
index 61b8e2c..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/251
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDM, CLDX)!=#
-!sys-apps/preload
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/252 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/252
deleted file mode 100644
index 5375f0f..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/252
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLDM, CLDX)!=#
-app-text/fbreader
-#in#
-
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/253 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/253
deleted file mode 100644
index 9bbd3f2..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/253
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD)!=#
-kde-apps/kwalletd
-#in#
-
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/254 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/254
deleted file mode 100644
index 85ce03d..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/254
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLDM)!=#
-!net-analyzer/mate-netspeed
-#in#
-
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/255 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/255
deleted file mode 100644
index c7cb05b..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/255
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD)!=#
-kde-apps/kmix
-#in#
-
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/256 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/256
deleted file mode 100644
index 5d4f6cd..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/256
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLDX)!=#
-media-sound/qastools
-#in#
-
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/257 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/257
deleted file mode 100644
index 738aadf..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/257
+++ /dev/null
@@ -1,12 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLDL)!=#
-!x11-misc/sddm
-!x11-misc/xscreensaver
-media-gfx/lightdm-themes-calculate
-x11-misc/lightdm
-x11-misc/light-locker
-#in#
-
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/258 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/258
deleted file mode 100644
index 34b9cbf..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/258
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD)!=#
-!kde-apps/kdepim-l10n
-kde-apps/kdepim-l10n:4
-#in#
-
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/259 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/259
deleted file mode 100644
index 1928825..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/259
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS, CLS, CSS, CMC)!=#
-app-shells/bash-completion
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/260 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/260
deleted file mode 100644
index 1b8c20c..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/260
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLDC)!=#
-!media-gfx/xsane
-media-gfx/simple-scan
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/261 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/261
deleted file mode 100644
index 1bf12e7..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/261
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CDS)!=#
-app-vim/colorschemes
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/262 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/262
deleted file mode 100644
index fd92379..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/262
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=&&pkg(www-plugins/chrome-binary-plugins)==&&pkg(www-client/google-chrome)==&&pkg(www-client/google-chrome-beta)==&&pkg(www-client/google-chrome-unstable)==#
-www-plugins/adobe-flash
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/263 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/263
deleted file mode 100644
index d49e667..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/263
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLDM)!=#
-mate-extra/mate-calc
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/264 b/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/264
deleted file mode 100644
index 9728f1e..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/100-old/264
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, calculate)!=#
-!media-gfx/syslinux-themes-calculate
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory
deleted file mode 100644
index b938c51..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip ini(overlay-distros.world)<20170101
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/20161220.3 b/profiles/templates/3.5/6_ac_update_sync/world/update/2016/20161220.3
deleted file mode 100644
index b5f54c4..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/20161220.3
+++ /dev/null
@@ -1,14 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, calculate)!=#
-!kde-apps/kopete
-#in#
-#?in(os_linux_pkglist, CLD)!=#
-kde-apps/kdepim-runtime
-kde-apps/kmail-account-wizard
-kde-apps/kontact
-kde-apps/korganizer
-kde-apps/plasma-telepathy-meta
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/20161222 b/profiles/templates/3.5/6_ac_update_sync/world/update/2016/20161222
deleted file mode 100644
index 85e6299..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/20161222
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLDM)!=#
-!mate-extra/mate-calc
-media-gfx/mate-themes-calculate
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/20161226 b/profiles/templates/3.5/6_ac_update_sync/world/update/2016/20161226
deleted file mode 100644
index 57f8249..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/20161226
+++ /dev/null
@@ -1,9 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD)!=#
-!kde-apps/kde4-l10n
-!kde-apps/kdepim-l10n:4
-!kde-apps/kwalletd
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/20161226.2 b/profiles/templates/3.5/6_ac_update_sync/world/update/2016/20161226.2
deleted file mode 100644
index 6fc6463..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/2016/20161226.2
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD)!=#
-kde-apps/kdepim-l10n
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/.calculate_directory b/profiles/templates/3.5/6_ac_update_sync/world/update/2017/.calculate_directory
index ca5399e..e17e107 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/.calculate_directory
+++ b/profiles/templates/3.5/6_ac_update_sync/world/update/2017/.calculate_directory
@@ -1 +1 @@
-# Calculate append=skip ini(overlay-distros.world)<20180101
+# Calculate append=skip ini(overlay-container.world)<20180101
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170203 b/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170203
deleted file mode 100644
index 8ae08fa..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170203
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLDC)!=#
-gnome-extra/nemo-fileroller
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170310 b/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170310
deleted file mode 100644
index fb00fee..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170310
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD)!=#
-!app-cdr/k3b
-kde-apps/k3b
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170322 b/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170322
deleted file mode 100644
index 6a32442..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170322
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM)!=#
-!sys-power/upower-pm-utils
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170324 b/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170324
deleted file mode 100644
index 1c1f3d4..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170324
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=#
-media-gfx/splash-themes-calculate
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170329 b/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170329
deleted file mode 100644
index 5c39d99..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170329
+++ /dev/null
@@ -1,7 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX)!=#
-sys-power/upower
-#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170424 b/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170424
deleted file mode 100644
index c65a1e8..0000000
--- a/profiles/templates/3.5/6_ac_update_sync/world/update/2017/20170424
+++ /dev/null
@@ -1,8 +0,0 @@
-# Calculate format=world name=world ini(overlay-distros.world)<#-cut()-#
-
-#-ini(overlay-distros.world,#-cut()-#)-#
-
-#?in(os_linux_pkglist, CLD)!=#
-!kde-apps/kde-l10n
-!kde-apps/kdepim-l10n
-#in#