diff --git a/arch/roles/bluetooth/tasks/main.yml b/arch/roles/bluetooth/tasks/main.yml
new file mode 100644
index 0000000..f7cd96c
--- /dev/null
+++ b/arch/roles/bluetooth/tasks/main.yml
@@ -0,0 +1,15 @@
+- name: Install bluez
+  become: yes
+  pacman:
+    name:
+      - bluez
+      - bluez-utils
+      - blueman
+    state: present
+
+- name: Enable bluetooth.service
+  become: yes
+  systemd:
+    name: bluetooth
+    enabled: yes
+    state: started
diff --git a/arch/roles/fun/tasks/main.yml b/arch/roles/fun/tasks/main.yml
new file mode 100644
index 0000000..d3a3640
--- /dev/null
+++ b/arch/roles/fun/tasks/main.yml
@@ -0,0 +1,6 @@
+- name: Install clementine
+  become: yes
+  pacman:
+    name:
+      - clementine
+    state: present
diff --git a/arch/roles/gui/tasks/main.yml b/arch/roles/gui/tasks/main.yml
index fee371b..0d1e9ac 100644
--- a/arch/roles/gui/tasks/main.yml
+++ b/arch/roles/gui/tasks/main.yml
@@ -5,6 +5,8 @@
       - xorg
       - xorg-xinit
       - xdo
+      - xorg-xrandr
+      - xorg-xbacklight
     state: present
 
 - name: Configure xorg
@@ -16,6 +18,30 @@
     group: root
     mode: u=rw,g=r,o=r
 
+- name: Install GDM
+  become: yes
+  pacman:
+    name: gdm
+    state: present
+
+- name: Enable GDM
+  become: yes
+  systemd:
+    name: gdm
+    enabled: yes
+
+- name: Remove default GDM sessions
+  become: yes
+  file:
+    path: "{{ item }}"
+    state: absent
+  with_items:
+    - /usr/share/xsessions/gnome.desktop
+    - /usr/share/xsessions/gnome-xorg.desktop
+    - /usr/share/xsessions/i3.desktop
+    - /usr/share/xsessions/i3-with-shmlog.desktop
+
+
 - name: Install graphical programs
   become: yes
   pacman:
@@ -27,6 +53,9 @@
       - feh
       - dunst
       - picom
+      - arandr
+      - network-manager-applet
+      - lxappearance
     state: present
 
 - name: Install graphical AUR programs
@@ -35,6 +64,11 @@
       - rofi-dmenu
       - polybar
       - nerd-fonts-hack
+      - networkmanager-dmenu-git
+      - i3lockmore-git
+      - numix-icon-theme-git
+      - numix-circle-icon-theme-git
+      - pavolume-git
     state: present
 
 - name: Configure X
diff --git a/arch/roles/programming/tasks/main.yml b/arch/roles/programming/tasks/main.yml
new file mode 100644
index 0000000..85834a2
--- /dev/null
+++ b/arch/roles/programming/tasks/main.yml
@@ -0,0 +1,13 @@
+- name: Install Clojure
+  become: yes
+  pacman:
+    name:
+      - clojure
+    state: present
+
+- name: Install node
+  become: yes
+  pacman:
+    name:
+      - nodejs
+    state: present
diff --git a/arch/roles/stumpwm/tasks/main.yml b/arch/roles/stumpwm/tasks/main.yml
index b33d6cb..4646a51 100644
--- a/arch/roles/stumpwm/tasks/main.yml
+++ b/arch/roles/stumpwm/tasks/main.yml
@@ -20,12 +20,16 @@
       - cl-ppcre
       - slime
       - quicklisp
-      - stumpwm
+      - stumpwm-git
 
 - name: Downgrade quicklisp to 2019 distribution
   command:
     cmd: "sbcl --non-interactive --eval '(ql-dist:install-dist \"http://beta.quicklisp.org/dist/quicklisp/2019-12-27/distinfo.txt\" :replace t :prompt nil)'"
 
+- name: Install bordeaux-threads
+  command:
+    cmd: "sbcl --non-interactive --eval '(ql:quickload \"bordeaux-threads\")'"
+
 - name: Stow StumpWM configuration
   command:
     chdir: "{{ ansible_env.HOME }}/dotfiles"
diff --git a/arch/roles/stumpwm/templates/.sbclrc b/arch/roles/stumpwm/templates/.sbclrc
new file mode 100644
index 0000000..299dbe8
--- /dev/null
+++ b/arch/roles/stumpwm/templates/.sbclrc
@@ -0,0 +1 @@
+(load "/usr/lib/quicklisp/setup" :if-does-not-exist nil)
\ No newline at end of file
diff --git a/arch/roles/stumpwm/templates/stumpwm.desktop b/arch/roles/stumpwm/templates/stumpwm.desktop
new file mode 100644
index 0000000..7f5cab9
--- /dev/null
+++ b/arch/roles/stumpwm/templates/stumpwm.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=StumpWM
+Comment=Log in using the StumpWM window manager
+Exec=/usr/bin/stumpwm
+TryExec=/usr/bin/stumpwm
+Type=Application
\ No newline at end of file
diff --git a/arch/workstation.yml b/arch/workstation.yml
index 0c83183..5d2bc6c 100644
--- a/arch/workstation.yml
+++ b/arch/workstation.yml
@@ -25,3 +25,12 @@
     - role: syncthing
       tags:
         - syncthing
+    - role: programming
+      tags:
+        - programming
+    - role: bluetooth
+      tags:
+        - bluetooth
+    - role: fun
+      tags:
+        - fun