diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-lang b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-lang
index 0c2e76ce..85e718fc 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-lang
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-lang
@@ -1,60 +1,10 @@
 # Calculate name=world format=world
 
 #?in(os_linux_pkglist, CBB)!=#
-dev-lang/clojure:1.6
-dev-lang/clojure:1.7
-dev-lang/coffee-script
-dev-lang/elixir
-dev-lang/erlang
-dev-lang/execline
-dev-lang/f2c
-dev-lang/ferite
-dev-lang/fpc
-dev-lang/ghc
-dev-lang/go
-dev-lang/gprolog
-dev-lang/icon
-dev-lang/inform
-dev-lang/jimtcl
-dev-lang/lazarus
-dev-lang/lua
-dev-lang/luajit
-#dev-lang/mercury
-#dev-lang/mercury-extras
-dev-lang/mmix
-dev-lang/mono
-#dev-lang/mono-basic
-dev-lang/mujs
-dev-lang/nasm
-dev-lang/ocaml
-dev-lang/orc
-dev-lang/perl
-dev-lang/php:5.6
-dev-lang/php:7.0
-dev-lang/python:2.7
-dev-lang/python:3.4
-dev-lang/python-exec
-dev-lang/qu-prolog
-dev-lang/R
-dev-lang/ruby:2.1
-dev-lang/ruby:2.2
-dev-lang/rust
-dev-lang/scala
-#dev-lang/scala-bin
-dev-lang/spidermonkey:0
-dev-lang/spidermonkey:17
-dev-lang/spidermonkey:24
-dev-lang/spidermonkey:38
-dev-lang/squirrel
-dev-lang/swig:0
-dev-lang/swig:1
-dev-lang/swi-prolog
-dev-lang/tcl
-dev-lang/tk
-dev-lang/tuprolog
-dev-lang/vala:0.32
-dev-lang/vala:0.34
-#dev-lang/xsb
-dev-lang/yap
-dev-lang/yasm
+#-world(dev-lang)-#
+!dev-lang/mercury
+!dev-lang/mercury-extras
+!dev-lang/mono-basic
+!dev-lang/scala-bin
+!dev-lang/xsb
 #in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-qt b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-qt
index 605e3bf8..357b15e1 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-qt
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/dev-qt
@@ -1,80 +1,8 @@
 # Calculate name=world format=world
 
 #?in(os_linux_pkglist, CBB)!=#
-dev-qt/assistant:4
-dev-qt/assistant:5
-dev-qt/designer:4
-dev-qt/designer:5
-dev-qt/linguist:4
-dev-qt/linguist:5
-dev-qt/linguist-tools
-dev-qt/pixeltool:4
-dev-qt/pixeltool:5
-dev-qt/qdbus
-dev-qt/qdbusviewer:4
-dev-qt/qdbusviewer:5
-dev-qt/qdoc
-dev-qt/qt3support
-dev-qt/qtbearer
-dev-qt/qtbluetooth
-dev-qt/qtchooser
-dev-qt/qtconcurrent
-dev-qt/qtcore:4
-dev-qt/qtcore:5
-dev-qt/qt-creator
-dev-qt/qtdbus:4
-dev-qt/qtdbus:5
-dev-qt/qtdeclarative:4
-dev-qt/qtdeclarative:5
-dev-qt/qtdemo
-dev-qt/qtdiag
-dev-qt/qt-docs
-dev-qt/qtgraphicaleffects
-dev-qt/qtgui:4
-dev-qt/qtgui:5
-dev-qt/qthelp:4
-dev-qt/qthelp:5
-dev-qt/qtimageformats
-dev-qt/qtlocation
-dev-qt/qtlockedfile
-dev-qt/qt-meta
-dev-qt/qt-mobility
-dev-qt/qtmultimedia:4
-dev-qt/qtmultimedia:5
-dev-qt/qtnetwork
-dev-qt/qtopengl:4
-dev-qt/qtopengl:5
-dev-qt/qtpaths
-#dev-qt/qtphonon
-dev-qt/qtplugininfo
-dev-qt/qtpositioning
-dev-qt/qtprintsupport
-dev-qt/qtquickcontrols
-dev-qt/qtquickcontrols2
-dev-qt/qtscript:4
-dev-qt/qtscript:5
-dev-qt/qtsensors
-dev-qt/qtserialport
-dev-qt/qtsingleapplication
-dev-qt/qtsql:4
-dev-qt/qtsql:5
-dev-qt/qtsvg:4
-dev-qt/qtsvg:5
-dev-qt/qttest:4
-dev-qt/qttest:5
-dev-qt/qttranslations:4
-dev-qt/qttranslations:5
-dev-qt/qtwayland
-dev-qt/qtwebchannel
-dev-qt/qtwebengine
-dev-qt/qtwebkit:4
-dev-qt/qtwebkit:5
-dev-qt/qtwebsockets
-dev-qt/qtwidgets
-dev-qt/qtx11extras
-dev-qt/qtxml
-dev-qt/qtxmlpatterns:4
-dev-qt/qtxmlpatterns:5
+#-world(dev-qt)-#
+!dev-qt/qtphonon
 #in#
 
 #?in(os_linux_pkglist, CBD)!=#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/media-plugins b/profiles/templates/3.5/6_ac_update_sync/world/grp/media-plugins
