diff --git a/main.yml b/main.yml
index ed5f3bd..0be47f4 100644
--- a/main.yml
+++ b/main.yml
@@ -1,4 +1,5 @@
 - hosts: localhost
   roles:
     - common
-    - desktop-environment
\ No newline at end of file
+    - desktop-environment
+    - essential-tools # Thunar File Manager, Firefox, KeePassXC, Nextcloud Desktop
\ No newline at end of file
diff --git a/roles/desktop-environment/meta/main.yml b/roles/desktop-environment/meta/main.yml
new file mode 100644
index 0000000..1afe99d
--- /dev/null
+++ b/roles/desktop-environment/meta/main.yml
@@ -0,0 +1,2 @@
+dependencies:
+  - role: common
\ No newline at end of file
diff --git a/roles/desktop-environment/tasks/main.yml b/roles/desktop-environment/tasks/main.yml
index d6d870d..fe6ebb9 100644
--- a/roles/desktop-environment/tasks/main.yml
+++ b/roles/desktop-environment/tasks/main.yml
@@ -14,7 +14,6 @@
       - alsa-utils
       - brightnessctl
       - flatpak
-      - thunar
       - adwaita-icon-theme
       - fonts-firacode
       - fonts-font-awesome
diff --git a/roles/desktop-environment/templates/sway-config.j2 b/roles/desktop-environment/templates/sway-config.j2
index 48ab43d..ee26a2a 100644
--- a/roles/desktop-environment/templates/sway-config.j2
+++ b/roles/desktop-environment/templates/sway-config.j2
@@ -213,7 +213,9 @@ exec hash dbus-update-activation-environment 2>/dev/null && \
 exec waybar
 
 # Autostart applications
+{% if nextcloud == true %}
 exec --no-startup-id nextcloud --background
+{% endif %}
 
 # Theme colors
 client.focused          #c6c6c6 #1f1f1f #c6c6c6 #8abeb7 #8abeb7
diff --git a/roles/essential-tools/meta/main.yml b/roles/essential-tools/meta/main.yml
new file mode 100644
index 0000000..4dc5ce6
--- /dev/null
+++ b/roles/essential-tools/meta/main.yml
@@ -0,0 +1,4 @@
+dependencies:
+  - role: desktop-environment
+    vars:
+      nextcloud: true
\ No newline at end of file
diff --git a/roles/essential-tools/tasks/main.yml b/roles/essential-tools/tasks/main.yml
new file mode 100644
index 0000000..9ea0bd2
--- /dev/null
+++ b/roles/essential-tools/tasks/main.yml
@@ -0,0 +1,18 @@
+- 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
+    update_cache: true
+    filename: debian-unstable
+
+- name: Install essential tools
+  become: yes
+  apt:
+    state: latest
+    install_recommends: false
+    name:
+      - thunar
+      - firefox
+      - keepassxc
+      - nextcloud-desktop
\ No newline at end of file