diff --git a/tasks/task-essential-etch b/tasks/task-essential-etch
index 215523e4..d7f01e0e 100644
--- a/tasks/task-essential-etch
+++ b/tasks/task-essential-etch
@@ -3,11 +3,11 @@
  * Generated with: 
  
  
- for i in $(cat task.list); do \
-   if [ "$i" != kde-desktop ] && [ "$i" != xfce-desktop ]; then \
-     grep-dctrl -F Task -e "^$i$" /usr/share/tasksel/debian-tasks.desc | \
-     grep-dctrl -s Key -n -e '.*'; \
-   fi; \
+ for i in $(cat task.list); do
+   if [ "$i" != kde-desktop ] && [ "$i" != xfce-desktop ]; then
+     grep-dctrl -F Task -e "^$i$" /usr/share/tasksel/debian-tasks.desc |
+     grep-dctrl -s Key -n -e '.*';
+   fi;
  done | sed -e 's? *??' | grep -v ^$ >> ./task-essential-etch
   
  * Last updated: $Date$
diff --git a/tasks/task-essential-etch-kde b/tasks/task-essential-etch-kde
index 9473f39b..94a7c0b8 100644
--- a/tasks/task-essential-etch-kde
+++ b/tasks/task-essential-etch-kde
@@ -3,11 +3,11 @@
  * Generated with: 
  
  
- for i in $(cat task.list.kde); do \
-   if [ "$i" != gnome-desktop ] && [ "$i" != xfce-desktop ]; then \
-     grep-dctrl -F Task -e "^$i$" /usr/share/tasksel/debian-tasks.desc | \
-     grep-dctrl -s Key -n -e '.*'; \
-   fi; \
+ for i in $(cat task.list.kde); do
+   if [ "$i" != gnome-desktop ] && [ "$i" != xfce-desktop ]; then
+     grep-dctrl -F Task -e "^$i$" /usr/share/tasksel/debian-tasks.desc |
+     grep-dctrl -s Key -n -e '.*';
+   fi;
  done | sed -e 's? *??' | grep -v ^$ >> ./task-essential-etch-kde
   
  * Last updated: $Date: 2006-10-28 17:40:33 -0400 (Sat, 28 Oct 2006) $
@@ -23,24 +23,19 @@ kdenetwork
 kdeutils
 kdepim
 kdm
-apache2-mpm-prefork
-exim4
-cupsys
-cupsys-client
-cupsys-bsd
-postgresql
-bind9
-nfs-kernel-server
-samba
 language-env
 language-env
 language-env
+locales
+bosnian 
 manpages-pt
 language-env
 jfbterm
 zhcon
 jfbterm
 zhcon
+locales
+croatian
 console-cyrillic
 t1-cyrillic
 language-env
@@ -53,7 +48,8 @@ language-env
 gsfonts-x11
 ttf-dejavu
 ttf-freefont
-xfonts-terminus
+xfonts-base
+xfonts-base-transcoded
 language-env
 manpages-it
 language-env
@@ -77,6 +73,8 @@ locales
 language-env
 manpages-ru
 language-env
+serbian 
+language-env
 manpages-es
 locales
 language-env
diff --git a/tasks/task-full-etch b/tasks/task-full-etch
index ad6a9297..4f1a9223 100644
--- a/tasks/task-full-etch
+++ b/tasks/task-full-etch
@@ -4,8 +4,8 @@
  * The content should be regenerated from time to time, like this:
  *
 
- for i in $(cat task.list); do \
-   grep-aptavail --regex -F Task "^$i$" -s Package -n; \
+ for i in $(cat task.list); do
+   grep-aptavail --regex -F Task "^$i$" -s Package -n;
  done >> ./task-full-etch
 
  *
diff --git a/tasks/task-full-etch-kde b/tasks/task-full-etch-kde
index a416f42c..0988760e 100644
--- a/tasks/task-full-etch-kde
+++ b/tasks/task-full-etch-kde
@@ -4,8 +4,8 @@
  * The content should be regenerated from time to time, like this:
  *
 
- for i in $(cat task.list.kde); do \
-   grep-aptavail --regex -F Task "^$i$" -s Package -n; \
+ for i in $(cat task.list.kde); do
+   grep-aptavail --regex -F Task "^$i$" -s Package -n;
  done >> ./task-full-etch-kde
 
  *