index a10c06d6..70b531cd 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/media-plugins
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/media-plugins
@@ -1,277 +1,13 @@
 # Calculate name=world format=world
 
 #?in(os_linux_pkglist, CBB)!=#
-media-plugins/alsaequal
-media-plugins/alsa-plugins
-media-plugins/amb-plugins
-media-plugins/audacious-plugins
-media-plugins/caps-plugins
-media-plugins/emotion_generic_players
-media-plugins/evas_generic_loaders
-media-plugins/fil-plugins
-media-plugins/frei0r-plugins
-media-plugins/gimp-lqr
-media-plugins/gkrellmpc
-media-plugins/gmpc-alarm
-media-plugins/gmpc-albumview
-media-plugins/gmpc-avahi
-media-plugins/gmpc-awn
-media-plugins/gmpc-discogs
-media-plugins/gmpc-extraplaylist
-media-plugins/gmpc-jamendo
-media-plugins/gmpc-last-fm
-media-plugins/gmpc-libnotify
-media-plugins/gmpc-lyrics
-media-plugins/gmpc-lyricwiki
-media-plugins/gmpc-magnatune
-media-plugins/gmpc-mdcover
-media-plugins/gmpc-mmkeys
-media-plugins/gmpc-playlistsort
-media-plugins/gmpc-shout
-media-plugins/gmpc-tagedit
-media-plugins/grilo-plugins:0.2
-media-plugins/grilo-plugins:0.3
-media-plugins/gst-plugins-a52dec:0.10
-media-plugins/gst-plugins-a52dec:1.0
-media-plugins/gst-plugins-alsa
-media-plugins/gst-plugins-amr:0.10
-media-plugins/gst-plugins-amr:1.0
-media-plugins/gst-plugins-annodex
-media-plugins/gst-plugins-assrender:0.10
-media-plugins/gst-plugins-assrender:1.0
-media-plugins/gst-plugins-bluez
-media-plugins/gst-plugins-cdio:0.10
-media-plugins/gst-plugins-cdio:1.0
-media-plugins/gst-plugins-cdparanoia:0.10
-media-plugins/gst-plugins-cdparanoia:1.0
-media-plugins/gst-plugins-dash
-media-plugins/gst-plugins-dtls
-media-plugins/gst-plugins-dts:0.10
-media-plugins/gst-plugins-dts:1.0
-media-plugins/gst-plugins-dv:0.10
-media-plugins/gst-plugins-dv:1.0
-media-plugins/gst-plugins-dvb:0.10
-media-plugins/gst-plugins-dvb:1.0
-media-plugins/gst-plugins-dvdread:0.10
-media-plugins/gst-plugins-dvdread:1.0
-media-plugins/gst-plugins-faac:0.10
-media-plugins/gst-plugins-faac:1.0
-media-plugins/gst-plugins-faad:0.10
-media-plugins/gst-plugins-faad:1.0
-media-plugins/gst-plugins-flac:0.10
-media-plugins/gst-plugins-flac:1.0
-media-plugins/gst-plugins-gconf
-media-plugins/gst-plugins-gdkpixbuf:0.10
-media-plugins/gst-plugins-gdkpixbuf:1.0
-media-plugins/gst-plugins-gio
-media-plugins/gst-plugins-gl
-media-plugins/gst-plugins-gnomevfs
-media-plugins/gst-plugins-gsm
-media-plugins/gst-plugins-hls
-media-plugins/gst-plugins-ivorbis
-media-plugins/gst-plugins-jack:0.10
-media-plugins/gst-plugins-jack:1.0
-media-plugins/gst-plugins-jpeg:0.10
-media-plugins/gst-plugins-jpeg:1.0
-media-plugins/gst-plugins-ladspa
-media-plugins/gst-plugins-lame:0.10
-media-plugins/gst-plugins-lame:1.0
-media-plugins/gst-plugins-libav
-media-plugins/gst-plugins-libde265
-media-plugins/gst-plugins-libmms:0.10
-media-plugins/gst-plugins-libmms:1.0
-media-plugins/gst-plugins-libnice:0.10
-media-plugins/gst-plugins-libnice:1.0
-media-plugins/gst-plugins-libpng:0.10
-media-plugins/gst-plugins-libpng:1.0
-media-plugins/gst-plugins-libvisual:0.10
-media-plugins/gst-plugins-libvisual:1.0
-media-plugins/gst-plugins-mad:0.10
-media-plugins/gst-plugins-mad:1.0
-media-plugins/gst-plugins-meta:0.10
-media-plugins/gst-plugins-meta:1.0
-media-plugins/gst-plugins-modplug:0.10
-media-plugins/gst-plugins-modplug:1.0
-media-plugins/gst-plugins-mpeg2dec:0.10
-media-plugins/gst-plugins-mpeg2dec:1.0
-media-plugins/gst-plugins-mpeg2enc:0.10
-media-plugins/gst-plugins-mpeg2enc:1.0
-media-plugins/gst-plugins-mpg123
-media-plugins/gst-plugins-mplex:0.10
-media-plugins/gst-plugins-mplex:1.0
-media-plugins/gst-plugins-musepack
-media-plugins/gst-plugins-neon:0.10
-media-plugins/gst-plugins-neon:1.0
-media-plugins/gst-plugins-ofa:0.10
-media-plugins/gst-plugins-ofa:1.0
-media-plugins/gst-plugins-ogg
-media-plugins/gst-plugins-openh264
-media-plugins/gst-plugins-opus:0.10
-media-plugins/gst-plugins-opus:1.0
-media-plugins/gst-plugins-oss:0.10
-media-plugins/gst-plugins-oss:1.0
-media-plugins/gst-plugins-pango
-media-plugins/gst-plugins-pulse:0.10
-media-plugins/gst-plugins-pulse:1.0
-media-plugins/gst-plugins-raw1394:0.10
-media-plugins/gst-plugins-raw1394:1.0
-media-plugins/gst-plugins-resindvd:0.10
-media-plugins/gst-plugins-resindvd:1.0
-media-plugins/gst-plugins-rtmp:0.10
-media-plugins/gst-plugins-rtmp:1.0
-media-plugins/gst-plugins-schroedinger:0.10
-media-plugins/gst-plugins-schroedinger:1.0
-media-plugins/gst-plugins-shout2:0.10
-media-plugins/gst-plugins-shout2:1.0
-media-plugins/gst-plugins-sidplay:0.10
-media-plugins/gst-plugins-sidplay:1.0
-media-plugins/gst-plugins-smoothstreaming
-media-plugins/gst-plugins-soundtouch:0.10
-media-plugins/gst-plugins-soundtouch:1.0
-media-plugins/gst-plugins-soup:0.10
-media-plugins/gst-plugins-soup:1.0
-media-plugins/gst-plugins-speex:0.10
-media-plugins/gst-plugins-speex:1.0
-#?os_arch_machine==x86_64#
-media-plugins/gst-plugins-srtp
+#-world(media-plugins)-#
+!media-plugins/mediastreamer-silk
+!media-plugins/mythplugins
+!media-plugins/vdr-rotor
+#?os_arch_machine==i686#
+!media-plugins/gst-plugins-srtp
 #os_arch_machine#
