diff --git a/main.yml b/main.yml
index 7986567..2b61d28 100644
--- a/main.yml
+++ b/main.yml
@@ -1,8 +1,11 @@
 - hosts: localhost
   roles:
     - common
-    - desktop-environment # Sway, App Launcher etc.
-    - essential-tools # Thunar File Manager, Firefox, KeePassXC, Nextcloud Desktop
-    #- media-tools # Spotify, VLC
-    #- dev-tools # Visual Studio Code, Node.js
-    #- vm-tools # QEMU / KVM, libvirt, virt-manager
\ No newline at end of file
+    - desktop-environment # Hyprland, App Launcher etc.
+    - firefox
+    #- nextcloud
+    #- keepassxc
+    #- spotify
+    #- vlc
+    #- vs-code
+    #- qemu-kvm
\ No newline at end of file
diff --git a/prerequisites.sh b/prerequisites.sh
index f9d8c3c..914ea93 100755
--- a/prerequisites.sh
+++ b/prerequisites.sh
@@ -2,9 +2,9 @@
 UBUNTU_CODENAME=jammy
 
 sudo apt update
-sudo apt install wget gpg
+sudo apt install -y wget gpg
 
 wget -O- "https://keyserver.ubuntu.com/pks/lookup?fingerprint=on&op=get&search=0x6125E2A8C77F2818FB7BD15B93C4A3FD7BB9C367" | sudo gpg --dearmour -o /usr/share/keyrings/ansible-archive-keyring.gpg
 echo "deb [signed-by=/usr/share/keyrings/ansible-archive-keyring.gpg] http://ppa.launchpad.net/ansible/ansible/ubuntu $UBUNTU_CODENAME main" | sudo tee /etc/apt/sources.list.d/ansible.list
 sudo apt update