@@ -16,46 +16,39 @@
  *
  */
 
-
 alsa-base
 alsa-utils
 avahi-daemon
-desktop-base
 discover1
 eject
-firefox
 gimp
+menu
 myspell-en-us
+openoffice.org
+openoffice.org-help-en-us
 openoffice.org-thesaurus-en-us
 twm
 xdg-utils
+xorg
 xresprobe
 xsane
+desktop-base
+firefox
 libnss-mdns
-menu
-openoffice.org
-openoffice.org-help-en-us
-xorg
 kde
 kde-core
 kdeadmin
 kdeartwork
 kdegraphics
 kdemultimedia
-kdenetwork
-kdepim
 kdeutils
-kdm
 kpackage
 libqt-perl
-k3b
 openoffice.org-kde
-analog
-libapache2-mod-perl2
-libapache2-mod-php4
-libapache2-mod-python
-apache2-doc
-apache2-mpm-prefork
+k3b
+kdenetwork
+kdepim
+kdm
 acpi
 acpi-support
 acpid
@@ -63,70 +56,41 @@ anacron
 apmd
 cpufrequtils
 hibernate
-pcmciautils
-uswsusp
 wireless-tools
 xserver-xorg-input-synaptics
-mailx
-mutt
-procmail
-sa-exim
-uw-imapd
-exim4
-exim4-config
-exim4-daemon-light
-mailagent
-qpopper
-spamassassin
-postgresql
-postgresql-client
-postgresql-contrib
-postgresql-doc
-bind9
-bind9-doc
-dnsutils
-lwresd
-dlint
-netatalk
-nfs-kernel-server
-samba
-samba-doc
-smbclient
-smbfs
-swat
-winbind
+pcmciautils
+uswsusp
 aspell-ar
 itools
 ttf-arabeyes
 xfonts-intl-arabic
-kde-i18n-ar
-ttf-kacst
 firefox-locale-ar
+kde-i18n-ar
 openoffice.org-l10n-ar
-kde-i18n-eu
+ttf-kacst
 firefox-locale-eu
+kde-i18n-eu
 aspell-bn
 kde-i18n-bn
 openoffice.org-l10n-bn
 kde-i18n-bs
 openoffice.org-l10n-bs
 aspell-pt-br
+broffice.org
 ibrazilian
 manpages-pt
 myspell-pt-br
 wbrazilian
-broffice.org
-kde-i18n-ptbr
 firefox-locale-pt-br
+kde-i18n-ptbr
 openoffice.org-help-pt-br
 openoffice.org-l10n-pt-br
 aspell-bg
 ibulgarian
 myspell-bg
 wbulgarian
-kde-i18n-bg
 firefox-locale-bg
-openoffice.org-help-bg
+kde-i18n-bg
 aspell-ca
 icatalan
 myspell-ca
@@ -137,28 +101,29 @@ openoffice.org-l10n-ca
 debian-zh-faq-s
 chinput
 fcitx
+firefox-locale-zh-cn
 kde-i18n-zhcn
+openoffice.org-help-zh-cn
+openoffice.org-l10n-zh-cn
 scim-chinese
 stardic
 ttf-arphic-gbsn00lp
 ttf-arphic-gkai00mp
 xfonts-intl-chinese-big
-firefox-locale-zh-cn
-openoffice.org-help-zh-cn
-openoffice.org-l10n-zh-cn
 debian-zh-faq-t
+firefox-locale-zh-tw
 kde-i18n-zhtw
 m17n-env
+openoffice.org-help-zh-tw
+openoffice.org-l10n-zh-tw
 pydict
 scim-chewing
 ttf-arphic-bkai00mp
 ttf-arphic-bsmi00lp
 xcin
-firefox-locale-zh-tw
-openoffice.org-help-zh-tw
-openoffice.org-l10n-zh-tw
 kde-i18n-hr
 openoffice.org-l10n-hr
+openoffice.org-l10n-sr-cs
 t1-cyrillic
 t1-teams
 ttf-arhangai
@@ -169,28 +134,27 @@ xfonts-cronyx-isocyr-100dpi
 xfonts-cronyx-isocyr-75dpi
 xfonts-cronyx-isocyr-misc
 xxkb
-openoffice.org-l10n-sr-cs
 aspell-cs
 iczech
 myspell-cs-cz
