diff --git a/roles/fedora_setup/tasks/main.yml b/roles/fedora_setup/tasks/main.yml
index 5a746d1..201324f 100755
--- a/roles/fedora_setup/tasks/main.yml
+++ b/roles/fedora_setup/tasks/main.yml
@@ -24,6 +24,14 @@
   tags:
     - packages
 
+- name: Add Mullvad repository
+  get_url:
+    url: https://repository.mullvad.net/rpm/stable/mullvad.repo
+    dest: /etc/yum.repos.d/mullvad-browser.repo
+    mode: '0644'
+  tags:
+    - packages
+
 - name: Upgrade all packages
   dnf5:
     name: "*"
@@ -230,60 +238,6 @@
     state: started
     daemon_reload: true
 
-# Battery
-- name: Ensure systemd user directory exists
-  file:
-    path: "{{ lookup('env', 'HOME') }}/.config/systemd/user"
-    state: directory
-    mode: '0755'
-  tags: battery
-
-- name: Install battery alert systemd service
-  copy:
-    dest: "{{ lookup('env', 'HOME') }}/.config/systemd/user/battery-alert.service"
-    mode: '0644'
-    content: |
-      [Unit]
-      Description=Battery level notifier
-
-      [Service]
-      Type=oneshot
-      ExecStart=%h/.config/scripts/battery_alert.sh
-  tags: battery
-
-- name: Install battery alert systemd timer
-  copy:
-    dest: "{{ lookup('env', 'HOME') }}/.config/systemd/user/battery-alert.timer"
-    mode: '0644'
-    content: |
-      [Unit]
-      Description=Run battery alert every 30 seconds
-
-      [Timer]
-      OnBootSec=15s
-      OnUnitActiveSec=30s
-      Unit=battery-alert.service
-
-      [Install]
-      WantedBy=default.target
-  tags: battery
-
-- name: Reload systemd user units
-  command: systemctl --user daemon-reload
-  environment:
-    XDG_RUNTIME_DIR: "/run/user/{{ ansible_uid }}"
-  tags: battery
-
-- name: Enable and start battery alert timer
-  systemd:
-    name: battery-alert.timer
-    scope: user
-    enabled: yes
-    state: started
-  environment:
-    XDG_RUNTIME_DIR: "/run/user/{{ ansible_uid }}"
-  tags: battery
-
 # Dunst
 - name: Install dunst systemd user service
   copy:
diff --git a/roles/fedora_setup/vars/main.yml b/roles/fedora_setup/vars/main.yml
index 4ecdddd..6835862 100755
--- a/roles/fedora_setup/vars/main.yml
+++ b/roles/fedora_setup/vars/main.yml
@@ -3,12 +3,15 @@ copr_repos:
   - useidel/signal-desktop
   - robot/veracrypt
   - solopasha/hyprland
+  - wojnilowicz/ungoogled-chromium
 
 packages:
-  - sway
-  - swayidle
-  - swaylock
-  - swaybg
+  - hyrpland
+  - hypridle
+  - hyprlock
+  - hyprpaper
+  - zsh
+  - sddm
   - wl-clipboard
   - feh
   - alacritty
@@ -25,6 +28,7 @@ packages:
   - wtype
   - papirus-icon-theme
   - breeze-cursor-theme
+  - arc-theme
   - google-noto-color-emoji-fonts
   - google-noto-sans-cjk-fonts
   - google-noto-emoji-fonts
@@ -41,7 +45,6 @@ packages:
   - mpv
   - udiskie
   - pavucontrol
-  - flatpak
   - bluez
   - bluez-tools
   - blueman
@@ -56,27 +59,20 @@ packages:
   - newsboat
   - mpd
   - ncmpcpp
-  - asunder
+  - asunder # Burning CDs
   - librewolf
-  - keychain
   - nicotine+
   - python3-rich
   - lximage-qt
-  - tlp
-  - tlp-rdw
   - zathura
   - zathura-plugins-all
   - glow
   - torbrowser-launcher
-  - pulseaudio-libs-devel   # SwayAudioIdleInhibit
-  - wayland-devel           # SwayAudioIdleInhibit
-  - gcc-c++                 # SwayAudioIdleInhibit
-  - wayland-protocols-devel # SwayAudioIdleInhibit
   - libtool                 # Doom Emacs
-  - meson
-  - ninja
   - veracrypt
   - lowdown
+  - ungoogled-chromium
+  - mullvad-browser
 
 init_groups:
   - wheel
@@ -111,7 +107,7 @@ init_users:
     groups: 
       - wheel
     state: present
-    shell: /bin/yash
+    shell: /bin/zsh
     create_home: true
 
 network_interface: "{{ ansible_default_ipv4.interface }}"