diff --git a/profiles/CLM/x86/parent b/profiles/CLM/x86/parent
deleted file mode 100644
index 800edc6..0000000
--- a/profiles/CLM/x86/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-distros:CLSK/x86
-..
diff --git a/profiles/templates/3.6/6_ac_update_sync/world/create/0-world b/profiles/templates/3.6/6_ac_update_sync/world/create/0-world
deleted file mode 100644
index 68f6918..0000000
--- a/profiles/templates/3.6/6_ac_update_sync/world/create/0-world
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=remove cl_update_world==rebuild name=world
diff --git a/profiles/templates/3.6/6_ac_update_sync/world/create/all b/profiles/templates/3.6/6_ac_update_sync/world/create/all
new file mode 100644
index 0000000..75e9568
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/world/create/all
@@ -0,0 +1,478 @@
+# Calculate name=world format=world in(os_linux_pkglist,minimal)!=
+
+acct-group/audio
+acct-group/input
+acct-group/kvm
+acct-group/lp
+acct-group/lpadmin
+acct-group/mail
+acct-group/man
+acct-group/messagebus
+acct-group/render
+acct-group/sshd
+acct-group/vboxusers
+acct-user/mail
+acct-user/man
+acct-user/messagebus
+acct-user/mpd
+acct-user/postmaster
+acct-user/sshd
+app-accessibility/at-spi2-atk
+app-accessibility/at-spi2-core
+app-admin/ansible
+app-admin/eselect
+app-admin/logrotate
+app-admin/perl-cleaner
+app-admin/syslog-ng
+app-arch/bzip2
+app-arch/cabextract
+app-arch/cpio
+app-arch/gzip
+app-arch/lbzip2
+app-arch/libarchive
+app-arch/lz4
+app-arch/pigz
+app-arch/rpm2targz
+app-arch/tar
+app-arch/unrar
+app-arch/unzip
+app-arch/xz-utils
+app-arch/zip
+app-arch/zstd
+app-crypt/gnupg
+app-crypt/gpgme
+app-crypt/libb2
+app-crypt/openpgp-keys-calculate-release
+app-crypt/p11-kit
+app-crypt/pinentry
+app-crypt/rhash
+app-crypt/sbsigntools
+app-crypt/shim-signed
+app-editors/neovim
+app-emulation/buildah
+app-emulation/conmon
+app-emulation/libpod
+app-emulation/runc
+app-emulation/skopeo
+app-emulation/slirp4netns
+app-emulation/virtualbox-bin
+app-emulation/virtualbox-modules
+app-eselect/eselect-fontconfig
+app-eselect/eselect-lib-bin-symlink
+app-eselect/eselect-notify-send
+app-eselect/eselect-pinentry
+app-eselect/eselect-python
+app-eselect/eselect-repository
+app-eselect/eselect-vi
+app-eselect/eselect-xvmc
+app-i18n/man-pages-ru
+app-portage/eix
+app-portage/elt-patches
+app-portage/gentoolkit
+app-portage/portage-utils
+app-shells/bash
+app-shells/hstr
+app-shells/push
+app-shells/quoter
+app-text/antiword
+app-text/asciidoc
+app-text/build-docbook-catalog
+app-text/djvu
+app-text/docbook-xml-dtd
+app-text/docbook-xsl-stylesheets
+app-text/docx2txt
+app-text/ghostscript-gpl
+app-text/libpaper
+app-text/manpager
+app-text/poppler
+app-text/poppler-data
+app-text/qpdf
+app-text/sdcv
+app-text/sgml-common
+app-text/tessdata_fast
+app-text/tesseract
+app-text/tree
+app-text/xmlto
+app-text/zathura
+app-text/zathura-djvu
+app-text/zathura-pdf-poppler
+dev-db/sqlite
+dev-go/go-md2man
+dev-haskell/stack-bin
+dev-lang/go
+dev-lang/luajit
+dev-lang/nasm
+dev-lang/perl
+dev-lang/python
+dev-lang/python-exec
+dev-lang/swig
+dev-lang/tcl
+dev-lang/tk
+dev-libs/atk
+dev-libs/boehm-gc
+dev-libs/boost
+dev-libs/cyrus-sasl
+dev-libs/dbus-glib
+dev-libs/elfutils
+dev-libs/expat
+dev-libs/fribidi
+dev-libs/girara
+dev-libs/glib
+dev-libs/gmp
+dev-libs/gobject-introspection-common
+dev-libs/icu
+dev-libs/isl
+dev-libs/ivykis
+dev-libs/json-c
+dev-libs/jsoncpp
+dev-libs/libaio
+dev-libs/libassuan
+dev-libs/libatomic_ops
+dev-libs/libbsd
+dev-libs/libcroco
+dev-libs/libdaemon
+dev-libs/libev
+dev-libs/libevdev
+dev-libs/libffi
+dev-libs/libgcrypt
+dev-libs/libgpg-error
+dev-libs/libinput
+dev-libs/libksba
+dev-libs/libltdl
+dev-libs/libmspack
+dev-libs/libnatspec
+dev-libs/libnl
+dev-libs/libpcre
+dev-libs/libpcre2
+dev-libs/libpipeline
+dev-libs/libsodium
+dev-libs/libtasn1
+dev-libs/libtermkey
+dev-libs/libunistring
+dev-libs/libusb
+dev-libs/libuv
+dev-libs/libvterm
+dev-libs/libxml2
+dev-libs/libxslt
+dev-libs/libyaml
+dev-libs/lzo
+dev-libs/mpc
+dev-libs/mpfr
+dev-libs/msgpack
+dev-libs/nettle
+dev-libs/npth
+dev-libs/nspr
+dev-libs/nss
+dev-libs/openssl
+dev-libs/popt
+dev-libs/stfl
+dev-libs/unibilium
+dev-libs/vala-common
+dev-libs/xapian
+dev-lua/lpeg
+dev-lua/luv
+dev-lua/mpack
+dev-perl/Locale-gettext
+dev-perl/XML-Parser
+dev-python/bcrypt
+dev-python/certifi
+dev-python/cffi
+dev-python/cryptography
+dev-python/cython
+dev-python/docutils
+dev-python/httplib2
+dev-python/jinja
+dev-python/lxml
+dev-python/m2crypto
+dev-python/mako
+dev-python/markupsafe
+dev-python/netaddr
+dev-python/packaging
+dev-python/paramiko
+dev-python/passlib
+dev-python/pexpect
+dev-python/pip
+dev-python/ply
+dev-python/ptyprocess
+dev-python/pyasn1
+dev-python/pycparser
+dev-python/pygments
+dev-python/pyinotify
+dev-python/pynacl
+dev-python/pyparsing
+dev-python/pytz
+dev-python/pyxattr
+dev-python/pyxml
+dev-python/pyyaml
+dev-python/setuptools
+dev-python/six
+dev-python/soaplib
+dev-scheme/guile
+dev-tcltk/tcllib
+dev-tcltk/tclreadline
+dev-tcltk/tdom
+dev-tcltk/tkimg
+dev-util/boost-build
+dev-util/ccache
+dev-util/cmake
+dev-util/desktop-file-utils
+dev-util/gdbus-codegen
+dev-util/glib-utils
+dev-util/gperf
+dev-util/gtk-doc-am
+dev-util/gtk-update-icon-cache
+dev-util/intltool
+dev-util/itstool
+dev-util/meson
+dev-util/ninja
+dev-util/patchelf
+dev-util/pkgconfig
+dev-util/re2c
+dev-util/shadowman
+dev-util/shellcheck-bin
+dev-vcs/git
+gnome-base/gsettings-desktop-schemas
+gnome-base/librsvg
+mail-client/mutt
+mail-filter/procmail
+mail-mta/nullmailer
+media-fonts/corefonts
+media-fonts/dejavu
+media-fonts/droid
+media-fonts/encodings
+media-fonts/font-alias
+media-fonts/font-misc-misc
+media-fonts/font-util
+media-fonts/sophia-nubian
+media-fonts/urw-fonts
+media-gfx/exiv2
+media-gfx/geeqie
+media-gfx/graphite2
+media-gfx/imagemagick
+media-gfx/sxiv
+media-libs/alsa-lib
+media-libs/audiofile
+media-libs/exiftool
+media-libs/fdk-aac
+media-libs/fontconfig
+media-libs/freeglut
+media-libs/freetype
+media-libs/gd
+media-libs/giflib
+media-libs/glew
+media-libs/glu
+media-libs/harfbuzz
+media-libs/ilmbase
+media-libs/imlib2
+media-libs/jbig2dec
+media-libs/lcms
+media-libs/leptonica
+media-libs/libepoxy
+media-libs/libexif
+media-libs/libglvnd
+media-libs/libid3tag
+media-libs/libjpeg-turbo
+media-libs/libmad
+media-libs/libmpdclient
+media-libs/libpng
+media-libs/libsamplerate
+media-libs/libsdl
+media-libs/libsdl2
+media-libs/libsndfile
+media-libs/libwebp
+media-libs/mesa
+media-libs/mutagen
+media-libs/openal
+media-libs/openexr
+media-libs/openjpeg
+media-libs/taglib
+media-libs/tiff
+media-libs/x264
+media-libs/x265
+media-libs/xvid
+media-sound/alsa-utils
+media-sound/apulse
+media-sound/lame
+media-sound/mpc
+media-sound/mpd
+media-sound/ncmpcpp
+media-video/ffmpeg
+media-video/mpv
+net-dns/libidn
+net-dns/libidn2
+net-firewall/iptables
+net-fs/sshfs
+net-libs/gnutls
+net-libs/libesmtp
+net-libs/libmnl
+net-libs/libnsl
+net-libs/libslirp
+net-libs/libtirpc
+net-libs/nghttp2
+net-mail/fetchmail
+net-mail/mailbase
+net-misc/aria2
+net-misc/cni-plugins
+net-misc/connman
+net-misc/curl
+net-misc/iputils
+net-misc/netifrc
+net-misc/openssh
+net-misc/rsync
+net-misc/sshpass
+net-misc/wget
+net-news/newsboat
+net-print/cups
+net-print/cups-filters
+net-wireless/broadcom-sta
+net-wireless/crda
+net-wireless/rtl8723de
+net-wireless/rtl8814au
+net-wireless/rtl8821ce
+net-wireless/rtl8821cu
+net-wireless/wireless-regdb
+net-wireless/wireless-tools
+net-wireless/wpa_supplicant
+perl-core/File-Temp
+sys-apps/attr
+sys-apps/baselayout
+sys-apps/busybox
+sys-apps/calculate-toolkit
+sys-apps/calculate-utils
+sys-apps/coreutils
+sys-apps/dbus
+sys-apps/debianutils
+sys-apps/diffutils
+sys-apps/ethtool
+sys-apps/file
+sys-apps/findutils
+sys-apps/gawk
+sys-apps/gentoo-functions
+sys-apps/grep
+sys-apps/groff
+sys-apps/help2man
+sys-apps/hwids
+sys-apps/ifplugd
+sys-apps/iproute2
+sys-apps/kbd
+sys-apps/kmod
+sys-apps/less
+sys-apps/man-db
+sys-apps/man-pages
+sys-apps/man-pages-posix
+sys-apps/net-tools
+sys-apps/openrc
+sys-apps/opentmpfiles
+sys-apps/pciutils
+sys-apps/portage
+sys-apps/preload
+sys-apps/sandbox
+sys-apps/sed
+sys-apps/shadow
+sys-apps/sysvinit
+sys-apps/tcp-wrappers
+sys-apps/texinfo
+sys-apps/usbutils
+sys-apps/util-linux
+sys-apps/which
+sys-block/thin-provisioning-tools
+sys-boot/efibootmgr
+sys-boot/gnu-efi
+sys-boot/grub
+sys-boot/os-prober
+sys-devel/autoconf
+sys-devel/autoconf-archive
+sys-devel/autoconf-wrapper
+sys-devel/autogen
+sys-devel/automake
+sys-devel/automake-wrapper
+sys-devel/bc
+sys-devel/binutils
+sys-devel/binutils-config
+sys-devel/bison
+sys-devel/flex
+sys-devel/gcc
+sys-devel/gcc-config
+sys-devel/gettext
+sys-devel/gnuconfig
+sys-devel/libtool
+sys-devel/llvm
+sys-devel/llvm-common
+sys-devel/llvmgold
+sys-devel/m4
+sys-devel/make
+sys-devel/patch
+sys-devel/prelink
+sys-firmware/ipw2100-firmware
+sys-firmware/ipw2200-firmware
+sys-firmware/nvidia-firmware
+sys-fs/android-file-transfer-linux
+sys-fs/dfc
+sys-fs/e2fsprogs
+sys-fs/eudev
+sys-fs/fuse
+sys-fs/fuse-common
+sys-fs/fuse-overlayfs
+sys-fs/lvm2
+sys-fs/ntfs3g
+sys-fs/udev-init-scripts
+sys-kernel/calculate-sources
+sys-kernel/dracut
+sys-kernel/installkernel-gentoo
+sys-kernel/linux-firmware
+sys-kernel/linux-headers
+sys-libs/binutils-libs
+sys-libs/cracklib
+sys-libs/e2fsprogs-libs
+sys-libs/efivar
+sys-libs/gdbm
+sys-libs/glibc
+sys-libs/libcap
+sys-libs/libseccomp
+sys-libs/mtdev
+sys-libs/ncurses
+sys-libs/readline
+sys-libs/timezone-data
+sys-libs/zlib
+sys-power/acpi
+sys-power/acpi_call
+sys-process/cronbase
+sys-process/cronie
+sys-process/procps
+sys-process/psmisc
+virtual/cron
+virtual/dev-manager
+virtual/editor
+virtual/freedesktop-icon-theme
+virtual/glu
+virtual/jpeg
+virtual/libc
+virtual/libcrypt
+virtual/libelf
+virtual/libffi
+virtual/libiconv
+virtual/libintl
+virtual/libudev
+virtual/libusb
+virtual/linux-sources
+virtual/logger
+virtual/man
+virtual/modutils
+virtual/mta
+virtual/notification-daemon
+virtual/opengl
+virtual/os-headers
+virtual/package-manager
+virtual/pager
+virtual/perl-Data-Dumper
+virtual/perl-ExtUtils-MakeMaker
+virtual/perl-File-Temp
+virtual/perl-Test-Harness
+virtual/pkgconfig
+virtual/service-manager
+virtual/ssh
+virtual/tmpfiles
+virtual/ttf-fonts
+virtual/udev
+virtual/w3m
+virtual/yacc
diff --git a/profiles/templates/3.6/6_ac_update_sync/world/create/app-misc b/profiles/templates/3.6/6_ac_update_sync/world/create/app-misc
new file mode 100644
index 0000000..297360a
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/world/create/app-misc
@@ -0,0 +1,12 @@
+# Calculate name=world format=world in(os_linux_pkglist,minimal)!=
+
+app-misc/c_rehash
+app-misc/ca-certificates
+app-misc/editor-wrapper
+app-misc/jq
+app-misc/mime-types
+app-misc/nnn
+app-misc/pax-utils
+app-misc/recoll
+app-misc/vifm
+app-misc/xorg-meta
diff --git a/profiles/templates/3.6/6_ac_update_sync/world/create/base b/profiles/templates/3.6/6_ac_update_sync/world/create/base
deleted file mode 100644
index 38def74..0000000
--- a/profiles/templates/3.6/6_ac_update_sync/world/create/base
+++ /dev/null
@@ -1,30 +0,0 @@
-# Calculate name=world format=world in(os_linux_pkglist,minimal)!=
-
-app-portage/eix
-dev-vcs/git
-sys-apps/calculate-utils:3
-sys-apps/openrc
-
-#?in(os_linux_pkglist,CCS)==#
-app-portage/gentoolkit
-#in#
-
-#?in(os_linux_pkglist,container)==#
-media-gfx/gfxboot-themes-calculate
-net-fs/nfs-utils
-sys-boot/grub:2
-sys-boot/os-prober
-sys-fs/e2fsprogs
-virtual/linux-sources
-#?os_arch_machine==x86_64#
-sys-boot/efibootmgr
-sys-boot/gnu-efi
-app-crypt/shim-signed
-app-crypt/sbsigntools
-#os_arch_machine#
-#in#
-
-
-#?in(os_linux_pkglist, desktop)!=#
-sys-fs/ecryptfs-utils
-#in#
diff --git a/profiles/templates/3.6/6_ac_update_sync/world/create/netapps b/profiles/templates/3.6/6_ac_update_sync/world/create/netapps
new file mode 100644
index 0000000..9ab0f47
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/world/create/netapps
@@ -0,0 +1,2 @@
+www-client/firefox-bin
+www-client/w3m
diff --git a/profiles/templates/3.6/6_ac_update_sync/world/create/wm b/profiles/templates/3.6/6_ac_update_sync/world/create/wm
new file mode 100644
index 0000000..34487c5
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/world/create/wm
@@ -0,0 +1,4 @@
+# Calculate name=world format=world in(os_linux_pkglist,minimal)!=
+
+x11-wm/bspwm
+
diff --git a/profiles/templates/3.6/6_ac_update_sync/world/create/xorg b/profiles/templates/3.6/6_ac_update_sync/world/create/xorg
new file mode 100644
index 0000000..f197463
--- /dev/null
+++ b/profiles/templates/3.6/6_ac_update_sync/world/create/xorg
@@ -0,0 +1,123 @@
+# Calculate name=world format=world
+
+x11-apps/appres
+x11-apps/bdftopcf
+x11-apps/bitmap
+x11-apps/iceauth
+x11-apps/luit
+x11-apps/mesa-progs
+x11-apps/mkfontscale
+x11-apps/rgb
+x11-apps/sessreg
+x11-apps/setxkbmap
+x11-apps/smproxy
+x11-apps/x11perf
+x11-apps/xauth
+x11-apps/xbacklight
+x11-apps/xcmsdb
+x11-apps/xcursorgen
+x11-apps/xdpyinfo
+x11-apps/xdriinfo
+x11-apps/xev
+x11-apps/xf86dga
+x11-apps/xgamma
+x11-apps/xhost
+x11-apps/xinit
+x11-apps/xinput
+x11-apps/xkbcomp
+x11-apps/xkbevd
+x11-apps/xkbutils
+x11-apps/xkill
+x11-apps/xlsatoms
+x11-apps/xlsclients
+x11-apps/xmessage
+x11-apps/xmodmap
+x11-apps/xpr
+x11-apps/xprop
+x11-apps/xrandr
+x11-apps/xrdb
+x11-apps/xrefresh
+x11-apps/xset
+x11-apps/xsetroot
+x11-apps/xvinfo
+x11-apps/xwd
+x11-apps/xwininfo
+x11-apps/xwud
+x11-base/xcb-proto
+x11-base/xorg-drivers
+x11-base/xorg-proto
+x11-base/xorg-server
+x11-drivers/xf86-input-libinput
+x11-drivers/xf86-video-intel
+x11-libs/cairo
+x11-libs/gdk-pixbuf
+x11-libs/gtk+
+x11-libs/libICE
+x11-libs/libSM
+x11-libs/libX11
+x11-libs/libXScrnSaver
+x11-libs/libXau
+x11-libs/libXaw
+x11-libs/libXcomposite
+x11-libs/libXcursor
+x11-libs/libXdamage
+x11-libs/libXdmcp
+x11-libs/libXext
+x11-libs/libXfixes
+x11-libs/libXfont2
+x11-libs/libXft
+x11-libs/libXi
+x11-libs/libXinerama
+x11-libs/libXmu
+x11-libs/libXpm
+x11-libs/libXrandr
+x11-libs/libXrender
+x11-libs/libXt
+x11-libs/libXtst
+x11-libs/libXv
+x11-libs/libXvMC
+x11-libs/libXxf86dga
+x11-libs/libXxf86vm
+x11-libs/libdrm
+x11-libs/libfontenc
+x11-libs/libnotify
+x11-libs/libpciaccess
+x11-libs/libxcb
+x11-libs/libxkbcommon
+x11-libs/libxkbfile
+x11-libs/libxshmfence
+x11-libs/pango
+x11-libs/pixman
+x11-libs/startup-notification
+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/xosd
+x11-libs/xtrans
+x11-misc/dmenu
+x11-misc/makedepend
+x11-misc/notification-daemon
+x11-misc/polybar
+x11-misc/rofi
+x11-misc/shared-mime-info
+x11-misc/sxhkd
+x11-misc/tabbed
+x11-misc/unclutter-xfixes
+x11-misc/util-macros
+x11-misc/wmctrl
+x11-misc/xbindkeys
+x11-misc/xbitmaps
+x11-misc/xcalib
+x11-misc/xclip
+x11-misc/xkeyboard-config
+x11-terms/st
+x11-themes/adwaita-icon-theme
+x11-themes/gnome-themes-standard
+x11-themes/gtk-engines-adwaita
+x11-themes/hicolor-icon-theme
+x11-themes/xcursor-themes
+