diff --git a/bundles/arch-with-gui/files/autologin.conf b/bundles/arch-with-gui/files/autologin.conf
index 2ec1064..9398062 100644
--- a/bundles/arch-with-gui/files/autologin.conf
+++ b/bundles/arch-with-gui/files/autologin.conf
@@ -1,3 +1,3 @@
 [Autologin]
-User=${username}
-Session=${session}
+User=${user}
+Session=i3.desktop
diff --git a/bundles/arch-with-gui/items.py b/bundles/arch-with-gui/items.py
index 7562a69..18e04a9 100644
--- a/bundles/arch-with-gui/items.py
+++ b/bundles/arch-with-gui/items.py
@@ -20,7 +20,7 @@ actions = {
     'i3pystatus_install': {
         'command': ' && '.join([
             'cd /opt/i3pystatus/src',
-            '/opt/i3pystatus/venv/bin/pip install --upgrade pip {}'.format(' '.join(sorted(node.metadata.get('arch-with-gui/i3pystatus/deps', set())))),
+            '/opt/i3pystatus/venv/bin/pip install --upgrade pip colour netifaces basiciw',
             '/opt/i3pystatus/venv/bin/pip install --upgrade -e .',
         ]),
         'needs': {
@@ -85,9 +85,11 @@ for filename in listdir(join(repo.path, 'data', 'arch-with-gui', 'files', 'fonts
         **attrs,
     }
 
-if node.metadata.get('arch-with-gui/autologin', {}):
+if node.metadata.get('arch-with-gui/autologin_as', None):
     files['/etc/sddm.conf.d/autologin.conf'] = {
-        'context': node.metadata.get('arch-with-gui/autologin'),
+        'context': {
+            'user': node.metadata.get('arch-with-gui/autologin_as'),
+        },
         'content_type': 'mako',
         'before': {
             'svc_systemd:sddm',
diff --git a/bundles/arch-with-gui/metadata.py b/bundles/arch-with-gui/metadata.py
index 4cbcc13..37e5301 100644
--- a/bundles/arch-with-gui/metadata.py
+++ b/bundles/arch-with-gui/metadata.py
@@ -6,6 +6,9 @@ defaults = {
             '/etc/netctl',
         },
     },
+    'icinga_options': {
+        'exclude_from_monitoring': True,
+    },
     'pacman': {
         'packages': {
             # fonts
@@ -26,8 +29,10 @@ defaults = {
             'wpa_actiond': {},
 
             # shell and other gui stuff
+            'dunst': {},
             'fish': {},
             'kitty': {},
+            'libnotify': {}, # provides notify-send
             'light': {},
             'redshift': {},
             'rofi': {},
@@ -42,6 +47,10 @@ defaults = {
             'i3lock': {},
             'xss-lock': {},
 
+            # i3pystatus dependencies
+            'iw': {},
+            'wireless_tools': {},
+
             # Xorg
             'xf86-input-libinput': {},
             'xorg-server': {},
@@ -51,10 +60,27 @@ defaults = {
             'xorg-xset': {},
 
             # all them apps
+            'browserpass': {},
+            'browserpass-firefox': {},
             'firefox': {},
+            'maim': {},
+            'mosh': {},
+            'mpv': {},
+            'pass': {},
+            'pass-otp': {},
+            'pdftk': {},
+            'pwgen': {},
+            'qpdfview': {},
+            'the_silver_searcher': {},
+            'thermald': {},
             'tlp': {},
+            'xclip': {},
+            'xdotool': {}, # needed for maim window selection
         },
     },
+    'systemd-networkd': {
+        'enable-resolved': True,
+    },
 }
 
 @metadata_reactor.provides(
diff --git a/nodes/fkusei-locutus.py b/nodes/fkusei-locutus.py
index ad5c47f..4e25fc3 100644
--- a/nodes/fkusei-locutus.py
+++ b/nodes/fkusei-locutus.py
@@ -16,17 +16,7 @@ nodes['fkusei-locutus'] = {
     },
     'metadata': {
         'arch-with-gui': {
-            'autologin': {
-                'username': 'fkunsmann',
-                'session': 'i3.desktop',
-            },
-            'i3pystatus': {
-                'deps': {
-                    'colour',
-                    'netifaces',
-                    'basiciw',
-                },
-            },
+            'autologin_as': 'fkunsmann',
         },
         'bird': {
             'bgp_neighbors': {
@@ -50,9 +40,6 @@ nodes['fkusei-locutus'] = {
                 '8000': {'*'},
             },
         },
-        'icinga_options': {
-            'exclude_from_monitoring': True,
-        },
         'interfaces': {
             'enp0s31f6': {
                 'dhcp': True,
@@ -94,25 +81,10 @@ nodes['fkusei-locutus'] = {
 
                 # all that other random stuff one needs
                 'apachedirectorystudio': {},
-                'browserpass': {},
-                'browserpass-firefox': {},
                 'direnv': {},
-                'dunst': {},
                 'freerdp': {},
-                'libnotify': {}, # provides notify-send
-                'maim': {},
                 'mosquitto': {},
-                'mpv': {},
-                'pass': {},
-                'pass-otp': {},
-                'pdftk': {},
-                'pwgen': {},
-                'qpdfview': {},
-                'the_silver_searcher': {},
-                'thermald': {},
                 'virt-manager': {},
-                'xclip': {}, # for pass -c
-                'xdotool': {},
             },
         },
         'systemd-boot': {
@@ -143,9 +115,6 @@ nodes['fkusei-locutus'] = {
                 },
             },
         },
-        'systemd-networkd': {
-            'enable-resolved': True,
-        },
         'timezone': 'Europe/Berlin',
         'users': {
             'fkunsmann': {
diff --git a/nodes/kunsi-p14s.py b/nodes/kunsi-p14s.py
index 4f8c4d6..c7bd5ea 100644
--- a/nodes/kunsi-p14s.py
+++ b/nodes/kunsi-p14s.py
@@ -15,17 +15,7 @@ nodes['kunsi-p14s'] = {
     },
     'metadata': {
         'arch-with-gui': {
-            'autologin': {
-                'username': 'kunsi',
-                'session': 'i3.desktop',
-            },
-            'i3pystatus': {
-                'deps': {
-                    'colour',
-                    'netifaces',
-                    'basiciw',
-                },
-            },
+            'autologin_as': 'kunsi',
         },
         'backup-client': {
             # only alert people if we're missing more than a week of backups
@@ -43,9 +33,6 @@ nodes['kunsi-p14s'] = {
                 '8000': {'*'},
             },
         },
-        'icinga_options': {
-            'exclude_from_monitoring': True,
-        },
         'interfaces': {
             'enp2s0f0': {
                 'dhcp': True,
@@ -100,30 +87,15 @@ nodes['kunsi-p14s'] = {
                 # all that other random stuff one needs
                 'abcde': {},
                 'apachedirectorystudio': {},
-                'browserpass': {},
-                'browserpass-firefox': {},
                 'claws-mail': {},
                 'claws-mail-themes': {},
-                'dunst': {},
                 'ferdi-bin': {},
                 'ffmpeg': {},
                 'gumbo-parser': {}, # for claws litehtml
-                'libnotify': {}, # provides notify-send
-                'maim': {},
-                'mosh': {},
                 'mosquitto': {},
-                'mpv': {},
-                'pass': {},
-                'pass-otp': {},
-                'pdftk': {},
                 'perl-musicbrainz-discid': {}, # for abcde
                 'perl-webservice-musicbrainz': {}, # for abcde
-                'pwgen': {},
-                'qpdfview': {},
-                'the_silver_searcher': {},
                 'virt-manager': {},
-                'xclip': {}, # for pass -c
-                'xdotool': {},
                 'xf86-input-wacom': {},
             },
         },
@@ -155,9 +127,6 @@ nodes['kunsi-p14s'] = {
                 },
             },
         },
-        'systemd-networkd': {
-            'enable-resolved': True,
-        },
         'timezone': 'Europe/Berlin',
         'users': {
             'kunsi': {