diff --git a/group_vars/all/swaylock.yml b/group_vars/all/swaylock.yml
index 88b4802..c5d0407 100644
--- a/group_vars/all/swaylock.yml
+++ b/group_vars/all/swaylock.yml
@@ -6,7 +6,7 @@ swaylock_flags:
   - line-uses-inside
 
 swaylock_options:
-  image: '{{ swaylock_image | default("~/medias/images/wallpapers/lockscreen.png") }}'
+  image: '{{ swaylock_image | default("/usr/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png") }}'
   scaling: '{{ swaylock_image_scale | default("fit") }}'
   color: '000000'
   indicator-radius: 70
diff --git a/group_vars/all/workspaces.yml b/group_vars/all/workspaces.yml
index c8fb716..7d3f73d 100644
--- a/group_vars/all/workspaces.yml
+++ b/group_vars/all/workspaces.yml
@@ -1,19 +1,19 @@
 ---
 sway_workspaces:
   1: '1: '
-  2: '2: 󰇮'
-  3: '3: 󰈹'
-  4: '4: 󰍦'
+  2: '2: '
+  3: '3: '
+  4: '4: '
   5: '5: '
-  6: '6: 󰈙'
+  6: '6: '
   7: '7: '
-  8: '8: '
-  9: '9: '
-  0: '10: '
+  8: '8'
+  9: '9'
+  0: '10'
 
 sway_rules:
   - verb: 'assign'
-    query: '[app_id="^[Ff]irefox$"]'
+    query: '[app_id="^Firefox$"]'
     action: 3
   - verb: 'assign'
     query: '[app_id="KeePassXC$"]'
diff --git a/playbook.yml b/playbook.yml
index 6535d14..267cd16 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -9,22 +9,22 @@
 
     - name: Merge Sway output variable
       ansible.builtin.set_fact:
-        sway_outputs: '{{ sway_outputs |
-          community.general.lists_mergeby(local_sway_outputs, "id") }}'
+        sway_outputs: '{{ local_sway_outputs |
+          community.general.lists_mergeby(sway_outputs, "id") }}'
       when: local_sway_outputs is defined
 
     - name: Merge Sway input variable
       ansible.builtin.set_fact:
-        sway_inputs: '{{ sway_inputs |
-            community.general.lists_mergeby( local_sway_inputs, "name" ) }}'
+        sway_inputs: '{{ local_sway_inputs |
+            community.general.lists_mergeby( sway_inputs, "name" ) }}'
       when: local_sway_inputs is defined
 
     - name: Merge Kanshi profiles variable
       ansible.builtin.set_fact:
-        kanshi_profiles: '{{ kanshi_profiles |
-            community.general.lists_mergeby(local_kanshi_profiles, "profile") }}'
+        kanshi_profiles: '{{ local_kanshi_profiles |
+            community.general.lists_mergeby(kanshi_profiles, "profile") }}'
       when: local_kanshi_profiles is defined
-    
+
 - name: Install CLI stuff
   hosts: all
   tasks:
diff --git a/vars/mrmeeseeks/kanshi.yml b/vars/mrmeeseeks/kanshi.yml
deleted file mode 100644
index 3574e1d..0000000
--- a/vars/mrmeeseeks/kanshi.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-kanshi_profiles:
-  - profile: 'home'
-    screens:
-    - id: 'iiyama_27_4k_h'
-      position: '0,0'
-    - id: 'iiyama_27_4k_v'
-      position: '1920,0'
-      transform: 270
diff --git a/vars/mrmeeseeks/sway.yml b/vars/mrmeeseeks/sway.yml
deleted file mode 100644
index ef80bda..0000000
--- a/vars/mrmeeseeks/sway.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-local_sway_outputs:
-  - id: 'bg'
-    name: '*'
-    options:
-      bg: '~/medias/images/wallpapers/desktop.jpg center #000000'
diff --git a/vars/mrmeeseeks/waybar.yml b/vars/mrmeeseeks/waybar.yml
deleted file mode 100644
index 6c2ffb3..0000000
--- a/vars/mrmeeseeks/waybar.yml
+++ /dev/null
@@ -1,77 +0,0 @@
----
-waybar_options:
-  layer: "top"
-  spacing: 6
-  disable-toolptips: true
-  modules-left:
-    - sway/workspaces
-    - sway/mode
-  modules-center: []
-  modules-right:
-    - network
-    - custom/sep
-    # - temperature
-    - memory 
-    - cpu
-    - custom/sep
-    - pulseaudio
-    - custom/sep
-    - clock
-    - custom/sep
-    - tray
-  sway/mode:
-    format: '<span style="italic">{}</span>'
-  custom/sep:
-    format: "|"
-    tooltip: false
-  sway/workspace:
-    disable-scroll: true
-  idle_inhibitor:
-    format: "{icon}"
-    format-icons:
-      activated: 
-      deactivated: 
-  clock:
-    tooltip: false
-    timezone: "Europe/Paris"
-    format-alt: "{:%Y-%m-%d}"
-  temperature:
-    thermal-zone: "{{ cpu_thermal_zone | default(6) }}"
-    critical-threshold: 80
-    format: "{temperatureC}°C  "
-  cpu:
-      format: "{usage}% {icon}"
-      tooltip: false
-      states:
-        warning: 70
-        critical: 90
-      format-icons:
-        - 
-  network:
-    tooltip: false
-    format-wifi: "{essid} ({signalStrength}%)  "
-    format-ethernet: "{ifname}: {ipaddr}/{cidr} 󰈀 "
-    format-linked: "{ifname} (No IP) 󰈀 "
-    format-disconnected: "Disconnected ⚠ "
-    format-alt: "{ifname}: {ipaddr}/{cidr}"
-  pulseaudio:
-     tooltip: false
-     format: "{format_source} {volume}% {icon} "
-     format-bluetooth: "{volume}% {icon}"
-     format-muted: "{format_source} 󰝟 "
-     format-source: "{volume}%  "
-     format-source-muted: " "
-     format-icons:
-        headphones: 󰋋
-        handsfree: 󰋎
-        headset: 󰋎
-        phone: 
-        portable: 
-        car: 
-        default: 
-  memory:
-    interval: 30
-    states:
-      warning: 70
-      critical: 90
-    format: "{used:0.1f}G/{total:0.1f}G "