diff --git a/.config/rofi/catppuccin-default.rasi b/.config/rofi/catppuccin-default.rasi
index 9aa18d6..f75b224 100644
--- a/.config/rofi/catppuccin-default.rasi
+++ b/.config/rofi/catppuccin-default.rasi
@@ -23,7 +23,7 @@
   background:                  @base;
   selected-active-background:  @blue;
   active-background:           @background;
-  selected-normal-background:  @lightfg;
+  selected-normal-background:  @peach;
   alternate-normal-background: @lightbg;
   foreground:                  @text;
   selected-urgent-foreground:  @background;
@@ -115,7 +115,7 @@ scrollbar {
     padding:      0;
     handle-width: 8px ;
     border:       0;
-    handle-color: @normal-foreground;
+    handle-color: @peach;
 }
 sidebar {
     border-color: @separatorcolor;
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index d8a3182..f37cd78 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -1,74 +1,92 @@
-{
+[{
+  "output": "DP-1",
   "layer": "top", // Waybar at top layer
-  "position": "top", // Waybar position (top|bottom|left|right)
-    // "width": 1280, // Waybar width
-    // Choose the order of the modules
-    "modules-left": ["sway/workspaces", "pulseaudio", "clock"],
-    "modules-right": ["tray", "memory", "battery", "custom/power"],
-    "sway/workspaces": {
-      "disable-scroll": true,
-      "sort-by-name": true,
-      "format": " {index} {icon} ",
+  "position": "left", // Waybar position (top|bottom|left|right)
+  "width": 44, // Waybar width
+  // Choose the order of the modules
+  "modules-left": ["pulseaudio", "clock"],
+  "modules-center": ["sway/workspaces"],
+  "modules-right": ["tray", "battery", "custom/power"],
+  "sway/workspaces": {
+    "persistent-workspaces": {
+      "1": ["DP-1"],
+      "2": ["DP-1"],
+      "3": ["DP-1"],
+      "4": ["DP-1"],
+    },
+    "disable-scroll": true,
+    "sort-by-name": true,
+    "format": "{icon}",
+    "format-icons": {
+      "default": "<span color=\"#cdd6f4\">●</span>",
+      "focused": "<span color=\"#fab387\">●</span>",
+    },
+  },
+  "tray": {
+    "icon-size": 21,
+    "spacing": 10
+  },
+  "clock": {
+    "timezone": "America/Montreal",
+    "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+    "format": "🕐\n{:%H\n%M\n\n📅\n%d\n%m\n%y} "
+  },
+  "backlight": {
+    "device": "intel_backlight",
+    "format": "{icon}",
+    "format-icons": ["", "", "", "", "", "", "", "", ""]
+  },
+  "battery": {
+    "states": {
+      "warning": 30,
+      "critical": 15
+    },
+    "format": "🔋{capacity}%",
+    "format-charging": "⚡{capacity}%",
+    "format-plugged": "🔌{capacity}%",
+    "format-alt": "{icon}",
+    "format-icons": ["", "",  "", "", "", "", "", "", "", "", "", ""]
+  },
+  "custom/power": {
+    "format" : "⏻",
+    "tooltip": false,
+    "menu": "on-click",
+    "menu-file": "~/.config/waybar/power_menu.xml",
+    "menu-actions": {
+      "logout": "loginctl terminate-user \"\"",
+      "shutdown": "systemctl poweroff",
+      "reboot": "systemctl reboot"
+    }
+  },
+  "pulseaudio": {
+      // "scroll-step": 1, // %, can be a float
+      "format": "{icon}\n{volume}%",
+      "format-muted": "",
       "format-icons": {
-        "default": "◇",
-        "focused": "◈",
+        "default": ["", "", " "]
       },
+      "on-click": "pwvucontrol"
+  },
+},
+{
+  "output": "DP-2",
+  "layer": "top",
+  "position": "top",
+  "height": 44,
+  "modules-center": ["sway/workspaces"],
+  "sway/workspaces": {
+    "persistent-workspaces": {
+      "5": ["DP-2"],
+      "6": ["DP-2"],
+      "7": ["DP-2"],
+      "8": ["DP-2"],
     },
-    "tray": {
-      "icon-size": 21,
-      "spacing": 10
+    "disable-scroll": true,
+    "sort-by-name": true,
+    "format": "{icon}",
+    "format-icons": {
+      "default": "<span color=\"#cdd6f4\">●</span>",
+      "focused": "<span color=\"#fab387\">●</span>",
     },
-    "custom/music": {
-      "format": "  {}",
-      "escape": true,
-      "interval": 5,
-      "tooltip": false,
-      "exec": "playerctl metadata --format='{{ title }}'",
-      "on-click": "playerctl play-pause",
-      "max-length": 50
-    },
-    "clock": {
-      "timezone": "America/Montreal",
-      "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-      "format": "🕐 {:%H:%M  📅 %d/%m/%y} "
-    },
-    "backlight": {
-      "device": "intel_backlight",
-      "format": "{icon}",
-      "format-icons": ["", "", "", "", "", "", "", "", ""]
-    },
-    "memory": {
-      "format": "{used:0.1f}/{total:0.1f}G"
-    },
-    "battery": {
-      "states": {
-        "warning": 30,
-        "critical": 15
-      },
-      "format": "🔋{capacity}%",
-      "format-charging": "⚡{capacity}%",
-      "format-plugged": "🔌{capacity}%",
-      "format-alt": "{icon}",
-      "format-icons": ["", "",  "", "", "", "", "", "", "", "", "", ""]
-    },
-    "custom/power": {
-      "format" : "⏻",
-      "tooltip": false,
-      "menu": "on-click",
-      "menu-file": "~/.config/waybar/power_menu.xml",
-      "menu-actions": {
-        "logout": "loginctl terminate-user \"\"",
-        "shutdown": "systemctl poweroff",
-        "reboot": "systemctl reboot"
-      }
-    },
-    "pulseaudio": {
-        // "scroll-step": 1, // %, can be a float
-        "format": "{icon} {volume}%",
-        "format-muted": "",
-        "format-icons": {
-          "default": ["", "", " "]
-        },
-        "on-click": "pwvucontrol"
-    },
-}
+  }
+}]
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 430cfbe..d7b4105 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -7,12 +7,11 @@
 }
 
 #waybar {
-  background-color: @base;
+  background-color: @crust;
   color: @text;
 }
 
 #workspaces {
-  background-color: @mauve;
 }
 
 #workspaces button {
