diff --git a/tasks/main.yml b/tasks/main.yml
index 3173e87..e33ef25 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -25,20 +25,3 @@
     loop_var: swayusr
     label: "{{ swayusr.home }}/.config/waybar/"
   when: sway__waybar | bool
-
-# -  name: Ensure i3 packages are installed [Archlinux}
-#    ansible.builtin.include_tasks:
-#      file: setup-Archlinux.yml
-#    when: ansible_os_family == 'Archlinux'
-#
-# -  name: Ensure i3 packages are installed [RHEL].
-#    ansible.builtin.include_tasks:
-#      file: setup-RedHat.yml
-#    when: ansible_os_family == 'Fedora' or ansible_os_family == 'RedHat'
-
-# - name: Create i3 config file
-#   ansible.builtin.include_tasks:
-#     file: config.yml
-#   loop: "{{ i3wm_user_list | flatten(1) }}"
-#   loop_control:
-#     loop_var: i3wm_usr
diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
index fa6b875..4075c1d 100644
--- a/tasks/setup-Debian.yml
+++ b/tasks/setup-Debian.yml
@@ -7,12 +7,6 @@
   when:
     - ansible_pkg_mgr == "apt"
 
-# - name: Ensure i3 packages are installed.
-#   ansible.builtin.apt:
-#     name: "{{ i3_packages }}"
-#     state: "present"
-#   become: true
-
 - name: Ensure swaywm is installed.
   ansible.builtin.apt:
     name: "{{ item }}"
@@ -28,7 +22,6 @@
     - 'swayimg'
     - 'wdisplays'
     - 'wlsunset'
-    - 'waybar'
 
 - name: Ensure font-awesome is installed
   ansible.builtin.apt:
diff --git a/tasks/waybar.yml b/tasks/waybar.yml
index 7d797d3..ea1e1c8 100644
--- a/tasks/waybar.yml
+++ b/tasks/waybar.yml
@@ -1,8 +1,16 @@
 ---
+- name: Ensure waybar is installed.
+  ansible.builtin.apt:
+    name: "{{ item }}"
+    state: "present"
+  become: true
+  with_items:
+    - 'waybar'
+
 - name: Create waybar config folder
   become: true
   ansible.builtin.file:
-    path: "{{ swayusr.home }}/.config/waybr/"
+    path: "{{ swayusr.home }}/.config/waybar/"
     state: directory
     mode: '0750'
     owner: "{{ swayusr.user }}"
diff --git a/vars/main.yml b/vars/main.yml
index 8990c3c..34b6da2 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,3 +1,3 @@
 ---
-playbook_version_number: 5  # should be int
+playbook_version_number: 6  # should be int
 playbook_version_path: 'role-roles-ansible.sway.version'