-media-plugins/gst-plugins-taglib:0.10
-media-plugins/gst-plugins-taglib:1.0
-media-plugins/gst-plugins-theora
-media-plugins/gst-plugins-twolame:0.10
-media-plugins/gst-plugins-twolame:1.0
-media-plugins/gst-plugins-uvch264
-media-plugins/gst-plugins-v4l2:0.10
-media-plugins/gst-plugins-v4l2:1.0
-media-plugins/gst-plugins-vaapi
-media-plugins/gst-plugins-voaacenc
-media-plugins/gst-plugins-voamrwbenc
-media-plugins/gst-plugins-vorbis
-media-plugins/gst-plugins-vp8
-media-plugins/gst-plugins-vpx
-media-plugins/gst-plugins-wavpack:0.10
-media-plugins/gst-plugins-wavpack:1.0
-media-plugins/gst-plugins-x
-media-plugins/gst-plugins-x264:0.10
-media-plugins/gst-plugins-x264:1.0
-media-plugins/gst-plugins-x265
-media-plugins/gst-plugins-ximagesrc:0.10
-media-plugins/gst-plugins-ximagesrc:1.0
-media-plugins/gst-plugins-xvid
-media-plugins/gst-plugins-xvideo
-media-plugins/gst-transcoder
-media-plugins/hexter
-media-plugins/kipi-plugins
-media-plugins/kodi-audiodecoder-modplug
-media-plugins/kodi-audiodecoder-nosefart
-media-plugins/kodi-audiodecoder-sidplay
-media-plugins/kodi-audiodecoder-snesapu
-media-plugins/kodi-audiodecoder-stsound
-media-plugins/kodi-audiodecoder-timidity
-media-plugins/kodi-audiodecoder-vgmstream
-media-plugins/kodi-audioencoder-flac
-media-plugins/kodi-audioencoder-lame
-media-plugins/kodi-audioencoder-vorbis
-media-plugins/kodi-audioencoder-wav
-media-plugins/kodi-inputstream-adaptive
-media-plugins/kodi-inputstream-rtmp
-media-plugins/kodi-peripheral-joystick
-media-plugins/kodi-pvr-argustv
-media-plugins/kodi-pvr-demo
-media-plugins/kodi-pvr-dvblink
-media-plugins/kodi-pvr-dvbviewer
-media-plugins/kodi-pvr-filmon
-media-plugins/kodi-pvr-iptvsimple
-media-plugins/kodi-pvr-mediaportal-tvserver
-media-plugins/kodi-pvr-mythtv
-media-plugins/kodi-pvr-nextpvr
-media-plugins/kodi-pvr-njoy
-media-plugins/kodi-pvr-pctv
-media-plugins/kodi-pvr-stalker
-media-plugins/kodi-pvr-vbox
-media-plugins/kodi-pvr-vdr-vnsi
-media-plugins/kodi-pvr-vuplus
-media-plugins/kodi-pvr-wmc
-media-plugins/kodi-screensaver-asteroids
-media-plugins/kodi-screensaver-biogenesis
-media-plugins/kodi-screensaver-greynetic
-media-plugins/kodi-screensaver-pingpong
-media-plugins/kodi-screensaver-pyro
-media-plugins/kodi-screensaver-rsxs
-media-plugins/kodi-visualization-fishbmc
-media-plugins/kodi-visualization-goom
-media-plugins/kodi-visualization-nastyfft
-media-plugins/kodi-visualization-projectm
-media-plugins/kodi-visualization-shadertoy
-media-plugins/kodi-visualization-spectrum
-media-plugins/kodi-visualization-waveform
-media-plugins/ladspa-bs2b
-media-plugins/libvisual-plugins
-media-plugins/libvisual-projectm
-media-plugins/live
-media-plugins/mcp-plugins
-media-plugins/mediastreamer-amr
-media-plugins/mediastreamer-bcg729
-media-plugins/mediastreamer-ilbc
-#media-plugins/mediastreamer-silk
-media-plugins/mediastreamer-x264
-#media-plugins/mythplugins
-media-plugins/npapi-vlc
-media-plugins/qmmp-plugin-pack
-media-plugins/rev-plugins
-media-plugins/swh-lv2
-media-plugins/swh-plugins
-media-plugins/tap-plugins
-media-plugins/vamp-aubio-plugins
-media-plugins/vamp-libxtract-plugins
-media-plugins/vco-plugins
-media-plugins/vdr-actuator
-media-plugins/vdr-admin
-media-plugins/vdr-alcd
-media-plugins/vdr-arghdirector
-media-plugins/vdr-avards
-media-plugins/vdr-cinebars
-media-plugins/vdr-clock
-media-plugins/vdr-dummydevice
-media-plugins/vdr-duplicates
-media-plugins/vdr-dvbhddevice
-media-plugins/vdr-dvbsddevice
-media-plugins/vdr-dvd
-media-plugins/vdr-dvdswitch
-media-plugins/vdr-epgsearch
-media-plugins/vdr-epgsync
-media-plugins/vdr-extrecmenu
-media-plugins/vdr-femon
-media-plugins/vdr-fepg
-media-plugins/vdr-freecell
-media-plugins/vdr-fritzbox
-media-plugins/vdr-image
-media-plugins/vdr-lcr
-media-plugins/vdr-live
-media-plugins/vdr-mailbox
-media-plugins/vdr-markad
-media-plugins/vdr-mlist
-media-plugins/vdr-osdpip
-media-plugins/vdr-osdteletext
-media-plugins/vdr-powermate
-media-plugins/vdr-remote
-media-plugins/vdr-remoteosd
-media-plugins/vdr-remotetimers
-#media-plugins/vdr-rotor
-media-plugins/vdr-rssreader
-media-plugins/vdr-screenshot
-media-plugins/vdr-skincurses
-media-plugins/vdr-skinsoppalusikka
-media-plugins/vdr-streamdev
-media-plugins/vdr-sudoku
-media-plugins/vdr-svdrposd
-media-plugins/vdr-svdrpservice
-media-plugins/vdr-ttxtsubs
-media-plugins/vdr-undelete
-media-plugins/vdr-vompserver
-media-plugins/vdr-zaphistory
-media-plugins/vdr-zappilot
-media-plugins/xsynth-dssi
 #in#
 
 #?in(os_linux_pkglist, CBD)!=#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/sys-libs b/profiles/templates/3.5/6_ac_update_sync/world/grp/sys-libs
