diff --git a/profiles/templates/6_ac_update_sync/world/create/netapps b/profiles/templates/6_ac_update_sync/world/create/netapps
index 1e05d07..108bdae 100644
--- a/profiles/templates/6_ac_update_sync/world/create/netapps
+++ b/profiles/templates/6_ac_update_sync/world/create/netapps
@@ -2,6 +2,9 @@
 
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CCM, CDS)!=#
 app-text/wgetpaste
+#in#
+
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CDS)!=#
 net-analyzer/nmap
 net-analyzer/traceroute
 net-dns/bind-tools
@@ -31,11 +34,6 @@ mail-client/claws-mail
 net-irc/hexchat
 #in#
 
-#?in(os_linux_pkglist, CCM, CDS)!=#
-net-analyzer/tcpdump
-net-analyzer/vnstat
-#in#
-
 #?in(os_linux_pkglist, CLD)!=#
 kde-apps/krdc
 kde-apps/krfb
@@ -45,8 +43,6 @@ net-p2p/ktorrent
 
 #?in(os_linux_pkglist, CCM)!=#
 mail-mta/nullmailer
-net-analyzer/nload
-net-analyzer/wireshark
 #in#
 
 #?in(os_linux_pkglist, CDS)!=#
@@ -54,6 +50,8 @@ net-analyzer/fail2ban
 net-analyzer/iptraf-ng
 net-analyzer/macchanger
 net-analyzer/sarg
+net-analyzer/tcpdump
+net-analyzer/vnstat
 net-dialup/minicom
 net-fs/samba
 net-ftp/tftp-hpa
diff --git a/profiles/templates/6_ac_update_sync/world/create/tools b/profiles/templates/6_ac_update_sync/world/create/tools
index f539eec..6a1184d 100644
--- a/profiles/templates/6_ac_update_sync/world/create/tools
+++ b/profiles/templates/6_ac_update_sync/world/create/tools
@@ -16,15 +16,12 @@ sys-fs/xfsprogs
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CCM, CDS, CLS)!=#
 app-admin/logrotate
 app-admin/syslog-ng
-sys-apps/ethtool
 sys-apps/usbutils
 sys-process/cronie
 #in#
 
-#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS)!=#
-sys-apps/inxi
-sys-fs/mdadm
-sys-process/htop
+#?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CDS, CLS)!=#
+sys-apps/ethtool
 #in#
 
 #?in(os_linux_pkglist, CLD, CLDC, CLDL, CLDM, CLDX, CLDXS, CDS)!=#
@@ -52,16 +49,19 @@ app-arch/p7zip
 app-arch/rar
 app-arch/unzip
 sys-apps/hdparm
+sys-apps/inxi
 sys-apps/keyexec
 sys-apps/pcmciautils
 sys-apps/usb_modeswitch
 sys-fs/exfatprogs
+sys-fs/mdadm
 sys-fs/ntfs3g
 sys-power/acpi
 sys-power/acpid
 sys-power/cpupower
 sys-power/powernowd
 sys-power/powertop
+sys-process/htop
 #in#
 
 #?in(os_linux_pkglist, CLD, CLDL, CLDM, CLDX, CLDXS)!=#