diff --git a/client/files/deb-mozilla.gpg b/client/files/deb-mozilla.gpg
deleted file mode 100644
index 6e183ca25920d2e283974e2a4f9459a8c811fa9b..0000000000000000000000000000000000000000
--- a/client/files/deb-mozilla.gpg
+++ /dev/null
@@ -1,43 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-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
-sOl6WgCYzXHdullu24QI3oC8p7MXbcol8g==
-=hjHb
------END PGP PUBLIC KEY BLOCK-----
diff --git a/client/files/displayManager b/client/files/displayManager
deleted file mode 100644
index 7d6c14c246a71648fbd59395c5ba8ac38fd98449..0000000000000000000000000000000000000000
--- a/client/files/displayManager
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/kdm
diff --git a/client/files/i3lock b/client/files/i3lock
index c720a50ea6c7a916615f14c89dda266da60a9ba7..182b23a2a042c277027c9b355e8c1057eef4166a 100644
--- a/client/files/i3lock
+++ b/client/files/i3lock
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/lib/kde4/libexec/kscreenlocker_greet --testing
+exec /usr/bin/qdbus org.freedesktop.ScreenSaver /ScreenSaver org.freedesktop.ScreenSaver.Lock
diff --git a/client/files/icedove/defaults/pref/vendor.js b/client/files/icedove/defaults/pref/vendor.js
deleted file mode 100644
index 13e07931133cdb7313fbddaa9df53b333a31b192..0000000000000000000000000000000000000000
--- a/client/files/icedove/defaults/pref/vendor.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// Forbid application updates
-lockPref("app.update.enabled", false);
-
-// Pointing the "Help -> What's new" menu entry to mozilla.debian.net
-// pref("mailnews.start_page.override_url", "http://wiki.debian.org/Icedove/WhatsNew45");
-
diff --git a/client/files/iceweasel/defaults/pref/local-settings.js b/client/files/mozilla/firefox/defaults/pref/local-settings.js
similarity index 100%
rename from client/files/iceweasel/defaults/pref/local-settings.js
rename to client/files/mozilla/firefox/defaults/pref/local-settings.js
diff --git a/client/files/iceweasel/mozilla.cfg b/client/files/mozilla/firefox/mozilla.cfg
similarity index 100%
rename from client/files/iceweasel/mozilla.cfg
rename to client/files/mozilla/firefox/mozilla.cfg
diff --git a/client/files/icedove/defaults/pref/asta.js b/client/files/mozilla/thunderbird/defaults/pref/vendor.js
similarity index 96%
rename from client/files/icedove/defaults/pref/asta.js
rename to client/files/mozilla/thunderbird/defaults/pref/vendor.js
index 7a7395fc44be2ed4bc0e1975d9b154f1ec464734..03771c2cd54f3141231d4521b248c1c7f62c1a2f 100644
--- a/client/files/icedove/defaults/pref/asta.js
+++ b/client/files/mozilla/thunderbird/defaults/pref/vendor.js
@@ -24,6 +24,11 @@ pref("mail.quota.mainwindow_threshold.warning", 80);
 pref("mail.quota.mainwindow_threshold.critical", 95);
 
 
+pref("mail.provider.enabled", false)
+
+
+
+
 // find out how this works...
 // // define asta mail account
 // pref("mail.accountmanager.appendaccounts", "AStA");