index eb5d7080..bb0b6474 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/sys-libs
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/sys-libs
@@ -1,72 +1,14 @@
 # Calculate name=world format=world
 
 #?in(os_linux_pkglist, CBB)!=#
-#sys-libs/argp-standalone
-sys-libs/binutils-libs
-sys-libs/cracklib
-sys-libs/db
-sys-libs/e2fsprogs-libs
-sys-libs/efivar
-sys-libs/freeipmi
-#sys-libs/fts-standalone
-sys-libs/gdbm
-sys-libs/glibc
-sys-libs/gpm
-sys-libs/gwenhywfar
-sys-libs/kpmcore
-sys-libs/ldb
-sys-libs/libaal
-sys-libs/libapparmor
-sys-libs/libavc1394
-sys-libs/libcap
-sys-libs/libcap-ng
-sys-libs/libchipcard
-sys-libs/libcxx
-sys-libs/libcxxabi
-sys-libs/libcxxrt
-sys-libs/libfaketime
-sys-libs/libhx
-#?os_arch_machine==x86_64#
-sys-libs/libieee1284
+#-world(sys-libs)-#
+!sys-libs/argp-standalone
+!sys-libs/fts-standalone
+!sys-libs/llvm-libunwind
+!sys-libs/musl
+!sys-libs/uclibc
+!sys-libs/uclibc-ng
+#?os_arch_machine==i686#
+!sys-libs/libieee1284
 #os_arch_machine#
