diff --git a/roles/core/files/munin-node.conf b/roles/core/files/munin-node.conf
new file mode 100644
index 0000000..279b14c
--- /dev/null
+++ b/roles/core/files/munin-node.conf
@@ -0,0 +1,64 @@
+#
+# Example config-file for munin-node
+#
+
+log_level 4
+log_file /var/log/munin/munin-node.log
+pid_file /var/run/munin/munin-node.pid
+
+background 1
+setsid 1
+
+user root
+group root
+
+# This is the timeout for the whole transaction.
+# Units are in sec. Default is 15 min
+#
+# global_timeout 900
+
+# This is the timeout for each plugin.
+# Units are in sec. Default is 1 min
+#
+# timeout 60
+
+# Regexps for files to ignore
+ignore_file [\#~]$
+ignore_file DEADJOE$
+ignore_file \.bak$
+ignore_file %$
+ignore_file \.dpkg-(tmp|new|old|dist)$
+ignore_file \.rpm(save|new)$
+ignore_file \.pod$
+
+# Set this if the client doesn't report the correct hostname when
+# telnetting to localhost, port 4949
+#
+#host_name localhost.localdomain
+
+# A list of addresses that are allowed to connect.  This must be a
+# regular expression, since Net::Server does not understand CIDR-style
+# network notation unless the perl module Net::CIDR is installed.  You
+# may repeat the allow line as many times as you'd like
+
+allow ^127\.0\.0\.1$
+allow ^129\.97\.134\.51$
+allow ^::1$
+
+# If you have installed the Net::CIDR perl module, you can use one or more
+# cidr_allow and cidr_deny address/mask patterns.  A connecting client must
+# match any cidr_allow, and not match any cidr_deny.  Note that a netmask
+# *must* be provided, even if it's /32
+#
+# Example:
+#
+# cidr_allow 127.0.0.1/32
+# cidr_allow 192.0.2.0/24
+# cidr_deny  192.0.2.42/32
+
+# Which address to bind to;
+host *
+# host 127.0.0.1
+
+# And which port
+port 4949
diff --git a/roles/core/tasks/packages.yml b/roles/core/tasks/packages.yml
index f0f9d03..845b440 100644
--- a/roles/core/tasks/packages.yml
+++ b/roles/core/tasks/packages.yml
@@ -2,43 +2,18 @@
 
 - name: Remove unecessary packages
   apt:
-    name: '{{ item }}'
+    name: ['joe', 'lirc', 'pipentd', 'winbind', 'modemmanager', 'sn', 'network-manager', 'wpasupplicant']
     state: absent
-  with_items:
-    - joe
-    - lirc
-    - pipentd
-    - winbind
-    - modemmanager
-    - sn
-    - network-manager
-    - wpasupplicant
-    - sn
 
 - name: Install shells
   apt:
-    name: '{{ item }}'
+    name: ['bash', 'bash-completion', 'bash-doc', 'zsh', 'zsh-doc', 'dash', 'ksh', 'tcsh', 'csh', 'rc']
     cache_valid_time: 3600
-  with_items:
-    - bash
-    - bash-completion
-    - bash-doc
-    - zsh
-    - zsh-doc
-    - dash
-    - ksh
-    - tcsh
-    - csh
-    - rc
 
 - name: Install editors
   apt:
-    name: '{{ item }}'
+    name: ['vim-nox', 'ed', 'nano', 'emacs']
     cache_valid_time: 3600
-  with_items:
-    - vim-nox
-    - ed
-    - nano
 
 - name: Install words
   apt:
@@ -47,71 +22,19 @@
 
 - name: Install utils
   apt:
-    name: '{{ item }}'
+    name: ['acl', 'less', 'lsof', 'bc', 'dc', 'psmisc', 'procps', 'htop', 'schedtool', 'pciutils', 'iftop', 'attr', 'tree', 'parted', 'rsync', 'ncdu']
     cache_valid_time: 3600
-  with_items:
-    - acl
-    - less
-    - lsof
-    - bc
-    - dc
-    - psmisc
-    - procps
-    - htop
-    - schedtool
-    - pciutils
-    - iftop
-    - attr
-    - tree
-    - parted
-    - rsync
-    - ncdu
 
 - name: Install network tools
   apt:
-    name: '{{ item }}'
+    name: ['iotop', 'iputils-ping', 'iputils-arping', 'traceroute', 'telnet', 'iproute2', 'ethtool', 'dnsutils', 'whois', 'wget', 'curl', 'netcat-traditional', 'netcat-openbsd', 'vlan', 'bridge-utils', 'tcpdump', 'tshark', 'ftp', 'tftp', 'iptables', 'ebtables', 'arptables', 'nmap', 'socat', 'ipmitool']
     cache_valid_time: 3600
-  with_items:
-    - iotop
-    - iputils-ping
-    - iputils-arping
-    - traceroute
-    - telnet
-    - iproute2
-    - ethtool
-    - dnsutils
-    - whois
-    - wget
-    - curl
-    - netcat-traditional
-    - netcat-openbsd
-    - vlan
-    - bridge-utils
-    - tcpdump
-    - tshark
-    - ftp
-    - tftp
-    - iptables
-    - ebtables
-    - arptables
-    - nmap
-    - socat
-    - ipmitool
 
 - name: Install physical tools
   when: not(ansible_virtualization_role == 'guest')
   apt:
-    name: '{{ item }}'
+    name: ['lm-sensors', 'smartmontools', 'hwinfo', 'lshw', 'acpi', 'vbetool', 'fbset', 'read-edid', 'munin-node']
     cache_valid_time: 3600
-  with_items:
-    - lm-sensors
-    - smartmontools
-    - hwinfo
-    - lshw
-    - acpi
-    - vbetool
-    - fbset
-    - read-edid
 
 - name: Enable sysrq
   when: not(ansible_virtualization_role == 'guest')
@@ -120,41 +43,37 @@
     line: kernel.sysrq = 1
     state: present
 
+- name: Copy munin-node configuration
+  when: not(ansible_virtualization_role == 'guest')
+  copy:
+    src: 'munin-node.conf'
+    dest: '/etc/munin/munin-node.conf'
+
+- name: Restart munin-node
+  when: not(ansible_virtualization_role == 'guest')
+  service:
+    name: 'munin-node'
+    state: 'restarted'
+    enabled: 'yes'
+
 - name: Install terminal multiplexers
   apt:
-    name: '{{ item }}'
+    name: ['tmux', 'screen']
     cache_valid_time: 3600
-  with_items:
-    - tmux
-    - screen
-
 - name: Install compression tools
   apt:
-    name: '{{ item }}'
+    name: ['bzip2', 'gzip', 'pax', 'lzma', 'xz-utils', 'cpio']
     cache_valid_time: 3600
-  with_items:
-    - bzip2
-    - gzip
-    - pax
-    - lzma
-    - xz-utils
-    - cpio
 
 - name: Install ncurses
   apt:
-    name: '{{ item }}'
+    name: ['ncurses-bin', 'ncurses-term']
     cache_valid_time: 3600
-  with_items:
-    - ncurses-bin
-    - ncurses-term
 
 - name: Install Debian package management tools
   apt:
-    name: '{{ item }}'
+    name: ['aptitude', 'dselect']
     cache_valid_time: 3600
-  with_items:
-    - aptitude
-    - dselect
 
 - name: Install gpg
   apt:
@@ -163,11 +82,8 @@
 
 - name: Install man pages
   apt:
-    name: '{{ item }}'
+    name: ['manpages', 'info']
     cache_valid_time: 3600
-  with_items:
-    - manpages
-    - info
 
 - name: Install etckeeper
   apt:
diff --git a/roles/core/tasks/remote_access.yml b/roles/core/tasks/remote_access.yml
index be30785..3d2b2ad 100644
--- a/roles/core/tasks/remote_access.yml
+++ b/roles/core/tasks/remote_access.yml
@@ -9,11 +9,8 @@
 
 - name: Install packages for remote access
   apt:
-    name: '{{ item }}'
+    name: ['openssh-client', 'mosh']
     cache_valid_time: 3600
-  with_items:
-    - openssh-client
-    - mosh
 
 - name: Configure OpenSSH server
   copy:
diff --git a/roles/csc-auth/tasks/main.yml b/roles/csc-auth/tasks/main.yml
index aaf8258..1cd76bd 100644
--- a/roles/csc-auth/tasks/main.yml
+++ b/roles/csc-auth/tasks/main.yml
@@ -9,25 +9,13 @@
 
 - name: Remove unecessary authentication packages
   apt:
-    name: '{{ item }}'
+    name: ['libpam-ldapd', 'libpam-ldap', 'nscd', 'nslcd']
     state: absent
-  with_items:
-    - libpam-ldapd
-    - libpam-ldap
-    - nscd
-    - nslcd
 
 - name: Install authentication packages
   apt:
-    name: '{{ item }}'
+    name: ['sssd-tools', 'krb5-user', 'ldap-utils', 'kstart', 'sudo', 'libpam-csc']
     cache_valid_time: 3600
-  with_items:
-    - sssd-tools
-    - krb5-user
-    - ldap-utils
-    - kstart
-    - sudo
-    - libpam-csc
 
 - name: Configure sssd
   copy:
diff --git a/roles/devel/tasks/main.yml b/roles/devel/tasks/main.yml
index 578c61a..85e5741 100644
--- a/roles/devel/tasks/main.yml
+++ b/roles/devel/tasks/main.yml
@@ -8,26 +8,9 @@
 
 - name: Install debian development tools
   apt:
-    name: '{{ item }}'
+    name: ['dpkg-dev', 'devscripts', 'debootstrap', 'dupload', 'fakeroot', 'debhelper', 'dh-make', 'dh-make-perl', 'dh-buildinfo', 'cdbs', 'dpatch', 'lintian', 'alien', 'po-debconf', 'pbuilder', 'dpkg-repack']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - dpkg-dev
-    - devscripts
-    - debootstrap
-    - dupload
-    - fakeroot
-    - debhelper
-    - dh-make
-    - dh-make-perl
-    - dh-buildinfo
-    - cdbs
-    - dpatch
-    - lintian
-    - alien
-    - po-debconf
-    - pbuilder
-    - dpkg-repack
 
 #- name: Install kernel-package (not Debian Stretch)
 #  when: not(ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch')
@@ -43,181 +26,64 @@
 
 - name: Install llvm
   apt:
-    name: '{{ item }}'
+    name: ['clang', 'llvm', 'llvm-dev']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - clang
-    - llvm
-    - llvm-dev
 
 - name: Install build helpers
   apt:
-    name: '{{ item }}'
+    name: ['make', 'make-doc', 'autoconf', 'autoconf-doc', 'automake', 'cmake', 'ccache', 'ant', 'ant-optional', 'scons', 'qt4-qmake', 'qt5-qmake', 'autogen', 'autotools-dev', 'autoproject', 'kbuild', 'premake4', 'maven']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - make
-    - make-doc
-    - autoconf
-    - autoconf-doc
-    - automake
-    - cmake
-    - ccache
-    - ant
-    - ant-optional
-    - scons
-    - qt4-qmake
-    - qt5-qmake
-    - autogen
-    - autotools-dev
-    - autoproject
-    - kbuild
-    - premake4
-    - maven
 
 - name: Install debuggers
   apt:
-    name: '{{ item }}'
+    name: ['strace', 'gdb', 'elfutils', 'valgrind', 'libc6-dbg', 'binutils']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - strace
-    - gdb
-    - elfutils
-    - valgrind
-    - libc6-dbg
 
 - name: Install documentation
   apt:
-    name: '{{ item }}'
+    name: ['manpages-dev', 'binutils-doc', 'manpages-posix-dev', 'glibc-doc', 'glibc-doc-reference', 'gdb-doc', 'stl-manual', 'perl-doc']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - manpages-dev
-    # - gcc-doc
-    # - cpp-doc
-    - binutils-doc
-    - manpages-posix-dev
-    - glibc-doc
-    - glibc-doc-reference
-    - gdb-doc
-    - stl-manual
-    - perl-doc
 
 - name: Install languages
   apt:
-    name: '{{ item }}'
+    name: ['python', 'python3', 'perl', 'ruby', 'ruby-dev', 'golang', 'gfortran', 'erlang', 'erlang-dev', 'beef', 'intercal', 'rhino', 'sbcl', 'r-base-core', 'ghc', 'ghc-doc', 'haskell-platform', 'openjdk-11-jdk-headless', 'mono-complete', 'mono-devel', 'mono-profiler', 'mono-tools-devel', 'mono-tools-gui', 'ocaml', 'camlp4', 'lua5.3', 'liblua5.3-dev', 'php7.3-cli']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - python
-    - python3
-    - perl
-    - ruby
-    - ruby-dev
-    - golang
-    - gfortran
-    - erlang
-    - erlang-dev
-    - beef
-    - intercal
-    - rhino
-    - sbcl
-    - r-base-core
-    - ghc
-    - ghc-doc
-    - haskell-platform
-    - openjdk-11-jdk-headless
-    - mono-complete
-    - mono-devel
-    - mono-profiler
-    - mono-tools-devel
-    - mono-tools-gui
-    # - mono-vbnc
-    - ocaml
-    - camlp4
-    - lua5.3
-    - liblua5.3-dev
-    - php7.3-cli
 
 - name: Install scheme/racket
   apt:
-    name: '{{ item }}'
+    name: ['racket', 'racket-doc', 'tinyscheme', 'chicken-bin', 'mit-scheme-doc', 'scheme9', 'stalin']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - racket
-    - racket-doc
-    - tinyscheme
-    - chicken-bin
-    - mit-scheme-doc
-    - scheme9
-    - stalin
 
 - name: Install scheme/racket (Ubuntu)
   when: ansible_distribution == 'Ubuntu'
   apt:
-    name: '{{ item }}'
+    name: ['scheme2c', 'guile-1.8', 'guile-1.8-dev']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - scheme2c
-    - guile-1.8
-    - guile-1.8-dev
 
 - name: Install assembly tools
   apt:
-    name: '{{ item }}'
+    name: ['bin86', 'nasm', 'yasm']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - bin86
-    - nasm
-    - yasm
 
 - name: Install scanning and parsing utils
   apt:
-    name: '{{ item }}'
+    name: ['flex', 'flex-doc', 'bison', 'bison-doc', 'ragel', 'byacc', 're2c']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - flex
-    - flex-doc
-    - bison
-    - bison-doc
-    - ragel
-    - byacc
-    - re2c
 
 - name: Install source control
   apt:
-    name: '{{ item }}'
+    name: ['git', 'git-email', 'git-cvs', 'git-svn', 'git-doc', 'git-buildpackage', 'git-gui', 'mercurial', 'subversion', 'subversion-tools', 'darcs', 'bzr', 'bzrtools', 'cvs', 'cvsps', 'wdiff', 'colordiff', 'patch', 'patchutils', 'quilt', 'gitk', 'diffutils']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - git
-    - git-email
-    - git-cvs
-    - git-svn
-    - git-doc
-    - git-buildpackage
-    - git-gui
-    - mercurial
-    - subversion
-    - subversion-tools
-    - darcs
-    - bzr
-    - bzrtools
-    - cvs
-    - cvsps
-    - wdiff
-    - colordiff
-    - patch
-    - patchutils
-    - quilt
-    - gitk
-    - diffutils
 
 - name: Install source control (Ubuntu)
   when: ansible_distribution == 'Ubuntu'
@@ -235,56 +101,9 @@
 
 - name: Install python libraries
   apt:
-    name: '{{ item }}'
+    name: ['python3-pip', 'python3-virtualenv', 'python3-all-dev', 'python-pip', 'python-virtualenv', 'python-all-dev', 'drpython', 'ipython', 'pylint', 'pychecker', 'pyflakes', 'python-m2crypto', 'python-mysqldb', 'python-pil', 'python-libxml2', 'python-libxslt1', 'python-numpy', 'python-numpy-doc', 'python-twisted', 'python-openssl', 'python-pyasn1', 'python-pysnmp4', 'python-sqlobject', 'python-subversion', 'python-urwid', 'python-xmpp', 'python3-bs4', 'python-chardet', 'python-kerberos', 'python-mako', 'python-rpm', 'python-selinux', 'python-setuptools', 'python-simplejson', 'python-sqlite', 'python-sqlitecachec', 'python-urlgrabber', 'python-cups', 'python-notify', 'python-tk', 'python-requests', 'jython', 'jython-doc']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - python3-pip
-    - python3-virtualenv
-    - python3-all-dev
-    - python-pip
-    - python-virtualenv
-    - python-all-dev
-    - drpython
-    - ipython
-    - pylint
-    - pychecker
-    - pyflakes
-    - python-m2crypto
-    - python-mysqldb
-    # - python-imaging
-    - python-pil
-    - python-libxml2
-    - python-libxslt1
-    - python-numpy
-    - python-numpy-doc
-    - python-twisted
-    - python-openssl
-    - python-pexpect
-    - python-pyasn1
-    - python-pysnmp4
-    - python-sqlobject
-    - python-subversion
-    - python-urwid
-    - python-xmpp
-    # - python-beautifulsoup
-    - python3-bs4
-    - python-chardet
-    - python-kerberos
-    - python-mako
-    - python-rpm
-    - python-selinux
-    - python-setuptools
-    - python-simplejson
-    - python-sqlite
-    - python-sqlitecachec
-    - python-urlgrabber
-    - python-cups
-    - python-notify
-    - python-tk
-    - python-requests
-    - jython
-    - jython-doc
 
 - name: Install rake
   apt:
@@ -294,15 +113,9 @@
 
 - name: Install tcl/tk
   apt:
-    name: '{{ item }}'
+    name: ['tcl', 'tcl-dev', 'tcl8.6', 'tk', 'tk-dev']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - tcl
-    - tcl-dev
-    - tcl8.6
-    - tk
-    - tk-dev
 
 - name: Install lua libs (when not Debian Buster)
   when: not(ansible_distribution == 'Debian' and ansible_distribution_version == 'buster/sid')
@@ -313,163 +126,51 @@
 
 - name: Install misc. scripting
   apt:
-    name: '{{ item }}'
+    name: ['swig', 'gawk', 'mawk', 'm4']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - swig
-    - gawk
-    - mawk
-    - m4
 
 - name: Install AVR tools
   apt:
-    name: '{{ item }}'
+    name: ['gcc-avr', 'binutils-avr', 'gdb-avr', 'avrdude', 'avrdude-doc', 'simulavr', 'avarice', 'avr-libc', 'avra', 'avrp', 'uisp', 'usbprog']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - gcc-avr
-    - binutils-avr
-    - gdb-avr
-    - avrdude
-    - avrdude-doc
-    - simulavr
-    - avarice
-    - avr-libc
-    - avra
-    - avrp
-    - uisp
-    - usbprog
 
 - name: Install misc. libraries
   apt:
-    name: '{{ item }}'
+    name: ['libldap2-dev', 'libpam0g-dev', 'comerr-dev', 'e2fslibs-dev', 'libcap-dev', 'libattr1-dev', 'libacl1-dev', 'libselinux1-dev', 'libpcre3-dev', 'libapt-pkg-dev', 'linux-libc-dev', 'libkrb5-dev', 'libreadline-dev', 'libncurses5-dev', 'libncursesw5-dev', 'libghc-mtl-dev', 'libghc-mtl-prof', 'libghc-mtl-doc', 'libghc-network-dev', 'libghc-parsec3-dev', 'libboost-dev', 'zlib1g-dev', 'libbz2-dev', 'libcurl4-gnutls-dev', 'libexpat1-dev', 'libglib2.0-dev', 'libgmp3-dev', 'libsasl2-dev', 'libsctp-dev', 'libsqlite3-dev', 'libssl-dev', 'libxml2-dev', 'libxslt1-dev', 'ss-dev', 'mesa-common-dev', 'uuid-dev', 'libprotobuf-c-dev', 'libprotobuf-dev', 'libffi-dev', 'libidl-dev', 'libelf-dev', 'libdw-dev', 'libaudit-dev', 'libgmp-dev', 'libmpfr-dev', 'libmpc-dev', 'libfplll-dev']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - libldap2-dev
-    - libpam0g-dev
-    - comerr-dev
-    - e2fslibs-dev
-    - libcap-dev
-    - libattr1-dev
-    - libacl1-dev
-    - libselinux1-dev
-    - libpcre3-dev
-    - libapt-pkg-dev
-    - linux-libc-dev
-    - libkrb5-dev
-    - libreadline-dev
-    - libncurses5-dev
-    - libncursesw5-dev
-    - libghc-mtl-dev
-    - libghc-mtl-prof
-    - libghc-mtl-doc
-    - libghc-network-dev
-    - libghc-parsec3-dev
-    - libboost-dev
-    - zlib1g-dev
-    - libbz2-dev
-    - libcurl4-gnutls-dev
-    - libexpat1-dev
-    - libglib2.0-dev
-    - libgmp3-dev
-    - libsasl2-dev
-    - libsctp-dev
-    - libsqlite3-dev
-    - libssl-dev
-    - libssl-dev
-    - libxml2-dev
-    - libxslt1-dev
-    - ss-dev
-    - mesa-common-dev
-    - uuid-dev
-    - libprotobuf-c-dev
-    - libprotobuf-dev
-    - libffi-dev
-    - libidl-dev
-    - libelf-dev
-    - libdw-dev
-    - libaudit-dev
-    - libgmp-dev
-    - libmpfr-dev
-    - libmpc-dev
-    - libfplll-dev
 
 - name: Install misc. libraries (Ubuntu)
   when: ansible_distribution == 'Ubuntu'
   apt:
-    name: '{{ item }}'
+    name: ['libgnutls-dev']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - libgnutls-dev
 
 - name: Install x11 libraries
   apt:
-    name: '{{ item }}'
+    name: ['xorg-dev', 'xutils-dev', 'libgtk2.0-dev', 'libqt4-dev', 'libsdl1.2-dev', 'freeglut3-dev', 'libgl1-mesa-dev', 'libglu1-mesa-dev', 'libghc-x11-dev', 'libghc-x11-doc', 'libghc-x11-prof', 'libgtkmm-2.4-dev', 'glade']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - xorg-dev
-    - xutils-dev
-    - libgtk2.0-dev
-    - libqt4-dev
-    - libsdl1.2-dev
-    - freeglut3-dev
-    - libgl1-mesa-dev
-    - libglu1-mesa-dev
-    - libghc-x11-dev
-    - libghc-x11-doc
-    - libghc-x11-prof
-    - libgtkmm-2.4-dev
-    - glade
 
 - name: Install cross-platform toolchains (Ubuntu)
   apt:
-    name: '{{ item }}'
+    name: ['gcc-5-arm-linux-gnueabi', 'gcc-5-mips-linux-gnu', 'gcc-5-mipsel-linux-gnu', 'gcc-5-powerpc-linux-gnu', 'gcc-5-sparc64-linux-gnu', 'gcc-5-s390x-linux-gnu']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - gcc-5-arm-linux-gnueabi
-    - gcc-5-mips-linux-gnu
-    - gcc-5-mipsel-linux-gnu
-    - gcc-5-powerpc-linux-gnu
-    - gcc-5-sparc64-linux-gnu
-    - gcc-5-s390x-linux-gnu
   when: ansible_distribution == 'Ubuntu'
 
 - name: Install cross-platform toolchains (Debian)
   apt:
-    name: '{{ item }}'
+    name: ['gcc-8-arm-linux-gnueabi', 'gcc-8-mips-linux-gnu', 'gcc-8-mipsel-linux-gnu', 'gcc-8-powerpc-linux-gnu', 'gcc-8-sparc64-linux-gnu', 'gcc-8-s390x-linux-gnu']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - gcc-8-arm-linux-gnueabi
-    - gcc-8-mips-linux-gnu
-    - gcc-8-mipsel-linux-gnu
-    - gcc-8-powerpc-linux-gnu
-    - gcc-8-sparc64-linux-gnu
-    - gcc-8-s390x-linux-gnu
   when: ansible_distribution == 'Debian'
 
 - name: Install misc. development tools
   apt:
-    name: '{{ item }}'
+    name: ['gperf', 'gettext', 'check', 'dejagnu', 'doxygen', 'exuberant-ctags', 'indent', 'cutils', 'chrpath', 'openmpi-bin', 'openmpi-doc', 'protobuf-compiler', 'protobuf-c-compiler', 'dos2unix']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - gperf
-    - gettext
-    - check
-    - dejagnu
-    - doxygen
-    - exuberant-ctags
-    - indent
-    - cutils
-    - chrpath
-    - openmpi-bin
-    - openmpi-doc
-    - protobuf-compiler
-    - protobuf-c-compiler
-    - dos2unix
diff --git a/roles/general-use/tasks/main.yml b/roles/general-use/tasks/main.yml
index 1b890f5..3c8f1aa 100644
--- a/roles/general-use/tasks/main.yml
+++ b/roles/general-use/tasks/main.yml
@@ -2,63 +2,27 @@
 
 - name: Install crypto tools
   apt:
-    name: '{{ item }}'
+    name: ['gnupg2', 'gnupg-agent', 'openssl', 'pcscd', 'opensc', 'gpgsm', 'keychain']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - gnupg2
-    - gnupg-agent
-    - openssl
-    - pcscd
-    - opensc
-    - gpgsm
-    - keychain
 
 - name: Install network tools
   apt:
-    name: '{{ item }}'
+    name: ['ipset', 'ipcalc', 'openipmi', 'cdpr', 'lksctp-tools', 'freeipmi-tools', 'lftp', 'ncftp', 'axel', 'tsocks', 'snmp', 'snmp-mibs-downloader', 'finger']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - ipset
-    - ipcalc
-    - openipmi
-    - cdpr
-    - lksctp-tools
-    - freeipmi-tools
-    - lftp
-    - ncftp
-    - axel
-    - tsocks
-    - snmp
-    - snmp-mibs-downloader
-    - finger
 
 - name: Install filesystem tools
   apt:
-    name: '{{ item }}'
+    name: ['fuse', 'sshfs', 'dosfstools', 'davfs2', 'smbclient']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - fuse
-    - sshfs
-    - dosfstools
-    - davfs2
-    # - cloop-utils
-    # - ecryptfs-utils
-    - smbclient
 
 - name: Install database tools
   apt:
-    name: '{{ item }}'
+    name: ['sqlite', 'sqlite3', 'sqlite3-doc', 'postgresql-client', 'db-util']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - sqlite
-    - sqlite3
-    - sqlite3-doc
-    - postgresql-client
-    - db-util
 
 - name: Install database tools (Ubuntu)
   when: ansible_distribution == 'Ubuntu'
@@ -76,146 +40,66 @@
 
 - name: Install xml tools
   apt:
-    name: '{{ item }}'
+    name: ['xsltproc', 'libxml2-utils', 'docbook-xsl', 'docbook-utils', 'docbook-to-man', 'xmlto', 'fop', 'opensp', 'sgml2x', 'sgmltools-lite', 'tidy', 'xalan']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - xsltproc
-    - libxml2-utils
-    - docbook-xsl
-    - docbook-utils
-    - docbook-dsssl
-    - docbook-to-man
-    - xmlto
-    - fop
-    - opensp
-    - sgml2x
-    - sgmltools-lite
-    - tidy
-    - xalan
 
 - name: Install http tools
   apt:
-    name: '{{ item }}'
+    name: ['w3m', 'links', 'elinks', 'lynx']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - w3m
-    - links
-    - elinks
-    - lynx
 
 - name: Install typesetting tools (TeX)
   apt:
-    name: '{{ item }}'
+    name: ['groff', 'texlive-full', 'dvi2ps', 'dvipng', 'dvidvi', 'djvulibre-bin', 'ghostscript', 'psutils', 'pandoc']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - groff
-    - texlive-full
-    - dvi2ps
-    - dvipng
-    - dvidvi
-    - djvulibre-bin
-    - ghostscript
-    - psutils
-    - pandoc
 
 - name: Install math tools
   apt:
-    name: '{{ item }}'
+    name: ['graphviz', 'r-recommended', 'euler', 'euler-doc', 'gnuplot-doc', 'gap', 'lp-solve', 'mathomatic', 'maxima', 'maxima-doc', 'fplll-tools', 'gnuplot-nox', 'coq', 'octave']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - graphviz
-    - r-recommended
-    - euler
-    - euler-doc
-    - gnuplot-doc
-    - gap
-    - lp-solve
-    - mathomatic
-    - maxima
-    - maxima-doc
-    - fplll-tools
-    - gnuplot-nox
-    - coq
 
 - name: Install multimedia tools
   apt:
-    name: '{{ item }}'
+    name: ['festival', 'dvgrab', 'cdparanoia', 'genisoimage', 'sox', 'mp3blaster', 'x264', 'mkvtoolnix', 'vorbis-tools', 'timidity', 'dvd+rw-tools', 'lame', 'twolame', 'cdrdao', 'wodim', 'pulseaudio', 'bchunk']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - festival
-    - dvgrab
-    - cdparanoia
-    - genisoimage
-    - sox
-    - mp3blaster
-    - x264
-    - mkvtoolnix
-    - vorbis-tools
-    - timidity
-    - dvd+rw-tools
-    - lame
-    - twolame
-    - cdrdao
-    - wodim
-    - pulseaudio
-    - bchunk
 
 - name: Install multimedia tools (Ubuntu)
   when: ansible_distribution == 'Ubuntu'
   apt:
-    name: '{{ item }}'
+    name: ['mencoder', 'dvdrip', 'ffmpeg']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - mencoder
-    - dvdrip
-    - ffmpeg
 
 - name: Install multimedia tools (Debian Stretch)
   when: ansible_distribution == 'Debian' and ansible_distribution_release == 'stretch'
   apt:
-    name: '{{ item }}'
+    name: ['libav-tools']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - libav-tools
 
 - name: Install multimedia tools (Debian Buster)
   when: ansible_distribution == 'Debian' and ansible_distribution_release == 'buster'
   apt:
-    name: '{{ item }}'
+    name: ['ffmpeg']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - ffmpeg
 
 - name: Install torrent tools
   apt:
-    name: '{{ item }}'
+    name: ['rtorrent']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - rtorrent
 
 - name: Install communication tools
   apt:
-    name: '{{ item }}'
+    name: ['mutt', 'alpine', 'spamassassin', 'tin', 'irssi', 'weechat', 'weechat-plugins', 'newsbeuter']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - mutt
-    - alpine
-    - spamassassin
-    - tin
-    - irssi
-    - weechat
-    - weechat-plugins
-    - newsbeuter
 
 - name: Install communication tools (not Debian Buster)
   when: not(ansible_distribution == 'Debian' and ansible_distribution_version == 'buster/sid')
@@ -226,22 +110,15 @@
 
 - name: Install serial tools
   apt:
-    name: '{{ item }}'
+    name: ['minicom', 'curl']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - minicom
-    - curl
 
 - name: Install virtualization tools
   apt:
-    name: '{{ item }}'
+    name: ['qemu', 'qemu-kvm', 'bridge-utils']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - qemu
-    - qemu-kvm
-    - bridge-utils
 
 - name: Install virtualization tools (Ubuntu)
   when: ansible_distribution != 'Debian'
@@ -252,42 +129,6 @@
 
 - name: Install misc. tools
   apt:
-    name: '{{ item }}'
+    name: ['rdiff', 'tofrodos', 'mc', 'busybox-static', 'most', 'bonnie++', 'time', 'latencytop', 'bsdmainutils', 'dctrl-tools', 'gddrescue', 'file', 'parchive', 'par2', 'reportbug', 'rpm', 'shtool', 'stow', 'xstow', 'sysstat', 'unison', 'john', 'sg3-utils', 'dstat', 'rstat-client', 'i2c-tools', 'dnstracer', 'apt-file', 'makepasswd', 'syslinux', 'fdupes', 'cowsay', '9base', 'libjpeg-progs', 'jq']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - rdiff
-    - tofrodos
-    - mc
-    - busybox-static
-    - most
-    - bonnie++
-    - time
-    - latencytop
-    - bsdmainutils
-    - dctrl-tools
-    - gddrescue
-    - file
-    - parchive
-    - par2
-    - reportbug
-    - rpm
-    - shtool
-    - stow
-    - xstow
-    - sysstat
-    - unison
-    - john
-    - sg3-utils
-    - dstat
-    - rstat-client
-    - i2c-tools
-    - dnstracer
-    - apt-file
-    - makepasswd
-    - syslinux
-    - fdupes
-    - cowsay
-    - 9base
-    - libjpeg-progs
-    - jq
diff --git a/roles/gui/tasks/main.yml b/roles/gui/tasks/main.yml
index 90ba427..0e82fe6 100644
--- a/roles/gui/tasks/main.yml
+++ b/roles/gui/tasks/main.yml
@@ -2,40 +2,21 @@
 
 - name: Install X server and utilities
   apt:
-    name: '{{ item }}'
+    name: ['xorg', 'xsel', 'gksu', 'arandr', 'redshift']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - xorg
-    - xsel
-    - gksu
-    - arandr
-    - redshift
 
 - name: Install terminal emulators
   apt:
-    name: '{{ item }}'
+    name: ['rxvt', 'rxvt-unicode-256color', 'gnome-terminal', 'xfce4-terminal', 'konsole', 'yakuake']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - rxvt
-    - rxvt-unicode-256color
-    - gnome-terminal
-    - xfce4-terminal
-    - konsole
-    - yakuake
 
 - name: Install web browsers
   apt:
-    name: '{{ item }}'
+    name: ['firefox', 'google-chrome-stable', 'chromium-browser', 'epiphany-browser', 'midori']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - firefox
-    - google-chrome-stable
-    - chromium-browser
-    - epiphany-browser
-    - midori
 
 - name: Create directories for browser configuration
   file:
@@ -63,33 +44,15 @@
 
 - name: Install mail clients
   apt:
-    name: '{{ item }}'
+    name: ['claws-mail', 'thunderbird', 'empathy', 'pidgin', 'pidgin-otr']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - claws-mail
-    - thunderbird
-    - empathy
-    - pidgin
-    - pidgin-otr
 
 - name: Install office applications
   apt:
-    name: '{{ item }}'
+    name: ['scribus', 'gimp', 'xfig', 'dia', 'inkscape', 'libreoffice', 'fontforge', 'xpdf', 'evince', 'djview4', 'krita']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - scribus
-    - gimp
-    - xfig
-    - dia
-    - inkscape
-    - libreoffice
-    - fontforge
-    - xpdf
-    - evince
-    - djview4
-    - krita
 
 - name: Install xubuntu-desktop
   apt:
@@ -99,33 +62,15 @@
 
 - name: Install window managers
   apt:
-    name: '{{ item }}'
+    name: ['xmonad', 'libghc-xmonad-contrib-dev', 'stumpwm', 'wmii', 'awesome', 'openbox', 'openbox-gnome-session', 'openbox-kde-session', 'i3-wm']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - xmonad
-    - libghc-xmonad-contrib-dev
-    - stumpwm
-    - wmii
-    - awesome
-    - openbox
-    - openbox-gnome-session
-    - openbox-kde-session
-    - i3-wm
 
 - name: Install desktop environments
   apt:
-    name: '{{ item }}'
+    name: ['plasma-desktop', 'unity', 'gnome', 'lxde', 'lxde-common', 'mate-desktop-environment', 'cinnamon-desktop-environment']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - plasma-desktop
-    - unity
-    - gnome
-    - lxde
-    - lxde-common
-    - mate-desktop-environment
-    - cinnamon-desktop-environment
 
 - name: Install dbus-user-session (to fix login failures)
   apt:
@@ -174,166 +119,81 @@
 
 - name: Install widgets
   apt:
-    name: '{{ item }}'
+    name: ['xmobar', 'i3status', 'i3blocks', 'dzen2', 'dunst']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - xmobar
-    - i3status
-    - i3blocks
-    - dzen2
-    - dunst
 
 - name: Install lockers
   apt:
-    name: '{{ item }}'
+    name: ['i3lock', 'light-locker']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - i3lock
-    - light-locker
 
 - name: Install fonts
   apt:
-    name: '{{ item }}'
+    name: ['console-setup', 'xfonts-terminus', 'gsfonts', 'gsfonts-x11', 'fonts-dejavu', 'fonts-opensymbol', 'fonts-freefont-ttf']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - console-setup
-    - xfonts-terminus
-    - gsfonts
-    - gsfonts-x11
-    - fonts-dejavu
-    - fonts-opensymbol
-    - fonts-freefont-ttf
 
 - name: Install editors
   apt:
-    name: '{{ item }}'
+    name: ['vim-gnome', 'lyx', 'emacs', 'emacs24']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - vim-gnome
-    - lyx
-    - emacs
-    - emacs24
 
 - name: Install networking tools
   apt:
-    name: '{{ item }}'
+    name: ['wireshark', 'clusterssh']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - wireshark
-    - clusterssh
 
 - name: Install printing/postscript tools
   apt:
-    name: '{{ item }}'
+    name: ['gv', 'ghostscript-x']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - gv
-    - ghostscript-x
 
 - name: Install math tools
   apt:
-    name: '{{ item }}'
+    name: ['gnuplot-x11', 'rocs']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - gnuplot-x11
-    - rocs
 
 - name: Install CAD tools
   apt:
-    name: '{{ item }}'
+    name: ['carmetal', 'xtrkcad', 'freecad', 'pythoncad']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - carmetal
-    - xtrkcad
-    - freecad
-    - pythoncad
 
 - name: Install media tools
   apt:
-    name: '{{ item }}'
+    name: ['pavucontrol', 'vlc', 'mpv', 'cheese', 'amarok', 'audacity', 'audacious', 'lmms', 'k3b', 'ardour', 'imagemagick', 'blender']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - pavucontrol
-    - vlc
-    - mpv
-    - cheese
-    - amarok
-    - audacity
-    - audacious
-    - lmms
-    - k3b
-    - ardour
-    - imagemagick
-    - blender
 
 - name: Install image tools
   apt:
-    name: '{{ item }}'
+    name: ['feh', 'hugin', 'enblend', 'enfuse', 'hugin-tools', 'gthumb', 'eog']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - feh
-    - hugin
-    - enblend
-    - enfuse
-    - hugin-tools
-    - gthumb
-    - eog
 
 - name: Install electronics tools
   apt:
-    name: '{{ item }}'
+    name: ['geda', 'arduino', 'ngspice', 'bristol', 'cl-rlc', 'electric', 'gerbv', 'gnucap', 'gpsim', 'gspiceui', 'gtkwave', 'linsmith', 'oregano', 'pcb', 'pcb-gtk', 'tkgate', 'xcircuit', 'kic', 'kicad']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - geda
-    - arduino
-    - ngspice
-    - bristol
-    - cl-rlc
-    - electric
-    - gerbv
-    - gnucap
-    - gpsim
-    - gsmc
-    - gspiceui
-    - gtkwave
-    - linsmith
-    - oregano
-    - pcb
-    - pcb-gtk
-    - tkgate
-    - xcircuit
-    - kic
-    - kicad
 
 - name: Install virtualization tools
   apt:
-    name: '{{ item }}'
+    name: ['virtualbox', 'virt-manager', 'virt-viewer']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - virtualbox
-    - virt-manager
-    - virt-viewer
 
 - name: Install misc. tools
   apt:
-    name: '{{ item }}'
+    name: ['workrave', 'remmina']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - workrave
-    - remmina
 
 - name: Install idle-python
   apt:
@@ -343,10 +203,6 @@
 
 - name: Install development environments
   apt:
-    name: '{{ item }}'
+    name: ['eclipse', 'monodevelop', 'code']
     state: present
     cache_valid_time: 3600
-  with_items:
-    - eclipse
-    - monodevelop
-    - code