diff --git a/client/files/sddm.conf b/client/files/sddm.conf
new file mode 100644
index 0000000000000000000000000000000000000000..4d01a85ccdc2237c9ce0a139f6ae83656de52fca
--- /dev/null
+++ b/client/files/sddm.conf
@@ -0,0 +1,124 @@
+[Autologin]
+# Whether sddm should automatically log back into sessions when they exit
+Relogin=false
+
+# Name of session file for autologin session
+Session=
+
+# Username for autologin session
+User=
+
+
+[General]
+# Enable Qt's automatic high-DPI scaling
+EnableHiDPI=false
+
+# Halt command
+HaltCommand=/bin/systemctl poweroff
+
+# Input method module
+InputMethod=
+
+# Initial NumLock state. Can be on, off or none.
+# If property is set to none, numlock won't be changed
+# NOTE: Currently ignored if autologin is enabled.
+Numlock=none
+
+# Reboot command
+RebootCommand=/bin/systemctl reboot
+
+
+[Theme]
+# Current theme name
+Current=breeze
+# Cursor theme used in the greeter
+CursorTheme=breeze_cursors
+
+
+
+# Number of users to use as threshold
+# above which avatars are disabled
+# unless explicitly enabled with EnableAvatars
+DisableAvatarsThreshold=7
+
+# Enable display of custom user avatars
+EnableAvatars=true
+
+# Global directory for user avatars
+# The files should be named <username>.face.icon
+FacesDir=/usr/share/sddm/faces
+
+# Theme directory path
+ThemeDir=/usr/share/sddm/themes
+
+
+[Users]
+# Default $PATH for logged in users
+DefaultPath=/bin:/usr/bin
+
+# Comma-separated list of shells.
+# Users with these shells as their default won't be listed
+HideShells=
+
+# Comma-separated list of users that should not be listed
+HideUsers=
+
+# Maximum user id for displayed users
+MaximumUid=60000
+
+# Minimum user id for displayed users
+MinimumUid=1000
+
+# Remember the session of the last successfully logged in user
+RememberLastSession=true
+
+# Remember the last successfully logged in user
+RememberLastUser=false
+
+
+[Wayland]
+# Path to a script to execute when starting the desktop session
+SessionCommand=/usr/share/sddm/scripts/wayland-session
+
+# Directory containing available Wayland sessions
+SessionDir=/usr/share/wayland-sessions
+
+# Path to the user session log file
+SessionLogFile=.local/share/sddm/wayland-session.log
+
+
+[X11]
+# Path to a script to execute when starting the display server
+DisplayCommand=/usr/share/sddm/scripts/Xsetup
+
+# Path to a script to execute when stopping the display server
+DisplayStopCommand=/usr/share/sddm/scripts/Xstop
+
+# The lowest virtual terminal number that will be used.
+MinimumVT=7
+
+# Arguments passed to the X server invocation
+ServerArguments=-nolisten tcp
+
+# Path to X server binary
+ServerPath=/usr/bin/X
+
+# Path to a script to execute when starting the desktop session
+SessionCommand=/etc/sddm/Xsession
+
+# Directory containing available X sessions
+SessionDir=/usr/share/xsessions
+
+# Path to the user session log file
+SessionLogFile=.local/share/sddm/xorg-session.log
+
+# Path to the Xauthority file
+UserAuthFile=.Xauthority
+
+# Path to xauth binary
+XauthPath=/usr/bin/xauth
+
+# Path to Xephyr binary
+XephyrPath=/usr/bin/Xephyr
+
+
diff --git a/client/tasks/kde.yml b/client/tasks/kde.yml
index a793018053a9cd1d8f37dfb3ac5de9613ff68818..e1e8f8ac97da07249fa33e68236a82f0c33195de 100644
--- a/client/tasks/kde.yml
+++ b/client/tasks/kde.yml
@@ -78,21 +78,18 @@
 
 - name: ensure kde nepomuk is disabled
   file: path=/usr/share/autostart/nepomukserver.desktop state=absent
-
-- name: ensure a rotten default session manager
-  alternatives: name=x-session-manager path=/usr/bin/startkde
-
-- name: ensure a rotten default display manager
-  copy: src=displayManager dest=/etc/X11/default-display-manager owner=root group=root mode=0644
-
-#- name: ensure we got a properly configured kdm
-#  copy: src=kdm/kdmrc dest=/etc/kde4/kdm/kdmrc owner=root group=root mode=0644
+  
+  - name: ensure we got a properly configured sddm
+  copy: src=sddm.conf dest=/etc/sddm.conf owner=root group=root mode=0644
 #
 #- 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
 #
-#- name: ensure kdm is enabled
-#  service: name=kdm state=running
+- name: ensure sddm is running
+  service: name=sddm state=running
+  
+- name: ensure sddm is enabled
+  service: name=sddm state=enabled
 #
 #- name: ensure deployment of kde provisioning
 #  copy: src=kde/ dest=/etc/kde4 owner=root group=root mode=0644
diff --git a/client/tasks/main.yml b/client/tasks/main.yml
index ac7c66a3f2301bcdda9961b7d3be1578fc049031..d3b96bf692afb385fe8fa7b87503cba36a0b3e89 100644
--- a/client/tasks/main.yml
+++ b/client/tasks/main.yml
@@ -1,8 +1,6 @@
 ---
 # file: roles/client/tasks/main.yml
 
-- include: mozilla.yml
-- meta: flush_handlers
 - include: kde.yml
 - meta: flush_handlers
 - include: software.yml
diff --git a/client/tasks/mozilla.yml b/client/tasks/mozilla.yml
deleted file mode 100644
index b646963d2ae2d8f9b60e3df7e401f52766b9443f..0000000000000000000000000000000000000000
--- a/client/tasks/mozilla.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-# file: roles/client/tasks/mozilla.yml
-
-- name: ensure the mozilla apt key is not in the keyring
-  apt: name=pkg-mozilla-archive-keyring state=absent
-  notify:
-    - update apt cache
-  tags:
-    - client
-    - repo
-
-- name: ensure iceweasel-release repository is not used anymore
-  apt_repository: repo='deb http://mozilla.debian.net/ jessie-backports iceweasel-release' state=absent
-  notify:
-    - update apt cache
-  tags:
-    - client
-    - repo
-
-- name: ensure firefox-release repository is not used anymore
-  apt_repository: repo='deb http://mozilla.debian.net/ jessie-backports firefox-release' state=absent
-  notify:
-    - update apt cache
-  tags:
-    - client
-    - repo
-