-sys-libs/libkudzu
-sys-libs/libmath++
-sys-libs/libnih
-sys-libs/libomp
-sys-libs/libosinfo
-sys-libs/libraw1394
-sys-libs/libseccomp
-sys-libs/libselinux
-sys-libs/libsemanage
-sys-libs/libsepol
-sys-libs/libsmbios
-sys-libs/libstatgrab
-sys-libs/libstdc++-v3
-sys-libs/libtermcap-compat
-sys-libs/libudev-compat
-sys-libs/libunwind
-sys-libs/libutempter
-#sys-libs/llvm-libunwind
-sys-libs/lwp
-sys-libs/mtdev
-#sys-libs/musl
-sys-libs/ncurses:0
-sys-libs/ncurses:5
-sys-libs/nss_wrapper
-sys-libs/ntdb
-sys-libs/openipmi
-sys-libs/pam
-sys-libs/pwdb
-sys-libs/readline:0
-sys-libs/readline:4
-sys-libs/readline:5
-sys-libs/slang
-sys-libs/talloc
-sys-libs/tdb
-sys-libs/tevent
-sys-libs/timezone-data
-#sys-libs/uclibc
-#sys-libs/uclibc-ng
-sys-libs/uid_wrapper
-sys-libs/zlib
 #in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/x11-drivers b/profiles/templates/3.5/6_ac_update_sync/world/grp/x11-drivers