-sudo apt install ansible
\ No newline at end of file
+sudo apt install -y ansible
\ No newline at end of file
diff --git a/roles/desktop-environment/files/.config/sway/background.png b/roles/desktop-environment/files/.config/background/background.png
similarity index 100%
rename from roles/desktop-environment/files/.config/sway/background.png
rename to roles/desktop-environment/files/.config/background/background.png
diff --git a/roles/desktop-environment/files/.config/sway/lockscreen.jpg b/roles/desktop-environment/files/.config/background/lockscreen.jpg
similarity index 100%
rename from roles/desktop-environment/files/.config/sway/lockscreen.jpg
rename to roles/desktop-environment/files/.config/background/lockscreen.jpg
diff --git a/roles/desktop-environment/files/.config/environment.d/sway.conf b/roles/desktop-environment/files/.config/environment.d/sway.conf
deleted file mode 100644
index 935b4d4..0000000
--- a/roles/desktop-environment/files/.config/environment.d/sway.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-XDG_CURRENT_DESKTOP="sway"
-XDG_SESSION_TYPE="wayland"
\ No newline at end of file
diff --git a/roles/desktop-environment/meta/main.yml b/roles/desktop-environment/meta/main.yml
deleted file mode 100644
index 1afe99d..0000000
--- a/roles/desktop-environment/meta/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-dependencies:
-  - role: common
\ No newline at end of file
diff --git a/roles/desktop-environment/tasks/config.yml b/roles/desktop-environment/tasks/config.yml
new file mode 100644
index 0000000..4f98e33
--- /dev/null
+++ b/roles/desktop-environment/tasks/config.yml
@@ -0,0 +1,53 @@
+- name: Create group for sudoers config
+  become: yes
+  group:
+    name: admins
+    state: present
+
+- name: Add user to group for sudoers config
+  become: yes
+  user:
+    append: true
+    name: "{{ ansible_user_id }}"
+    groups:
+      - admins
+
+- name: Create sudoers config
+  become: yes
+  community.general.sudoers:
+    name: desktop-environment
+    group: admins
+    nopassword: true
+    commands:
+      - "/usr/bin/systemctl poweroff"
+      - "/usr/bin/systemctl reboot"
+      - "/usr/bin/systemctl suspend"
+
+- name: Copy static config files
+  copy:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+  loop:
+    - src: "{{ role_path }}/files/.config"
+      dest: "{{ ansible_env.HOME }}/"
+
+- name: Ensure presence of required directories
+  file:
+    path: "{{ item }}"
+    recurse: yes
+    state: directory
+  loop:
+    - "{{ ansible_env.HOME }}/.config/hypr"
+    - "{{ ansible_env.HOME }}/.config/waybar"
+
+- name: Render config files
+  ansible.builtin.template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+  loop:
+    - src: "bash_profile.j2"
+      dest: "{{ ansible_env.HOME }}/.bash_profile"
+    - src: ".config/hypr/hyprland.conf.j2"
+      dest: "{{ ansible_env.HOME }}/.config/hypr/hyprland.conf"
+    - src: ".config/waybar/config.j2"
+      dest: "{{ ansible_env.HOME }}/.config/waybar/config"
\ No newline at end of file
diff --git a/roles/desktop-environment/tasks/flatpak.yml b/roles/desktop-environment/tasks/flatpak.yml
new file mode 100644
index 0000000..474d9e1
--- /dev/null
+++ b/roles/desktop-environment/tasks/flatpak.yml
@@ -0,0 +1,22 @@
+- name: Install flatpak
+  become: yes
+  apt:
+    state: latest
+    install_recommends: false
+    name:
+      - flatpak
+
+- name: Add flathub remote to flatpak
+  community.general.flatpak_remote:
+    name: flathub
+    state: present
+    flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo
+    method: user
+
+- name: Install flatpaks
+  community.general.flatpak:
+    name: "{{ item }}"
+    state: present
+    method: user
+  loop:
+    - org.wezfurlong.wezterm
\ No newline at end of file
diff --git a/roles/desktop-environment/tasks/hyprland.yml b/roles/desktop-environment/tasks/hyprland.yml
new file mode 100644
index 0000000..c7a0c04
--- /dev/null
+++ b/roles/desktop-environment/tasks/hyprland.yml
@@ -0,0 +1,99 @@
+- name: Install build dependencies
+  become: yes
+  apt:
+    state: latest
+    install_recommends: false
+    name:
+      # General
+      - build-essential
+      - cmake
+      - meson
+      # Hyprland
+      - libpango1.0-dev
+      - libtomlplusplus-dev
+      # xdg-desktop-portal-hyprland
+      - qtbase5-dev
+      - libspa-0.2-dev
+      - libpipewire-0.3-dev
+
+- name: Create source folders
+  become: yes
+  file:
+    path: "/usr/local/src/{{ item }}"
+    state: directory
+    owner: "{{ ansible_user_id }}"
+    group: "{{ ansible_user_id }}"
+  loop:
+    - "Hyprland"
+    - "hyprlang"
+    - "xdg-desktop-portal-hyprland"
+
+- name: Checkout Hyprland repo
+  ansible.builtin.git:
+    repo: 'https://github.com/hyprwm/Hyprland.git'
+    dest: /usr/local/src/Hyprland
+    version: v0.35.0
+    recursive: true
+
+- name: Checkout hyprlang repo
+  ansible.builtin.git:
+    repo: 'https://github.com/hyprwm/hyprlang.git'
+    dest: /usr/local/src/hyprlang
+    version: v0.4.0
+    recursive: true
+
+- name: Checkout xdg-desktop-portal-hyprland repo
+  ansible.builtin.git:
+    repo: 'https://github.com/hyprwm/xdg-desktop-portal-hyprland.git'
+    dest: /usr/local/src/xdg-desktop-portal-hyprland
+    version: v1.3.1
+    recursive: true
+
+- name: Build Hyprland
+  community.general.make:
+    chdir: /usr/local/src/Hyprland
+    target: all
+
+- name: Install Hyprland
+  become: true
+  community.general.make:
+    chdir: /usr/local/src/Hyprland
+    target: install
+
+- name: Build hyprlang
+  ansible.builtin.command:
+    cmd: "{{ item }}"
+    chdir: /usr/local/src/hyprlang
+  loop:
+    - "cmake --no-warn-unused-cli -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_INSTALL_PREFIX:PATH=/usr -S . -B build"
+    - "cmake --build build --config Release --target hyprlang -j`nproc 2>/dev/null || getconf NPROCESSORS_CONF`"
+
+- name: Install hyprlang
+  become: yes
+  ansible.builtin.command:
+    cmd: "cmake --install build"
+    chdir: /usr/local/src/hyprlang
+
+- name: Build xdg-desktop-portal-hyprland
+  ansible.builtin.command:
+    cmd: "{{ item }}"
+    chdir: /usr/local/src/xdg-desktop-portal-hyprland
+  loop:
+    - "cmake -DCMAKE_INSTALL_LIBEXECDIR=/usr/lib -DCMAKE_INSTALL_PREFIX=/usr -B build"
+    - "cmake --build build"
+
+- name: Install xdg-desktop-portal-hyprland
+  become: yes
+  ansible.builtin.command:
+    cmd: "cmake --install build"
+    chdir: /usr/local/src/xdg-desktop-portal-hyprland
+
+- name: Move xdg-desktop-portal-hyprland.service into place
+  become: yes
+  ansible.builtin.copy:
+    src: /usr/lib/x86_64-linux-gnu/systemd/user/xdg-desktop-portal-hyprland.service
+    dest: /usr/lib/systemd/user/xdg-desktop-portal-hyprland.service
+
+- name: Reload systemd
+  ansible.builtin.systemd_service:
+    daemon_reload: true
\ No newline at end of file
diff --git a/roles/desktop-environment/tasks/main.yml b/roles/desktop-environment/tasks/main.yml
index e9f2800..ac0be08 100644
--- a/roles/desktop-environment/tasks/main.yml
+++ b/roles/desktop-environment/tasks/main.yml
@@ -1,93 +1,11 @@
-- name: Install packages for desktop environment
-  become: yes
-  apt:
-    state: latest
-    install_recommends: false
-    name:
-      - sway
-      - xwayland
-      - swaylock
-      - waybar
-      - xdg-desktop-portal-wlr
-      - slurp
-      - xfce4-appfinder
-      - rtkit
-      - pipewire
-      - pipewire-pulse
-      - wireplumber
-      - alsa-utils
-      - brightnessctl
-      - flatpak
-      - adwaita-icon-theme
-      - fonts-firacode
-      - fonts-font-awesome
-      - fonts-noto-color-emoji
+- name: Include installation of Hyprland
+  include: hyprland.yml
 
