diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/app-xemacs b/profiles/templates/3.5/6_ac_update_sync/world/grp/app-xemacs
new file mode 100644
index 00000000..eacb770f
--- /dev/null
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/app-xemacs
@@ -0,0 +1,134 @@
+# Calculate name=world format=world
+
+#?in(os_linux_pkglist, desktop)!=#
+app-xemacs/ada
+app-xemacs/apel
+app-xemacs/auctex
+app-xemacs/bbdb
+app-xemacs/build
+app-xemacs/calc
+app-xemacs/calendar
+app-xemacs/cc-mode
+app-xemacs/cedet-common
+app-xemacs/clearcase
+app-xemacs/cogre
+app-xemacs/cookie
+app-xemacs/crisp
+app-xemacs/c-support
+app-xemacs/debug
+app-xemacs/dictionary
+app-xemacs/dired
+app-xemacs/docbookide
+app-xemacs/easypg
+app-xemacs/ebuild-mode
+app-xemacs/ecb
+app-xemacs/ecrypto
+app-xemacs/ede
+app-xemacs/edebug
+app-xemacs/edict
+app-xemacs/ediff
+app-xemacs/edit-utils
+app-xemacs/edt
+app-xemacs/efs
+app-xemacs/egg-its
+app-xemacs/eieio
+app-xemacs/elib
+app-xemacs/emerge
+app-xemacs/erc
+app-xemacs/escreen
+app-xemacs/eshell
+app-xemacs/ess
+app-xemacs/eudc
+app-xemacs/footnote
+app-xemacs/forms
+app-xemacs/fortran-modes
+app-xemacs/frame-icon
+app-xemacs/fsf-compat
+app-xemacs/games
+app-xemacs/general-docs
+app-xemacs/gnats
+app-xemacs/gnus
+app-xemacs/haskell-mode
+app-xemacs/hm-html-menus
+app-xemacs/hyperbole
+app-xemacs/ibuffer
+app-xemacs/idlwave
+app-xemacs/igrep
+app-xemacs/ilisp
+app-xemacs/jde
+app-xemacs/latin-euro-standards
+app-xemacs/latin-unity
+app-xemacs/leim
+app-xemacs/locale
+app-xemacs/lookup
+app-xemacs/mailcrypt
+app-xemacs/mail-lib
+app-xemacs/mew
+app-xemacs/mh-e
+app-xemacs/mine
+app-xemacs/misc-games
+app-xemacs/mmm-mode
+app-xemacs/mule-base
+app-xemacs/mule-ucs
+app-xemacs/net-utils
+app-xemacs/ocaml
+app-xemacs/oo-browser
+app-xemacs/os-utils
+app-xemacs/pc
+app-xemacs/pcl-cvs
+app-xemacs/pcomplete
+app-xemacs/perl-modes
+app-xemacs/pgg
+app-xemacs/prog-modes
+app-xemacs/psgml
+app-xemacs/psgml-dtds
+app-xemacs/ps-print
+app-xemacs/python-modes
+app-xemacs/re-builder
+app-xemacs/reftex
+app-xemacs/riece
+app-xemacs/rmail
+app-xemacs/ruby-modes
+app-xemacs/sasl
+app-xemacs/scheme
+app-xemacs/semantic
+app-xemacs/sgml
+app-xemacs/sh-script
+app-xemacs/sieve
+app-xemacs/skk
+app-xemacs/slider
+app-xemacs/sml-mode
+app-xemacs/sounds-au
+app-xemacs/sounds-wav
+app-xemacs/speedbar
+app-xemacs/strokes
+app-xemacs/sun
+app-xemacs/supercite
+app-xemacs/texinfo
+app-xemacs/text-modes
+app-xemacs/textools
+app-xemacs/time
+app-xemacs/tm
+app-xemacs/tooltalk
+app-xemacs/tpu
+app-xemacs/tramp
+app-xemacs/vc
+app-xemacs/vc-cc
+app-xemacs/vhdl
+app-xemacs/view-process
+app-xemacs/viper
+app-xemacs/vm
+app-xemacs/w3
+app-xemacs/xemacs-base
+app-xemacs/xemacs-devel
+app-xemacs/xemacs-eterm
+app-xemacs/xemacs-ispell
+#app-xemacs/xemacs-packages-all
+app-xemacs/xetla
+app-xemacs/xlib
+app-xemacs/xslide
+app-xemacs/xslt-process
+app-xemacs/x-symbol
+app-xemacs/xwem
+app-xemacs/zenirc
+#in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/editor b/profiles/templates/3.5/6_ac_update_sync/world/grp/editor
index a3b0de0f..da50e866 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/editor
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/editor
@@ -1,9 +1,5 @@
 # Calculate name=world format=world
 
-#?in(os_linux_pkglist, desktop, server)!=#
-app-editors/vim
-#in#
-
 #?in(os_linux_pkglist, desktop)!=#
 app-editors/dav
 app-editors/e3
@@ -28,5 +24,4 @@ app-editors/uemacs-pk
 app-editors/vile
 app-editors/vim
 app-editors/xemacs
-app-xemacs/xemacs-packages-all
 #in#
diff --git a/profiles/templates/3.5/6_ac_update_sync/world/grp/server b/profiles/templates/3.5/6_ac_update_sync/world/grp/server
index 8f6984f1..df6f3b44 100644
--- a/profiles/templates/3.5/6_ac_update_sync/world/grp/server
+++ b/profiles/templates/3.5/6_ac_update_sync/world/grp/server
@@ -16,7 +16,7 @@ mail-filter/opendkim
 mail-filter/postgrey
 mail-filter/procmail
 mail-filter/spamassassin
-mail-mta/netqmail
+mail-mta/nullmailer
 net-dns/bind
 net-fs/netatalk
 net-fs/samba
@@ -34,7 +34,6 @@ net-wireless/hostapd
 
 #?in(os_linux_pkglist, server)!=#
 dev-db/mariadb
-mail-mta/nullmailer
 mail-mta/postfix
 net-im/ejabberd
 sys-apps/calculate-server