index 48cd1806..e29e19e5 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/x11-drivers
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/x11-drivers
@@ -1,62 +1,9 @@
 # Calculate name=world format=world
 
 #?in(os_linux_pkglist, CBB)!=#
-x11-drivers/nvidia-drivers
-x11-drivers/xf86-input-acecad
-x11-drivers/xf86-input-aiptek
-x11-drivers/xf86-input-elographics
-x11-drivers/xf86-input-evdev
-x11-drivers/xf86-input-fpit
-x11-drivers/xf86-input-hyperpen
-x11-drivers/xf86-input-joystick
-x11-drivers/xf86-input-keyboard
-x11-drivers/xf86-input-libinput
-x11-drivers/xf86-input-mouse
-x11-drivers/xf86-input-mtrack
-x11-drivers/xf86-input-mutouch
-x11-drivers/xf86-input-penmount
-x11-drivers/xf86-input-synaptics
-x11-drivers/xf86-input-tslib
-x11-drivers/xf86-input-vmmouse
-x11-drivers/xf86-input-void
-x11-drivers/xf86-input-wacom
-x11-drivers/xf86-video-amdgpu
-x11-drivers/xf86-video-apm
-#x11-drivers/xf86-video-ark
-x11-drivers/xf86-video-ast
-x11-drivers/xf86-video-ati
-x11-drivers/xf86-video-chips
-x11-drivers/xf86-video-cirrus
-x11-drivers/xf86-video-dummy
-x11-drivers/xf86-video-fbdev
-x11-drivers/xf86-video-glint
-x11-drivers/xf86-video-i128
-x11-drivers/xf86-video-i740
-x11-drivers/xf86-video-intel
-x11-drivers/xf86-video-mach64
-x11-drivers/xf86-video-mga
-#x11-drivers/xf86-video-modesetting
-x11-drivers/xf86-video-neomagic
-x11-drivers/xf86-video-nouveau
-x11-drivers/xf86-video-nv
-x11-drivers/xf86-video-openchrome
-x11-drivers/xf86-video-qxl
-x11-drivers/xf86-video-r128
-x11-drivers/xf86-video-rendition
-x11-drivers/xf86-video-s3
-x11-drivers/xf86-video-s3virge
-x11-drivers/xf86-video-savage
-x11-drivers/xf86-video-siliconmotion
-x11-drivers/xf86-video-sis
-x11-drivers/xf86-video-sisusb
-x11-drivers/xf86-video-tdfx
-x11-drivers/xf86-video-tga
-x11-drivers/xf86-video-trident
-x11-drivers/xf86-video-tseng
-x11-drivers/xf86-video-vesa
-x11-drivers/xf86-video-virtualbox
-x11-drivers/xf86-video-vmware
-x11-drivers/xf86-video-voodoo
+#-world(x11-drivers)-#
+!x11-drivers/xf86-video-ark
+!x11-drivers/xf86-video-modesetting
 #in#
 
 #?in(os_linux_pkglist, CBD)!=#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/x11-libs b/profiles/templates/3.5/6_ac_update_sync/world/grp/x11-libs
index 2f8cb09a..6880b7d6 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/x11-libs
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/x11-libs
@@ -1,147 +1,6 @@
 # Calculate name=world format=world
 
 #?in(os_linux_pkglist, CBB)!=#