-- name: Add flathub remote to flatpak
-  community.general.flatpak_remote:
-    name: flathub
-    state: present
-    flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo
-    method: user
+- name: Include installation of utilities
+  include: utils.yml
 
-- name: Install flatpaks
-  community.general.flatpak:
-    name: "{{ item }}"
-    state: present
-    method: user
-  loop:
-    - org.wezfurlong.wezterm
+- name: Include flatpak setup
+  include: flatpak.yml
 
-- name: Create group for sudoers config
-  become: yes
-  group:
-    name: admins
-    state: present
-
-- name: Add user to group for sudoers config
-  become: yes
-  user:
-    append: true
-    name: "{{ ansible_user_id }}"
-    groups:
-      - admins
-
-- name: Create sudoers config
-  become: yes
-  community.general.sudoers:
-    name: desktop-environment
-    group: admins
-    nopassword: true
-    commands:
-      - "/usr/bin/systemctl poweroff"
-      - "/usr/bin/systemctl reboot"
-      - "/usr/bin/systemctl suspend"
-
-- name: Copy static config files
-  copy:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-  loop:
-    - src: "{{ role_path }}/files/.config"
-      dest: "{{ ansible_env.HOME }}/"
-
-- name: Ensure presence of required directories
-  file:
-    path: "{{ item }}"
-    recurse: yes
-    state: directory
-  loop:
-    - "{{ ansible_env.HOME }}/.config/sway"
-    - "{{ ansible_env.HOME }}/.config/waybar"
-
-- name: Render config files
-  ansible.builtin.template:
-    src: "{{ item.src }}"
-    dest: "{{ item.dest }}"
-  loop:
-    - src: "bash_profile.j2"
-      dest: "{{ ansible_env.HOME }}/.bash_profile"
-    - src: "sway-config.j2"
-      dest: "{{ ansible_env.HOME }}/.config/sway/config"
-    - src: "waybar-config.j2"
-      dest: "{{ ansible_env.HOME }}/.config/waybar/config"
\ No newline at end of file
+- name: Include configuration steps
+  include: config.yml
\ No newline at end of file
diff --git a/roles/desktop-environment/tasks/utils.yml b/roles/desktop-environment/tasks/utils.yml
new file mode 100644
index 0000000..065ae1e
--- /dev/null
+++ b/roles/desktop-environment/tasks/utils.yml
@@ -0,0 +1,26 @@
+- name: Install utilities
+  become: yes
+  apt:
+    state: latest
+    install_recommends: false
+    name:
+      - xwayland
+      - swaylock
+      - swaybg
+      - waybar
+      - xdg-desktop-portal-wlr
+      - xdg-desktop-portal-gtk
+      - xfce4-appfinder
+      - rtkit
+      - pipewire
+      - pipewire-pulse
+      - wireplumber
+      - qpwgraph
+      - alsa-utils
+      - brightnessctl
+      - gnome-keyring
+      - adwaita-icon-theme
+      - fonts-firacode
+      - fonts-font-awesome
+      - fonts-noto-color-emoji
+      - thunar
\ No newline at end of file
diff --git a/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2 b/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2
new file mode 100644
index 0000000..5f0b496
--- /dev/null
+++ b/roles/desktop-environment/templates/.config/hypr/hyprland.conf.j2
@@ -0,0 +1,173 @@
+# Monitor configuration (see https://wiki.hyprland.org/Configuring/Monitors/)
+monitor=,preferred,auto,auto
+
+# Programs to use
+$terminal = flatpak run org.wezfurlong.wezterm
+$menu = xfce4-appfinder --disable-server
+
+# Default env vars
+env = XCURSOR_SIZE,24
+env = QT_QPA_PLATFORMTHEME,qt5ct
+
+# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
+input {
+    kb_layout = de
+    kb_variant = nodeadkeys
+
+    follow_mouse = 1
+
+    touchpad {
+        natural_scroll = enabled
+    }
+
+    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+}
+
+general {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
+    gaps_in = 5
+    gaps_out = 10
+    border_size = 2
+    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+    col.inactive_border = rgba(595959aa)
+
+    layout = master
+
+    allow_tearing = false
+}
+
+decoration {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
+    rounding = 10
+
+    blur {
+        enabled = true
+        size = 3
+        passes = 1
+        
+        vibrancy = 0.1696
+    }
+
+    drop_shadow = true
+    shadow_range = 4
+    shadow_render_power = 3
+    col.shadow = rgba(1a1a1aee)
+}
+
+# Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+animations {
+    enabled = true
+
+    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+
+    animation = windows, 1, 7, myBezier
+    animation = windowsOut, 1, 7, default, popin 80%
+    animation = border, 1, 10, default
+    animation = borderangle, 1, 8, default
+    animation = fade, 1, 7, default
+    animation = workspaces, 1, 6, default
+}
+
+master {
+    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+    new_is_master = true
+    orientation = right
+}
+
+gestures {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    workspace_swipe = false
+}
+
+misc {
+    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
+}
+
+# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+windowrulev2 = nomaximizerequest, class:.*
+windowrulev2 = float,title:^(Application Finder)$
+windowrulev2 = size 500 500,title:^(Application Finder)$
+
+# Execute apps at launch
+exec-once = systemctl --user import-environment DISPLAY WAYLAND_DISPLAY && hash dbus-update-activation-environment 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
+exec-once = waybar
+exec-once = swaybg -i ~/.config/background/background.png -m fill
+{% if 'spotify' in role_names %}
+exec-once = [workspace 9 silent] spotify --enable-features=UseOzonePlatform --ozone-platform=wayland
+{% endif %}
+{% if 'nextcloud' in role_names %}
+exec-once = nextcloud --background
+{% endif %}
+
+# See https://wiki.hyprland.org/Configuring/Keywords/ for more
+$mainMod = SUPER
+
+# Keybinds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+bind = $mainMod, Return, exec, $terminal
+bind = $mainMod, D, exec, $menu
+bind = $mainMod SHIFT, Q, killactive,
+bind = $mainMod SHIFT, E, exit,
+bind = $mainMod, F, fullscreen, 0
+bind = $mainMod, V, togglefloating,
+bind = $mainMod, L, exec, pa-loopback
+#bind = $mainMod, P, pseudo, # dwindle
+#bind = $mainMod, J, togglesplit, # dwindle
+
+# Move focus with mainMod + arrow keys
+bind = $mainMod, left, movefocus, l
+bind = $mainMod, right, movefocus, r
+bind = $mainMod, up, movefocus, u
+bind = $mainMod, down, movefocus, d
+
+# Move window with mainMod + SHIFT + arrow keys
+bind = $mainMod SHIFT, left, movewindow, l
+bind = $mainMod SHIFT, right, movewindow, r
+bind = $mainMod SHIFT, up, movewindow, u
+bind = $mainMod SHIFT, down, movewindow, d
+
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+
+{% if isNotebook | bool %}
+# Backlight control
+bind = , XF86MonBrightnessUp, exec, brightnessctl -d intel_backlight set +5%
+bind = , XF86MonBrightnessDown, exec, brightnessctl -d intel_backlight set 5%-
+
+# Volume control
+bind = , XF86AudioRaiseVolume, exec, amixer -c 0 -q set Master 2dB+ unmute
+bind = , XF86AudioLowerVolume, exec, amixer -c 0 -q set Master 2db- unmute
+bind = , XF86AudioMute, exec, amixer -q set Master toggle
+
+# Touchpad control
+bind = , XF86TouchpadOn, exec, synclient Touchpadoff=0
+bind = , XF86TouchpadOff, exec, synclient Touchpadoff=1
+{% endif %}
\ No newline at end of file
diff --git a/roles/desktop-environment/templates/waybar-config.j2 b/roles/desktop-environment/templates/.config/waybar/config.j2
similarity index 92%
rename from roles/desktop-environment/templates/waybar-config.j2
rename to roles/desktop-environment/templates/.config/waybar/config.j2
index 30ee64a..3a2a298 100644
--- a/roles/desktop-environment/templates/waybar-config.j2
+++ b/roles/desktop-environment/templates/.config/waybar/config.j2
@@ -1,10 +1,8 @@
 {
-    "modules-left":  ["sway/workspaces", "sway/mode"],
+    "modules-left":  ["hyprland/workspaces"],
     "modules-center": ["clock"],
     "modules-right": ["cpu", "memory", "network", "pulseaudio", {% if isNotebook | bool %}"battery", {% endif %}"custom/power"],
-    "sway/workspaces": {
-        "disable-scroll": true
-    },
+    "hyprland/workspaces": {},
     "clock": {
         "format": "  {:%H:%M %d.%m.}",
         "timezone": "Europe/Berlin"
diff --git a/roles/desktop-environment/templates/bash_profile.j2 b/roles/desktop-environment/templates/bash_profile.j2
index 9ddfa4f..d8cab66 100644
--- a/roles/desktop-environment/templates/bash_profile.j2
+++ b/roles/desktop-environment/templates/bash_profile.j2
@@ -14,7 +14,9 @@ fi
 export GPG_TTY=$(tty)
 
 # Autostart sway at login
-{% if isVm | bool %}
-export WLR_NO_HARDWARE_CURSORS=1
-{% endif %}
-if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then exec sway; fi
\ No newline at end of file
+if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
+    {% if isVm | bool %}
+    export WLR_NO_HARDWARE_CURSORS=1
+    {% endif %}
+    exec sway
+fi
\ No newline at end of file
diff --git a/roles/desktop-environment/templates/sway-config.j2 b/roles/desktop-environment/templates/sway-config.j2
deleted file mode 100644
index 80f30f8..0000000
--- a/roles/desktop-environment/templates/sway-config.j2
+++ /dev/null
@@ -1,248 +0,0 @@
-input "type:keyboard" {
-    xkb_layout de
-    xkb_variant nodeadkeys
-    repeat_delay 200
-    repeat_rate 40
-}
-
-input "type:touchpad" {
-    tap enabled
-    natural_scroll enabled
-}
-
-set $mod Mod4
-
-default_border pixel 2
-default_floating_border pixel 2
-
-hide_edge_borders both
-
-bindsym $mod+u border none
-bindsym $mod+y border pixel 1
-bindsym $mod+n border normal
-
-font xft:Fira Code 11
-
-floating_modifier $mod
-
-bindsym $mod+Return exec flatpak run org.wezfurlong.wezterm
-
-# Window kill command
-bindsym $mod+Shift+q kill
-
-# start program launcher
-bindsym $mod+d exec --no-startup-id xfce4-appfinder --disable-server
-for_window [title="Application Finder"] floating enable
-for_window [title="Application Finder"] resize set 500 500
-
-# change focus
-bindsym $mod+j focus left
-bindsym $mod+k focus down
-bindsym $mod+l focus up
-bindsym $mod+semicolon focus right
-
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+semicolon move right
-
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# workspace back and forth (with/without active container)
-workspace_auto_back_and_forth yes
-bindsym $mod+b workspace back_and_forth
-bindsym $mod+Shift+b move container to workspace back_and_forth; workspace back_and_forth
-
-# split orientation
-bindsym $mod+h split h;exec notify-send 'tile horizontally'
-bindsym $mod+v split v;exec notify-send 'tile vertically'
-bindsym $mod+q split toggle
-
-# toggle fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# toggle sticky
-bindsym $mod+Shift+s sticky toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# move the currently focused window to the scratchpad
-bindsym $mod+Shift+minus move scratchpad
-
-# Show the next scratchpad window or hide the focused scratchpad window.
-# If there are multiple scratchpad windows, this command cycles through them.
-bindsym $mod+minus scratchpad show
-
-# navigate workspaces next / previous
-bindsym $mod+Ctrl+Right workspace next
-bindsym $mod+Ctrl+Left workspace prev
-
-# workspaces
-set $ws1 1
-set $ws2 2
-set $ws3 3
-set $ws4 4
-set $ws5 5
-set $ws6 6
-set $ws7 7
-set $ws8 8
-
-# switch to workspace
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-
-# Move focused container to workspace
-bindsym $mod+Ctrl+1 move container to workspace $ws1
-bindsym $mod+Ctrl+2 move container to workspace $ws2
-bindsym $mod+Ctrl+3 move container to workspace $ws3
-bindsym $mod+Ctrl+4 move container to workspace $ws4
-bindsym $mod+Ctrl+5 move container to workspace $ws5
-bindsym $mod+Ctrl+6 move container to workspace $ws6
-bindsym $mod+Ctrl+7 move container to workspace $ws7
-bindsym $mod+Ctrl+8 move container to workspace $ws8
-
-# Move to workspace with focused container
-bindsym $mod+Shift+1 move container to workspace $ws1; workspace $ws1
-bindsym $mod+Shift+2 move container to workspace $ws2; workspace $ws2
-bindsym $mod+Shift+3 move container to workspace $ws3; workspace $ws3
-bindsym $mod+Shift+4 move container to workspace $ws4; workspace $ws4
-bindsym $mod+Shift+5 move container to workspace $ws5; workspace $ws5
-bindsym $mod+Shift+6 move container to workspace $ws6; workspace $ws6
-bindsym $mod+Shift+7 move container to workspace $ws7; workspace $ws7
-bindsym $mod+Shift+8 move container to workspace $ws8; workspace $ws8
-
-# Open specific applications in floating mode
-for_window [window_role="About"] floating enable
-for_window [title="alsamixer"] floating enable border pixel 1
-for_window [title="File Transfer*"] floating enable
-for_window [class="eog"] floating enable
-for_window [class="Galculator"] floating enable border pixel 1
-for_window [class="GParted"] floating enable border normal
-for_window [class="(?i)gnome-calculator"] floating enable
-for_window [class="Pavucontrol"] floating enable
-for_window [class="qt5ct"] floating enable sticky enable border normal
-for_window [class="Qtconfig-qt4"] floating enable sticky enable border normal
-for_window [title="QEMU"] floating enable
-for_window [class="Thus"] floating enable border normal
-for_window [class="Timeset-gui"] floating enable border normal
-
-# switch to workspace with urgent window automatically
-for_window [urgent=latest] focus
-
-# reload the configuration file
-bindsym $mod+Shift+c reload
-
-# restart sway inplace (preserves layout/session)
-bindsym $mod+Shift+r restart
-
-# exit sway
-bindsym $mod+Shift+e exec "swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'"
-
-# Set shut down, restart and locking features
-set $mode_system (l)ock, (e)xit, (r)eboot, (Shift+s)hutdown
-bindsym $mod+0 mode "$mode_system"
-mode "$mode_system" {
-    bindsym l exec --no-startup-id swaylock -f -s fill -i ~/.config/sway/lockscreen.jpg, mode "default"
-    bindsym e exec --no-startup-id swaymsg exit, mode "default"
-    bindsym r exec --no-startup-id sudo systemctl reboot, mode "default"
-    bindsym Shift+s exec --no-startup-id sudo systemctl poweroff, mode "default"
-
-    # exit system mode: "Enter" or "Escape"
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-
-# Resize window (you can also use the mouse for that)
-bindsym $mod+r mode "resize"
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym j resize shrink width 5 px or 5 ppt
-        bindsym k resize grow height 5 px or 5 ppt
-        bindsym l resize shrink height 5 px or 5 ppt
-        bindsym semicolon resize grow width 5 px or 5 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
-
-        # exit resize mode: Enter or Escape
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
-
-# Set background
-output * bg ~/.config/sway/background.png fill
-
-# Use waybar
-exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
-exec hash dbus-update-activation-environment 2>/dev/null && \
-     dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
-exec waybar
-
-# Autostart applications
-{% if nextcloud is defined and nextcloud | bool %}
-exec --no-startup-id nextcloud --background
-{% endif %}
-
-# Theme colors
-client.focused          #c6c6c6 #1f1f1f #c6c6c6 #8abeb7 #8abeb7
-client.focused_inactive #c6c6c6 #1f1f1f #c6c6c6 #8abeb7 #8abeb7
-client.unfocused        #c6c6c6 #1f1f1f #c6c6c6 #8abeb7 #8abeb7
-client.urgent           #c6c6c6 #1f1f1f #c6c6c6 #8abeb7 #8abeb7
-client.placeholder      #c6c6c6 #1f1f1f #c6c6c6 #8abeb7 #8abeb7
-
-client.background       #1f1f1f
-
-{% if isNotebook | bool %}
-# backlight control
-bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl -d intel_backlight set +5%
-bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl -d intel_backlight set 5%-
-
-# set volume control
-bindsym XF86AudioRaiseVolume exec --no-startup-id amixer -c 0 -q set Master 2dB+ unmute
-bindsym XF86AudioLowerVolume exec --no-startup-id amixer -c 0 -q set Master 2db- unmute
-bindsym XF86AudioMute exec --no-startup-id amixer -q set Master toggle
-
-# touchpad on and off controller on laptops with Fn keys
-bindsym XF86TouchpadOn exec --no-startup-id synclient Touchpadoff=0
-bindsym XF86TouchpadOff exec --no-startup-id synclient Touchpadoff=1
-{% endif %}
-
-focus_follows_mouse no
-
-# User defined keys
-#bindsym Print exec flameshot gui # TODO
-#bindsym Shift+Print exec flameshot gui #TODO
diff --git a/roles/essential-tools/files/99pin-unstable b/roles/essential-tools/files/99pin-unstable
deleted file mode 100644
index 62a3a4a..0000000
--- a/roles/essential-tools/files/99pin-unstable
+++ /dev/null
@@ -1,7 +0,0 @@
-Package: *
-Pin: release a=testing
-Pin-Priority: 900
-
-Package: *
-Pin: release a=unstable
-Pin-Priority: 10
\ No newline at end of file
diff --git a/roles/essential-tools/tasks/main.yml b/roles/essential-tools/tasks/main.yml
deleted file mode 100644
index 6d81320..0000000
--- a/roles/essential-tools/tasks/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-- name: Add debian unstable repo
-  become: yes
-  apt_repository:
-    repo: deb http://deb.debian.org/debian unstable main non-free-firmware non-free contrib
-    state: present
-    filename: debian-unstable
-
-- name: Create apt preferences file for unstable repo
-  become: yes
-  copy:
-    src: "{{ role_path }}/files/99pin-unstable"
-    dest: "/etc/apt/preferences.d/"
-
-- name: Install essential tools
-  become: yes
-  apt:
-    state: latest
-    install_recommends: false
-    update_cache: true
-    name:
-      - thunar
-      - firefox
-      - keepassxc
-      - nextcloud-desktop
\ No newline at end of file
diff --git a/roles/firefox/tasks/main.yml b/roles/firefox/tasks/main.yml
new file mode 100644
index 0000000..96f0fca
--- /dev/null
+++ b/roles/firefox/tasks/main.yml
@@ -0,0 +1,20 @@
+- name: Add Mozilla repository
+  become: yes
+  deb822_repository:
+    name: mozilla
+    types: deb
+    uris: https://packages.mozilla.org/apt
+    suites: mozilla
+    components: main
+    signed_by: https://packages.mozilla.org/apt/repo-signing-key.gpg
+    state: present
+    enabled: yes
+
+- name: Install packages
+  become: yes
+  apt:
+    state: latest
+    update_cache: true
+    install_recommends: false
+    name:
+      - firefox
\ No newline at end of file
diff --git a/roles/keepassxc/tasks/main.yml b/roles/keepassxc/tasks/main.yml
new file mode 100644
index 0000000..1aafde6
--- /dev/null
+++ b/roles/keepassxc/tasks/main.yml
@@ -0,0 +1,7 @@
+- name: Install packages
+  become: yes
+  apt:
+    state: latest
+    install_recommends: false
+    name:
+      - keepassxc
\ No newline at end of file
diff --git a/roles/essential-tools/meta/main.yml b/roles/nextcloud/meta/main.yml
similarity index 54%
rename from roles/essential-tools/meta/main.yml
rename to roles/nextcloud/meta/main.yml
index 4dc5ce6..035383a 100644
--- a/roles/essential-tools/meta/main.yml
+++ b/roles/nextcloud/meta/main.yml
@@ -1,4 +1,4 @@
 dependencies:
-  - role: desktop-environment
+  - role: desktop-environment-config
     vars:
       nextcloud: true
\ No newline at end of file
diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
new file mode 100644
index 0000000..789881c
--- /dev/null
+++ b/roles/nextcloud/tasks/main.yml
@@ -0,0 +1,7 @@
+- name: Install packages
+  become: yes
+  apt:
+    state: latest
+    install_recommends: false
+    name:
+      - nextcloud-desktop
\ No newline at end of file
diff --git a/roles/vm-tools/tasks/main.yml b/roles/qemu-kvm/tasks/main.yml
similarity index 91%
rename from roles/vm-tools/tasks/main.yml
rename to roles/qemu-kvm/tasks/main.yml
index 3552c0f..7f0a118 100644
--- a/roles/vm-tools/tasks/main.yml
+++ b/roles/qemu-kvm/tasks/main.yml
@@ -1,4 +1,4 @@
-- name: Install packages for qemu-kvm
+- name: Install packages
   become: yes
   apt:
     state: latest
@@ -6,6 +6,7 @@
     name:
       - qemu-kvm
       - qemu-system
+      - qemu-utils
       - libvirt-daemon
       - libvirt-daemon-system
       - ovmf
diff --git a/roles/media-tools/files/spotify.desktop b/roles/spotify/files/spotify.desktop
similarity index 72%
rename from roles/media-tools/files/spotify.desktop
rename to roles/spotify/files/spotify.desktop
index bc895ba..f9ef700 100644
--- a/roles/media-tools/files/spotify.desktop
+++ b/roles/spotify/files/spotify.desktop
@@ -4,7 +4,7 @@ Name=Spotify
 GenericName=Music Player
 Icon=spotify-client
 TryExec=spotify
-Exec=spotify --uri=%U
+Exec=spotify --enable-features=UseOzonePlatform --ozone-platform=wayland --uri=%U
 Terminal=false
 MimeType=x-scheme-handler/spotify;
 Categories=Audio;Music;Player;AudioVideo;
diff --git a/roles/media-tools/tasks/main.yml b/roles/spotify/tasks/main.yml
similarity index 85%
rename from roles/media-tools/tasks/main.yml
rename to roles/spotify/tasks/main.yml
index c497e4e..b944acb 100644
--- a/roles/media-tools/tasks/main.yml
+++ b/roles/spotify/tasks/main.yml
@@ -6,7 +6,7 @@
     uris: http://repository.spotify.com
     suites: stable
     components: non-free
-    signed_by: https://download.spotify.com/debian/pubkey_7A3A762FAFD4A51F.gpg
+    signed_by: https://download.spotify.com/debian/pubkey_6224F9941A8AA6D1.gpg
     state: present
     enabled: yes
 
@@ -17,8 +17,6 @@
     update_cache: true
     install_recommends: false
     name:
-      - vlc
-      - vlc-plugin-pipewire
       - spotify-client
 
 - name: Ensure that directory for desktop entries exists
diff --git a/roles/vlc/tasks/main.yml b/roles/vlc/tasks/main.yml
new file mode 100644
index 0000000..c38dab8
--- /dev/null
+++ b/roles/vlc/tasks/main.yml
@@ -0,0 +1,9 @@
+- name: Install packages
+  become: yes
+  apt:
+    state: latest
+    update_cache: true
+    install_recommends: false
+    name:
+      - vlc
+      - vlc-plugin-pipewire
\ No newline at end of file
diff --git a/roles/dev-tools/tasks/main.yml b/roles/vs-code/tasks/main.yml
similarity index 100%
rename from roles/dev-tools/tasks/main.yml
rename to roles/vs-code/tasks/main.yml