@@ -34,17 +33,14 @@
 #custom-lock,
 #custom-power,
 #memory {
-  background-color: @surface0;
   padding: 0.5rem 1rem;
 }
 
 #memory {
-  margin-right: 1rem;
 }
 
 #clock {
   color: @blue;
-  margin-right: 1rem;
 }
 
 #battery {
@@ -69,7 +65,6 @@
 
 #pulseaudio {
   color: @maroon;
-  margin-left: 1rem;
 }
 
 #custom-music {
@@ -82,10 +77,9 @@
 }
 
 #custom-power {
-  background-color: @mauve;
+  background-color: @peach;
   color: @crust;
 }
 
 #tray {
-  margin-right: 1rem;
 }
diff --git a/.tmux.conf b/.tmux.conf
index 2b21b00..1c4d628 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -43,19 +43,16 @@ set -ga update-environment TERM
 set -ga update-environment TERM_PROGRAM
 set -ga update-environment SSH_CONNECTION
 
+set -g @catppuccin_flavor 'mocha'
 set -g @catppuccin_window_text " #W"
 set -g @catppuccin_window_default_text " #W"
 set -g @catppuccin_window_current_text " #W"
 
 run ~/.tmux/plugins/tmux/catppuccin.tmux
 
+set -g status-position top
 set -g status-justify "left"
 set -g status-left " "
-set -gF status-right "#[fg=#{@thm_crust},bg=#{@thm_teal}] ##H "
-
-# Remap prefix from Ctrl+b to Ctrl+Space
-unbind C-b
-set -g prefix C-Space
-bind C-Space send-prefix
+set -gF status-right "#[fg=#{@thm_crust},bg=#{@thm_teal}] #S / ##H "
 
 run '~/.tmux/plugins/tpm/tpm'