-x11-libs/agg
-x11-libs/cairo
-x11-libs/c++-gtk-utils:0
-x11-libs/c++-gtk-utils:3
-x11-libs/colord-gtk
-x11-libs/compiz-bcop
-x11-libs/compizconfig-backend-gconf
-x11-libs/compizconfig-backend-kconfig4
-x11-libs/dnd
-x11-libs/flowcanvas
-x11-libs/fltk
-x11-libs/fox:1.6
-x11-libs/fox:1.7
-x11-libs/fox-wrapper
-x11-libs/gdk-pixbuf
-x11-libs/gksu
-x11-libs/gl2ps
-x11-libs/gnome-pty-helper
-x11-libs/goffice:0.8
-x11-libs/goffice:0.10
-x11-libs/goocanvas:0
-x11-libs/goocanvas:2.0
-x11-libs/gtk+:2
-x11-libs/gtk+:3
-x11-libs/gtkdatabox
-x11-libs/gtk+extra
-x11-libs/gtkglarea
-x11-libs/gtkglext
-x11-libs/gtkhotkey
-x11-libs/gtkmathview
-x11-libs/gtksourceview:2.0
-x11-libs/gtksourceview:3.0
-x11-libs/hippo-canvas
-x11-libs/libaosd
-x11-libs/libast
-x11-libs/libcompizconfig
-x11-libs/libcryptui
-x11-libs/libdesktop-agnostic
-x11-libs/libdmx
-x11-libs/libdockapp
-x11-libs/libdrm
-x11-libs/libfakekey
-x11-libs/libfm
-x11-libs/libfm-extra
-x11-libs/libfm-qt
-x11-libs/libfontenc
-x11-libs/libFS
-x11-libs/libgksu
-x11-libs/libGLw
-x11-libs/libICE
-x11-libs/libnotify
-x11-libs/liboglappth
-x11-libs/libpciaccess
-x11-libs/libproplist
-x11-libs/libqxt
-x11-libs/librfm
-x11-libs/libSM
-x11-libs/libtinynotify
-x11-libs/libtinynotify-cli
-x11-libs/libtinynotify-systemwide
-x11-libs/libva
-x11-libs/libva-intel-driver
-x11-libs/libva-vdpau-driver
-x11-libs/libvdpau
-x11-libs/libwnck:1
-x11-libs/libwnck:3
-x11-libs/libX11
-x11-libs/libXau
-x11-libs/libXaw
-x11-libs/libXaw3d
-x11-libs/libXaw3dXft
-x11-libs/libXCalibrate
-x11-libs/libxcb
-x11-libs/libXcomposite
-x11-libs/libXcursor
-x11-libs/libXdamage
-x11-libs/libXdmcp
-x11-libs/libXext
-x11-libs/libXfixes
-x11-libs/libXfont
-x11-libs/libXfont2
-x11-libs/libXfontcache
-x11-libs/libXft
-x11-libs/libXi
-x11-libs/libXinerama
-x11-libs/libxkbcommon
-x11-libs/libxkbfile
-x11-libs/libxkbui
-x11-libs/libxklavier
-x11-libs/libXmu
-x11-libs/libXp
-x11-libs/libXpm
-x11-libs/libXpresent
-x11-libs/libXrandr
-x11-libs/libXrender
-x11-libs/libXres
-x11-libs/libXScrnSaver
-x11-libs/libxshmfence
-x11-libs/libXt
-x11-libs/libXTrap
-x11-libs/libXtst
-x11-libs/libXv
-x11-libs/libXvMC
-x11-libs/libXxf86dga
-x11-libs/libXxf86misc
-x11-libs/libXxf86vm
-x11-libs/motif:0
-x11-libs/motif:2.2
-x11-libs/mx
-x11-libs/neXtaw
-x11-libs/pango
-x11-libs/pangox-compat
-x11-libs/pixman
-x11-libs/qscintilla
-x11-libs/qtermwidget
-x11-libs/qtscriptgenerator
-x11-libs/qwt:5
-x11-libs/qwt:6
-x11-libs/qwtplot3d
-x11-libs/qwtpolar
-x11-libs/rep-gtk
-x11-libs/snorenotify
-x11-libs/startup-notification
-x11-libs/tslib
-x11-libs/vte:0
-x11-libs/vte:2.90
-x11-libs/vte:2.91
-x11-libs/wxGTK:2.8
-x11-libs/wxGTK:3.0
-x11-libs/wxGTK:3.0-gtk3
-x11-libs/xapps
-x11-libs/xbae
-x11-libs/xcb-util
-x11-libs/xcb-util-cursor
-x11-libs/xcb-util-image
-x11-libs/xcb-util-keysyms
-x11-libs/xcb-util-renderutil
-x11-libs/xcb-util-wm
-x11-libs/xcb-util-xrm
-#x11-libs/xforms
-x11-libs/xosd
-x11-libs/xpyb
-x11-libs/xtrans
+#-world(x11-libs)-#
+!x11-libs/xforms
 #in#