diff --git a/client/handlers/main.yml b/client/handlers/main.yml
index d453a798a15d0d70715b48065482f7438148cd9e..780a50b3c6bf228c7f9e34f1dd37c9644a27770d 100644
--- a/client/handlers/main.yml
+++ b/client/handlers/main.yml
@@ -2,4 +2,4 @@
 # file: roles/client/handlers/main.yml
 
 - name: restart kdm
-  service: name=kdm state=restarted
+  service: name=sddm state=restarted
diff --git a/client/tasks/desktop.yml b/client/tasks/desktop.yml
index b0819f717e7fe0bc0523cf6b6d085ba1f0bda4d8..1fd01f90a66ed07288bd89322217f30023b0401e 100644
--- a/client/tasks/desktop.yml
+++ b/client/tasks/desktop.yml
@@ -1,24 +1,19 @@
 ---
 # file: roles/client/tasks/desktop.yml
 
+- include: kde.yml
+
 - name: ensure office applications are installed
   apt: name={{ item }} state=latest
   with_items:
-    - libreoffice
-    - libreoffice-writer
-    - libreoffice-calc
-    - libreoffice-draw
-    - libreoffice-kde
-    - libreoffice-math
-    - libreoffice-pdfimport
-    - libreoffice-presenter-console
-    - libreoffice-impress
+    - libreoffice # this is a meta-package
     - gimp
     - gimp-dcraw
     - gimp-texturize
     - gnucash
-    - scribus-ng
-    - scribus-ng-doc
+    - scribus
+    - scribus-doc
+    - scribus-template
     - gv
     - inkscape
     - ttf-mscorefonts-installer
@@ -45,7 +40,7 @@
     - emacs
     - joe
     - python-openssl
-    - python-scientific
+    - python-numpy
     - python-scipy
     - python-matplotlib
     - ipython
@@ -65,9 +60,9 @@
     - python-opencv
     - python-pip
     - python-virtualenv
-    - root-system
+    #- root-system
     - octave
-    - libroot-bindings-python5.34
+    #- libroot-bindings-python5.34
     - mysql-client
     - libasound2-dev
     - libx11-dev
@@ -91,7 +86,6 @@
     - enigmail
     - chromium
     - chromium-l10n
-    - kopete
     - pidgin
     - pidgin-otr
     - pidgin-themes
@@ -124,8 +118,6 @@
     - packages
     - multimedia
 
-- include: kde.yml
-
 - name: ensure desktop environments are installed
   apt: name={{ item }} state=latest
   with_items:
@@ -210,32 +202,32 @@
     - config
     - desktop
 
-- name: ensure we got a properly configured kdm
-  copy: src=kdm/kdmrc dest=/etc/kde4/kdm/kdmrc owner=root group=root mode=0644
-  tags:
-    - config
-    - desktop
-    - fsmpi
-
-- name: ensure deployment of a nice kdm theme
-  copy: src=kdm/fsmpi_theme/ dest=/usr/share/kde4/apps/kdm/themes/fsmpi owner=root group=root mode=0644
-  tags:
-    - config
-    - desktop
-    - fsmpi
-
-- name: ensure kdm is enabled
-  service: name=kdm state=running
-  tags:
-    - service
-    - desktop
-
-- name: ensure deployment of kde provisioning
-  copy: src=kde/ dest=/etc/kde4 owner=root group=root mode=0644
-  tags:
-    - config
-    - desktop
-    - fsmpi
+#- name: ensure we got a properly configured kdm
+#  copy: src=kdm/kdmrc dest=/etc/kde4/kdm/kdmrc owner=root group=root mode=0644
+#  tags:
+#    - config
+#    - desktop
+#    - fsmpi
+#
+#- name: ensure deployment of a nice kdm theme
+#  copy: src=kdm/fsmpi_theme/ dest=/usr/share/kde4/apps/kdm/themes/fsmpi owner=root group=root mode=0644
+#  tags:
+#    - config
+#    - desktop
+#    - fsmpi
+#
+#- name: ensure kdm is enabled
+#  service: name=kdm state=running
+#  tags:
+#    - service
+#    - desktop
+#
+#- name: ensure deployment of kde provisioning
+#  copy: src=kde/ dest=/etc/kde4 owner=root group=root mode=0644
+#  tags:
+#    - config
+#    - desktop
+#    - fsmpi
 
 - name: ensure we have the correct printer
   template: src=lpoptions.j2 dest=/etc/cups/lpoptions owner=root group=root mode=0644
diff --git a/client/tasks/kde.yml b/client/tasks/kde.yml
index 62f89f6ca7ca23d69a536ad9c4ce2e8612783071..15b6e3ddb7500421da9d622b7bf118165f8b59bd 100644
--- a/client/tasks/kde.yml
+++ b/client/tasks/kde.yml
@@ -2,13 +2,13 @@
 # file: roles/client/tasks/kde.yml
 
 
-- name: ensure reasonabel subset of kde-baseapps is installed 
+- name: ensure reasonable subset of kde-baseapps is installed 
   apt: name={{ item }} state=latest
   with_items:
     - dolphin
     - kde-baseapps-bin
     - konsole
-    - plasma-widget-folderview
+    - kdepasswd
   tags:
     - packages
     - kde
@@ -18,12 +18,12 @@
 - name: ensure reasonable subset of kde-plasma-desktop is installed
   apt: name={{ item }} state=latest
   with_items:
-    - kde-workspace
     - plasma-desktop
+    - plasma-workspace
     - kde-runtime
     - udisks2
     - upower
-    - kdm
+    - sddm
     - xserver-xorg
   tags:
     - packages
@@ -31,15 +31,32 @@
     - desktop
     - kde-plasma-desktop
 
+- name: ensure reasonable subset of kde-standard is installed
+  apt: name={{ item }} state=latest
+  with_items:
+    - ark
+    - gwenview
+    - kate
+    - kcalc
+    - kde-spectacle
+    - khelpcenter
+    - kwalletmanager
+    - okular
+    - plasma-dataengines-addons
+    - plasma-pa
+    - plasma-runners-addons
+    - plasma-wallpapers-addons
+    - plasma-widgets-addons
+    - polkit-kde-agent-1
+    - sweeper
 
 - name: ensure reasonable subset of kde-full is installed
   apt: name={{ item }} state=latest
   with_items:
     - kdeartwork
+    - kdeadmin
     - kdegames
     - kdegraphics
-    - kmix 
-    - kdeplasma-addons
     - kdeutils
   tags:
     - packages
@@ -51,12 +68,9 @@
   apt: name={{ item }} state=latest
   with_items:
     - gtk2-engines-oxygen
-    - gtk3-engines-oxygen
+    - gtk3-engines-breeze
     - kde-config-gtk-style
-    - kate
     - kde-l10n-de
-    - plasma-desktopthemes-artwork
-    - ksnapshot
   tags:
     - packages
     - kde