diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/decoration b/profiles/templates/3.2/6_ac_update_sync/world/create/decoration
index 6a2d562..b66221f 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/create/decoration
+++ b/profiles/templates/3.2/6_ac_update_sync/world/create/decoration
@@ -5,7 +5,7 @@ media-gfx/grub-splashes-calculate
 media-gfx/syslinux-themes-calculate
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLSK, CLD+, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLSK, CLD+, CLDX+)!=#
 media-gfx/calculate-wallpapers
 media-gfx/dm-themes-calculate
 #in#
@@ -14,7 +14,7 @@ media-gfx/dm-themes-calculate
 x11-themes/calculate-icon-theme
 #in#
 
-#?in(os_linux_pkglist, CLDM, CLDX, CLDO, CLDX+)!=#
+#?in(os_linux_pkglist, CLDM, CLDX, CLDX+)!=#
 media-gfx/lightdm-themes-calculate
 x11-themes/claws-mail-theme-calculate
 #in#
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/netapps b/profiles/templates/3.2/6_ac_update_sync/world/create/netapps
index 1fe7424..07530ec 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/create/netapps
+++ b/profiles/templates/3.2/6_ac_update_sync/world/create/netapps
@@ -22,11 +22,8 @@ x11-misc/x11vnc
 net-irc/konversation
 #in#
 
-#?in(os_linux_pkglist, CLDM, CLDX, CLDO, CLDX+)!=#
-mail-client/claws-mail
-#in#
-
 #?in(os_linux_pkglist, CLDM, CLDX, CLDX+)!=#
+mail-client/claws-mail
 net-im/pidgin
 net-irc/hexchat
 net-misc/remmina
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/network b/profiles/templates/3.2/6_ac_update_sync/world/create/network
index ae58633..fa12311 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/create/network
+++ b/profiles/templates/3.2/6_ac_update_sync/world/create/network
@@ -18,7 +18,7 @@ net-misc/networkmanager-pptp
 net-misc/networkmanager-vpnc
 #in#
 
-#?in(os_linux_pkglist, CLDM, CLDX, CLDO, CLDX+)!=#
+#?in(os_linux_pkglist, CLDM, CLDX, CLDX+)!=#
 gnome-extra/nm-applet
 #in#
 
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/openbox b/profiles/templates/3.2/6_ac_update_sync/world/create/openbox+
similarity index 74%
rename from profiles/templates/3.2/6_ac_update_sync/world/create/openbox
rename to profiles/templates/3.2/6_ac_update_sync/world/create/openbox+
index 91733e8..7426cdf 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/create/openbox
+++ b/profiles/templates/3.2/6_ac_update_sync/world/create/openbox+
@@ -1,10 +1,10 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CLDO, CLD+)!=#
+#?in(os_linux_pkglist, CLD+)!=#
 x11-misc/notification-daemon
 #in#
 
-#?in(os_linux_pkglist, CLDO, CLDX+)!=#
+#?in(os_linux_pkglist, CLDX+)!=#
 x11-misc/compton
 x11-misc/gmrun
 x11-misc/obconf
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/tools b/profiles/templates/3.2/6_ac_update_sync/world/create/tools
index d07dafd..8d373d9 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/create/tools
+++ b/profiles/templates/3.2/6_ac_update_sync/world/create/tools
@@ -4,7 +4,7 @@
 dev-util/ccache
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CDS, CLS, CLSK, CSS, CMC, CDS+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLS, CLSK, CSS, CMC, CDS+)!=#
 app-arch/lbzip2
 app-arch/pigz
 app-misc/tmux
@@ -13,7 +13,7 @@ sys-fs/btrfs-progs
 sys-fs/reiserfsprogs
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CDS, CLS, CLSK, CMC, CDS+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLS, CLSK, CMC, CDS+)!=#
 app-admin/logrotate
 app-admin/syslog-ng
 sys-apps/ethtool
@@ -67,7 +67,7 @@ sys-power/cpupower
 sys-power/powernowd
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CDS, CLSK, CLDX+, CDS+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CDS, CLSK, CLDX+, CDS+)!=#
 app-editors/vim
 sys-apps/acl
 app-misc/mc
@@ -94,7 +94,7 @@ sys-apps/usb_modeswitch
 x11-libs/gksu
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDO, CMC, CLSK, CLD+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CMC, CLSK, CLD+)!=#
 sys-power/upower-pm-utils
 #in#
 
@@ -136,10 +136,6 @@ sys-fs/xfsdump
 sys-process/iotop
 #in#
 
-#?in(os_linux_pkglist, CLDO, CLDX+)!=#
-x11-terms/rxvt-unicode
-#in#
-
 #?in(os_linux_pkglist, CLD+, CLDX+)!=#
 dev-db/sqlitebrowser
 #in#
@@ -212,6 +208,7 @@ x11-misc/sunflower
 x11-misc/xsnow
 x11-misc/xvkbd
 x11-terms/guake
+x11-terms/rxvt-unicode
 x11-terms/terminator
 x11-terms/tilda
 x11-themes/geany-themes
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/wireless b/profiles/templates/3.2/6_ac_update_sync/world/create/wireless
index 53de66f..963b5be 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/create/wireless
+++ b/profiles/templates/3.2/6_ac_update_sync/world/create/wireless
@@ -1,6 +1,6 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLS, CLSK, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLS, CLSK, CLDX+)!=#
 net-wireless/wireless-tools
 net-wireless/wpa_supplicant
 sys-firmware/b43-firmware
@@ -8,7 +8,7 @@ sys-firmware/ipw2100-firmware
 sys-firmware/ipw2200-firmware
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLS, CLSK)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLS, CLSK)!=#
 net-wireless/broadcom-sta
 #in#
 
diff --git a/profiles/templates/3.2/6_ac_update_sync/world/create/xorg b/profiles/templates/3.2/6_ac_update_sync/world/create/xorg
index 25e82d8..a815172 100644
--- a/profiles/templates/3.2/6_ac_update_sync/world/create/xorg
+++ b/profiles/templates/3.2/6_ac_update_sync/world/create/xorg
@@ -1,10 +1,10 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLDO, CLS, CLSK, CLDX+)!=#
+#?in(os_linux_pkglist, CLD, CLDM, CLDX, CLS, CLSK, CLDX+)!=#
 app-misc/xorg-meta
 #in#
 
-#?in(os_linux_pkglist, CLDM, CLDX, CLDO, CLDX+)!=#
+#?in(os_linux_pkglist, CLDM, CLDX, CLDX+)!=#
 x11-misc/lightdm
 #in#