-kde-i18n-cs
-openoffice.org-thesaurus-cs
 firefox-locale-cs
+kde-i18n-cs
 openoffice.org-help-cs
 openoffice.org-l10n-cs
+openoffice.org-thesaurus-cs
 aspell-da
 idanish
 wdanish
-kde-i18n-da
 firefox-locale-da
+kde-i18n-da
 openoffice.org-help-da
 openoffice.org-l10n-da
 aspell-nl
 idutch
 myspell-nl
 wdutch
-kde-i18n-nl
 firefox-locale-nl
+kde-i18n-nl
 openoffice.org-help-nl
 openoffice.org-l10n-nl
 ttf-dzongkha
@@ -203,24 +167,24 @@ aspell-fi
 ifinnish
 myspell-fi
 wfinnish
-kde-i18n-fi
 firefox-locale-fi
+kde-i18n-fi
 openoffice.org-l10n-fi
 aspell-fr
 doc-debian-fr
 doc-linux-fr-text
 ifrench-gut
-manpages-fr
 myspell-fr-gut
 wfrench
-kde-i18n-fr
+manpages-fr
 firefox-locale-fr
+kde-i18n-fr
 openoffice.org-help-fr
 openoffice.org-l10n-fr
 aspell-gl-minimos
 kde-i18n-gl
-ttf-bpg-georgian-fonts
 openoffice.org-l10n-ka
+ttf-bpg-georgian-fonts
 ding
 doc-linux-de
 ingerman
@@ -230,18 +194,18 @@ myspell-de-ch
 myspell-de-de
 trans-de-en
 wngerman
+firefox-locale-de
 kde-i18n-de
+openoffice.org-help-de
 openoffice.org-hyphenation-de
+openoffice.org-l10n-de
 openoffice.org-thesaurus-de
 openoffice.org-thesaurus-de-ch
-firefox-locale-de
-openoffice.org-help-de
-openoffice.org-l10n-de
 myspell-el-gr
-kde-i18n-el
-ttf-mgopen
 firefox-locale-el
+kde-i18n-el
 openoffice.org-l10n-el
+ttf-mgopen
 aspell-he
 bidiv
 culmus
@@ -249,10 +213,10 @@ hspell
 libfribidi0
 libhdate1
 myspell-he
+firefox-locale-he
 hdate-applet
 hspell-gui
 kde-i18n-he
-firefox-locale-he
 openoffice.org-l10n-he
 aspell-hi
 kde-i18n-hi
@@ -260,86 +224,85 @@ openoffice.org-l10n-hi-in
 aspell-hu
 ihungarian
 manpages-hu
+firefox-locale-hu
 gsfonts-x11
 kde-i18n-hu
+openoffice.org-help-hu
 openoffice.org-hyphenation-hu
+openoffice.org-l10n-hu
 ttf-isabella
 ttf-junicode
+ttf-opensymbol
 ttf-sil-charis
 ttf-sil-doulos
-firefox-locale-hu
-openoffice.org-help-hu
-openoffice.org-l10n-hu
-ttf-opensymbol
 aspell-is
 kde-i18n-is
 aspell-ga
 myspell-ga
-kde-i18n-ga
 firefox-locale-ga-ie
+kde-i18n-ga
 openoffice.org-l10n-ga
 apt-howto-it
+aspell-it
 debian-reference-it
 doc-linux-it
 doc-linux-it-text
 fortunes-it
+iitalian
 maint-guide-it
 myspell-it
 witalian
-aspell-it
-iitalian
 manpages-it
-kde-i18n-it
-openoffice.org-thesaurus-it
 firefox-locale-it
+kde-i18n-it
 openoffice.org-help-it
 openoffice.org-l10n-it
-anthy
+openoffice.org-thesaurus-it
 doc-linux-ja-text
 lv
 manpages-ja
 manpages-ja-dev
 nkf
+anthy
 uim-anthy
 uim-fep
 uim-utils
 doc-linux-ja-html
+firefox-locale-ja
 kde-i18n-ja
+openoffice.org-help-ja
+openoffice.org-l10n-ja
 ttf-kochi-gothic
 ttf-kochi-mincho
 ttf-vlgothic
 uim
