diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/app-benchmarks b/profiles/templates/3.5/6_ac_update_sync/world/grp/app-benchmarks
new file mode 100644
index 00000000..62a0dd66
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/app-benchmarks
@@ -0,0 +1,26 @@
+# Calculate name=world format=world
+
+#?in(os_linux_pkglist, CBE)!=#
+app-benchmarks/acovea
+app-benchmarks/bashmark
+app-benchmarks/bonnie
+app-benchmarks/bonnie++
+app-benchmarks/bootchart2
+app-benchmarks/contest
+app-benchmarks/cpuburn
+app-benchmarks/dbench
+app-benchmarks/httperf
+app-benchmarks/i7z
+app-benchmarks/iozone
+app-benchmarks/jmeter
+app-benchmarks/nbench
+app-benchmarks/pipebench
+app-benchmarks/ramspeed
+app-benchmarks/siege
+app-benchmarks/spew
+app-benchmarks/stress
+app-benchmarks/sysbench
+app-benchmarks/tiobench
+app-benchmarks/volanomark
+app-benchmarks/wrk
+#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/app-crypt b/profiles/templates/3.5/6_ac_update_sync/world/grp/app-crypt
new file mode 100644
index 00000000..357cd363
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/app-crypt
@@ -0,0 +1,67 @@
+# Calculate name=world format=world
+
+#?in(os_linux_pkglist, CBD)!=#
+app-crypt/kencfs
+#in#
+
+#?in(os_linux_pkglist, CBE)!=#
+app-crypt/acme
+app-crypt/aespipe
+app-crypt/bcwipe
+app-crypt/ccid
+app-crypt/ccrypt
+app-crypt/certbot
+app-crypt/certbot-apache
+app-crypt/certbot-nginx
+app-crypt/easy-rsa
+app-crypt/gcr
+app-crypt/gentoo-keys
+app-crypt/gnupg
+app-crypt/gorilla
+app-crypt/gpa
+app-crypt/gpgme
+app-crypt/gpg-ringmgr
+app-crypt/hashalot
+#app-crypt/heimdal
+app-crypt/jacksum
+app-crypt/johntheripper
+app-crypt/keybase
+app-crypt/keylookup
+app-crypt/keynote
+app-crypt/kstart
+app-crypt/libmd
+app-crypt/libscrypt
+app-crypt/libsecret
+app-crypt/mcrypt
+app-crypt/md5deep
+app-crypt/md6sum
+app-crypt/mhash
+app-crypt/mit-krb5
+app-crypt/mit-krb5-appl
+app-crypt/monkeysphere
+app-crypt/openssl-blacklist
+app-crypt/p11-kit
+app-crypt/paperkey
+app-crypt/pgpdump
+app-crypt/pinentry
+app-crypt/qca
+app-crypt/quickcrypt
+app-crypt/rotix
+app-crypt/sbsigntool
+app-crypt/seahorse
+app-crypt/seahorse-sharing
+app-crypt/shash
+app-crypt/shim-signed
+app-crypt/sign
+app-crypt/signing-party
+app-crypt/ssh-multiadd
+app-crypt/stan
+app-crypt/stoken
+app-crypt/tinyca
+app-crypt/tpm-tools
+app-crypt/trousers
+app-crypt/veracrypt
+app-crypt/WiRouterKeyRec
+app-crypt/xca
+app-crypt/xor-analyze
+#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-util b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-util
index fb186716..a9d956f6 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-util
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-util
@@ -67,7 +67,6 @@ dev-util/debhelper
 dev-util/debootstrap
 dev-util/debugedit
 dev-util/dejagnu
-dev-util/CBD-file-utils
 dev-util/devhelp
 dev-util/d-feet
 dev-util/dialog
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/gnome b/profiles/templates/3.5/6_ac_update_sync/world/grp/gnome
index 9aad83bb..b39196b6 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/gnome
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/gnome
@@ -1,7 +1,6 @@
 # Calculate name=world format=world
 
 #?in(os_linux_pkglist, CBD)!=#
-app-crypt/seahorse
 app-editors/gedit
 media-gfx/cinnamon-themes-calculate
 media-gfx/eog
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/net-nntp b/profiles/templates/3.5/6_ac_update_sync/world/grp/net-nntp
new file mode 100644
index 00000000..bd4ef387
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/net-nntp
@@ -0,0 +1,15 @@
+# Calculate name=world format=world
+
+#?in(os_linux_pkglist, CBD)!=#
+net-nntp/kwooty
+#in#
+
+#?in(os_linux_pkglist, CBE)!=#
+net-nntp/inn
+net-nntp/leafnode
+net-nntp/newspost
+net-nntp/nzbget
+net-nntp/pan
+net-nntp/slrn
+net-nntp/tin
+#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/net-print b/profiles/templates/3.5/6_ac_update_sync/world/grp/net-print
index 038d2818..d2e53cec 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/net-print
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/net-print
@@ -27,5 +27,5 @@ net-print/magicfilter
 net-print/mtink
 net-print/poster
 net-print/splix
-net-print/xerox-drivers
+#net-print/xerox-drivers
 #in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/tools b/profiles/templates/3.5/6_ac_update_sync/world/grp/tools
index ea3df244..e1fd9aa9 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/tools
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/tools
@@ -11,11 +11,6 @@ sys-fs/ntfs3g
 
 #?in(os_linux_pkglist, CBD)!=#
 app-antivirus/clamav
-app-crypt/certbot
-app-crypt/certbot-apache
-app-crypt/certbot-nginx
-app-crypt/pgpdump
-app-crypt/veracrypt
 app-forensics/rkhunter
 app-pda/usbmuxd
 app-shells/bash-completion