diff --git a/roles/trisquel_setup/tasks/main.yml b/roles/trisquel_setup/tasks/main.yml
index 2907338..3604076 100755
--- a/roles/trisquel_setup/tasks/main.yml
+++ b/roles/trisquel_setup/tasks/main.yml
@@ -39,6 +39,14 @@
     name: "*"
     state: latest
 
+
+- name: Add Ubuntu PPAs to apt repositories
+  apt_repository:
+    repo: "{{ item }}"
+    codename: "jammy"   # Force the Ubuntu codename that PPAs support (e.g., "focal" or "jammy")
+    state: present
+  loop: "{{ ppa }}"
+
 - name: Install window manager packages
   package:
     name: "{{ item }}"
diff --git a/roles/trisquel_setup/vars/main.yml b/roles/trisquel_setup/vars/main.yml
index 067ed64..af86e98 100755
--- a/roles/trisquel_setup/vars/main.yml
+++ b/roles/trisquel_setup/vars/main.yml
@@ -31,6 +31,9 @@ init_users:
     shell: /bin/bash
     create_home: true
 
+ppa:
+  - ppa:ansible/ansible
+
 wm_packages:
   - sway
   - swayidle
@@ -45,7 +48,9 @@ wm_packages:
   - wlogout
   - xwayland
   - wdisplays
+  - gammastep # alternative to wlsunset
   - wtype
+  - rofi  # alternative to bemenu for now
 
 ui_packages:
   - papirus-icon-theme
@@ -56,13 +61,21 @@ ui_packages:
   - fonts-noto-color-emoji
   - fonts-noto-cjk
   - fonts-recommended
-  - xfonts-terminus
 
 general_packages:
+  - git
+  - stow
+  - curl
+  - keepassxc
+  - pkg-config
+  - emacs
+  - playerctl
+  - guile-json
+  - unzip
   - syncthing
   - keychain
   - gnupg2
-  - tldr
+  - tldr-py
   - trash-cli
   - htop
   - udiskie
@@ -72,9 +85,8 @@ general_packages:
   - playerctl # for waybar music notification
   - simple-scan
   - wireguard
-
-flatpak_packages:
-  - org.torproject.torbrowser-launcher
+  - exa
+  - screen
 
 doom_dep_packages:
   - fd-find
@@ -86,8 +98,14 @@ doom_dep_packages:
   - shellcheck  # Shell linter for Doom Emacs
 
 
+flatpak_packages:
+  - net.ankiweb.Anki
+  - org.torproject.torbrowser-launcher
+  - org.nicotine_plus.Nicotine
+  - org.strawberrymusicplayer.strawberry
+
 doom_emacs_repo: https://github.com/doomemacs/doomemacs
 doom_emacs_dest: ~/.config/emacs
 
 etbook_repo: https://github.com/edwardtufte/et-book
-etbook_dest: ~/.local/share/fonts
+etbook_dest: ~/.local/share/fonts/et-book