-firefox-locale-ja
-openoffice.org-help-ja
-openoffice.org-l10n-ja
 khmerconverter
 kde-i18n-km
-ttf-khmeros
 openoffice.org-help-km
 openoffice.org-l10n-km
+ttf-khmeros
 manpages-ko
+firefox-locale-ko
 imhangul
 imhangul-status-applet
 kde-i18n-ko
 nabi
+openoffice.org-help-ko
+openoffice.org-l10n-ko
 ttf-baekmuk
 ttf-unfonts
 xfonts-baekmuk
-firefox-locale-ko
-openoffice.org-help-ko
-openoffice.org-l10n-ko
 kde-i18n-lv
 openoffice.org-l10n-lv
 aspell-lt
 ilithuanian
 myspell-lt
-kde-i18n-lt
 firefox-locale-lt
+kde-i18n-lt
 openoffice.org-hyphenation-lt
 openoffice.org-l10n-lt
-kde-i18n-mk
 firefox-locale-mk
-openoffice.org-help-mk
+kde-i18n-mk
 openoffice.org-l10n-mk
 openoffice.org-l10n-ne
 kde-i18n-se
@@ -348,9 +311,9 @@ inorwegian
 myspell-nb
 myspell-nn
 wnorwegian
+firefox-locale-nb-no
 kde-i18n-nb
 kde-i18n-nn
-firefox-locale-nb-no
 openoffice.org-l10n-nb
 openoffice.org-l10n-nn
 kde-i18n-fa
@@ -361,39 +324,38 @@ ipolish
 manpages-pl
 manpages-pl-dev
 wpolish
-kde-i18n-pl
 firefox-locale-pl
+kde-i18n-pl
 openoffice.org-help-pl
 openoffice.org-l10n-pl
 aspell-pt
 kde-i18n-pt
 openoffice.org-l10n-pt
 aspell-pa
-kde-i18n-pa
-ttf-punjabi-fonts
 firefox-locale-pa-in
+kde-i18n-pa
 openoffice.org-l10n-pa-in
-kde-i18n-ro
+ttf-punjabi-fonts
 firefox-locale-ro
-irussian
+kde-i18n-ro
 manpages-ru
 mueller7-dict
-myspell-ru
 re
-kde-i18n-ru
+irussian
+myspell-ru
 firefox-locale-ru
+kde-i18n-ru
 openoffice.org-help-ru
 aspell-sk
 myspell-sk
-kde-i18n-sk
-openoffice.org-thesaurus-sk
 firefox-locale-sk
-openoffice.org-help-sk
+kde-i18n-sk
 openoffice.org-l10n-sk
+openoffice.org-thesaurus-sk
 aspell-sl
 myspell-sl
-kde-i18n-sl
 firefox-locale-sl
+kde-i18n-sl
 openoffice.org-help-sl
 openoffice.org-l10n-sl
 aspell-es
@@ -404,34 +366,34 @@ ispanish
 manpages-es
 myspell-es
 wspanish
-kde-i18n-es
 firefox-locale-es-ar
 firefox-locale-es-es
+kde-i18n-es
 openoffice.org-help-es
 openoffice.org-l10n-es
 aspell-sv
 iswedish
 myspell-sv-se
 wswedish
+firefox-locale-sv-se
 gimp-help-sv
 kde-i18n-sv
-firefox-locale-sv-se
 openoffice.org-help-sv
 openoffice.org-l10n-sv
 aspell-tl
 kde-i18n-ta
-ttf-tamil-fonts
 openoffice.org-l10n-ta-in
+ttf-tamil-fonts
 myspell-th
 swath
 gtk-im-libthai
+openoffice.org-l10n-th
 pango-libthai
 xfonts-thai
 xiterm+thai
-openoffice.org-l10n-th
 manpages-tr
-kde-i18n-tr
 firefox-locale-tr
+kde-i18n-tr
 openoffice.org-l10n-tr
 aspell-uk
 iukrainian
diff --git a/tasks/task.list.kde b/tasks/task.list.kde
index 14dbdcba..87bd24d5 100644
--- a/tasks/task.list.kde
+++ b/tasks/task.list.kde
@@ -1,12 +1,6 @@
 desktop
 kde-desktop
-web-server
 laptop
-mail-server
-print-server
-database-server
-dns-server
-file-server
 arabic
 arabic-desktop
 basque-desktop