diff --git a/.gitmodules b/.gitmodules
index 077118c..bd0c40d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "Sway Catppuccin Theme"]
 	path = config/sway/themes/catppuccin
 	url = https://github.com/catppuccin/i3.git
+[submodule "Waybar Catppuccin Theme"]
+	path = config/waybar/themes/catppuccin
+	url = https://github.com/catppuccin/waybar.git
diff --git a/config/sway/lock.sh b/config/sway/lock.sh
index d8133f5..2cef125 100755
--- a/config/sway/lock.sh
+++ b/config/sway/lock.sh
@@ -13,5 +13,4 @@ swaylock \
 	--line-color 00000000 \
 	--inside-color 00000088 \
 	--separator-color 00000000 \
-	--grace 2 \
-	--fade-in 0.3
+	--grace 2
diff --git a/config/waybar/config b/config/waybar/config
new file mode 100644
index 0000000..6e7a39b
--- /dev/null
+++ b/config/waybar/config
@@ -0,0 +1,179 @@
+{
+    // "layer": "top", // Waybar at top layer
+    // "height": 30, // Waybar height (to be removed for auto height)
+    "spacing": 4, // Gaps between modules (4px)
+    // Choose the order of the modules
+    "modules-left": [
+        "sway/workspaces", 
+        "sway/mode",
+        "sway/scratchpad", 
+        "custom/media"
+    ],
+    "modules-center": [
+        "tray"
+    ],
+    "modules-right": [
+        "idle_inhibitor",
+        "cpu",
+        "memory",
+        "temperature",
+        "pulseaudio",
+        "network",
+        "battery",
+        "clock"
+    ],
+    // Modules configuration
+    "sway/workspaces": {
+        "disable-scroll": true,
+        "warp-on-scroll": true,
+        "format": "{icon}",
+        "format-icons": {
+            "1": "",
+            "2": "",
+            "3": "",
+            "4": "",
+            "5": "",
+            "urgent": "",
+            "focused": "",
+            "default": ""
+        }
+    },
+    "keyboard-state": {
+        "numlock": true,
+        "capslock": true,
+        "format": "{name} {icon}",
+        "format-icons": {
+            "locked": "",
+            "unlocked": ""
+        }
+    },
+    "sway/mode": {
+        "format": "<span style=\"italic\">{}</span>"
+    },
+    "sway/scratchpad": {
+        "format": "{icon} {count}",
+        "show-empty": false,
+        "format-icons": ["", ""],
+        "tooltip": true,
+        "tooltip-format": "{app}: {title}"
+    },
+    "mpd": {
+        "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
+        "format-disconnected": "Disconnected ",
+        "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
+        "unknown-tag": "N/A",
+        "interval": 2,
+        "consume-icons": {
+            "on": " "
+        },
+        "random-icons": {
+            "off": "<span color=\"#f53c3c\"></span> ",
+            "on": " "
+        },
+        "repeat-icons": {
+            "on": " "
+        },
+        "single-icons": {
+            "on": "1 "
+        },
+        "state-icons": {
+            "paused": "",
+            "playing": ""
+        },
+        "tooltip-format": "MPD (connected)",
+        "tooltip-format-disconnected": "MPD (disconnected)"
+    },
+    "idle_inhibitor": {
+        "format": "{icon}",
+        "format-icons": {
+            "activated": "",
+            "deactivated": ""
+        }
+    },
+    "tray": {
+        // "icon-size": 21,
+        "spacing": 10
+    },
+    "clock": {
+        // "timezone": "America/New_York",
+        "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
+        "format-alt": "{:%Y-%m-%d}"
+    },
+    "cpu": {
+        "format": "{usage}% ",
+        "tooltip": false
+    },
+    "memory": {
+        "format": "{}% "
+    },
+    "temperature": {
+        // "thermal-zone": 2,
+        // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+        "critical-threshold": 80,
+        // "format-critical": "{temperatureC}°C {icon}",
+        "format": "{temperatureC}°C {icon}",
+        "format-icons": ["", "", ""]
+    },
+    "backlight": {
+        // "device": "acpi_video1",
+        "format": "{percent}% {icon}",
+        "format-icons": ["", "", "", "", "", "", "", "", ""]
+    },
+    "battery": {
+        "states": {
+            // "good": 95,
+            "warning": 30,
+            "critical": 15
+        },
+        "format": "{capacity}% {icon}",
+        "format-charging": "{capacity}% ",
+        "format-plugged": "{capacity}% ",
+        "format-alt": "{time} {icon}",
+        // "format-good": "", // An empty format will hide the module
+        // "format-full": "",
+        "format-icons": ["", "", "", "", ""]
+    },
+    "battery#bat2": {
+        "bat": "BAT2"
+    },
+    "network": {
+        // "interface": "wlp2*", // (Optional) To force the use of this interface
+        "format-wifi": "{essid} ({signalStrength}%) ",
+        "format-ethernet": "{ipaddr}/{cidr} ",
+        "tooltip-format": "{ifname} via {gwaddr} ",
+        "format-linked": "{ifname} (No IP) ",
+        "format-disconnected": "Disconnected ⚠",
+        "format-alt": "{ifname}: {ipaddr}/{cidr}"
+    },
+    "pulseaudio": {
+        // "scroll-step": 1, // %, can be a float
+        "format": "{volume}% {icon} {format_source}",
+        "format-bluetooth": "{volume}% {icon} {format_source}",
+        "format-bluetooth-muted": " {icon} {format_source}",
+        "format-muted": " {format_source}",
+        "format-source": "{volume}% ",
+        "format-source-muted": "",
+        "format-icons": {
+            "headphone": "",
+            "hands-free": "",
+            "headset": "",
+            "phone": "",
+            "portable": "",
+            "car": "",
+            "default": ["", "", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+    "custom/media": {
+        "format": "{icon} {}",
+        "return-type": "json",
+        "max-length": 40,
+        "format-icons": {
+            "spotify": "",
+            "default": "🎜"
+        },
+        "escape": true,
+        "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder
+        // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
+    }
+}
diff --git a/config/waybar/style.css b/config/waybar/style.css
new file mode 100644
index 0000000..9994a39
--- /dev/null
+++ b/config/waybar/style.css
@@ -0,0 +1,197 @@
+@import "./themes/catppuccin/themes/macchiato.css";
+
+@keyframes blink_red {
+  to {
+    background-color: @red;
+    color: @base;
+  }
+}
+
+* {
+  /* `otf-font-awesome` is required to be installed for icons */
+  font-family: JetBrainsMono Roboto, Helvetica, Arial, sans-serif;
+  font-size: 1rem;
+}
+
+box.modules-left,
+box.modules-center,
+box.modules-right {
+  border-radius: 1rem;
+  background-color: @base;
+}
+
+.warning,
+.critical,
+.urgent {
+  animation-name: blink_red;
+  animation-duration: 800ms;
+  animation-timing-function: linear;
+  animation-iteration-count: infinite;
+  animation-direction: alternate;
+}
+
+#mode,
+#clock,
+#memory,
+#temperature,
+#cpu,
+#custom-weather,
+#mpd,
+#idle_inhibitor,
+#backlight,
+#pulseaudio,
+#network,
+#battery,
+#custom-powermenu,
+#custom-cava-internal,
+#custom-launcher,
+#tray,
+#disk,
+#custom-pacman,
+#custom-scratchpad-indicator {
+  padding: 0 0.6rem;
+}
+
+/* Bar */
+window#waybar {
+  background-color: transparent;
+}
+
+window > box {
+  background-color: transparent;
+  margin: 5px 11px;
+  margin-bottom: 0;
+}
+
+window#waybar button:not(:first-child),
+window#waybar button:not(:last-child) {
+  border-radius: 0;
+}
+
+window#waybar button:first-child {
+  border-radius: 1rem 0 0 1rem;
+}
+
+window#waybar button:last-child {
+  border-radius: 0 1rem 1rem 0;
+}
+
+/* Workspaces */
+#workspaces button {
+  padding: 0.2rem 0.75rem;
+  color: @text;
+}
+
+#workspaces button label {
+  background-color: transparent;
+  font-size: 1.2rem;
+}
+
+#workspaces button:not(:first-child) label {
+  /* Fix fontawesome miss alignment, depends of the padding above and font size */
+  margin-right: 0.45rem;
+}
+
+#workspaces button.focused {
+  color: @teal;
+  background-color: alpha(@teal, 0.15);
+}
+
+#workspaces button:hover {
+  /* border: .2px solid transparent; */
+  background: alpha(@blue, 0.15);
+  color: @blue;
+  border-color: transparent;
+  box-shadow: inherit;
+  text-shadow: inherit;
+}
+
+/* Tooltip */
+tooltip {
+  background-color: @base;
+}
+
+tooltip label {
+  color: @rosewater;
+}
+
+/* battery */
+#battery {
+  color: @mauve;
+}
+#battery.full {
+  color: @green;
+}
+#battery.charging {
+  color: @teal;
+}
+#battery.discharging {
+  color: @peach;
+}
+#battery.critical:not(.charging) {
+  color: @pink;
+}
+#custom-powermenu {
+  color: @red;
+}
+
+/* mpd */
+#mpd.paused {
+  color: @pink;
+  font-style: italic;
+}
+#mpd.stopped {
+  color: @rosewater;
+  /* background: transparent; */
+}
+#mpd {
+  color: @lavender;
+}
+
+/* Extra */
+#custom-cava-internal {
+  color: @peach;
+  padding-right: 1rem;
+}
+#custom-launcher {
+  color: @yellow;
+}
+#memory {
+  color: @peach;
+}
+#cpu {
+  color: @blue;
+}
+#clock {
+  color: @rosewater;
+}
+#idle_inhibitor {
+  color: @green;
+}
+#temperature {
+  color: @sapphire;
+}
+#backlight {
+  color: @green;
+}
+#pulseaudio {
+  color: @mauve; /* not active */
+}
+#network {
+  color: @pink; /* not active */
+}
+#network.disconnected {
+  color: @foreground; /* not active */
+}
+#disk {
+  color: @maroon;
+}
+#custom-pacman {
+  color: @sky;
+}
+#custom-scratchpad-indicator {
+  color: @yellow;
+}
+#custom-weather {
+  color: @red;
+}
diff --git a/config/waybar/themes/catppuccin b/config/waybar/themes/catppuccin
new file mode 160000
index 0000000..f74ab1e
--- /dev/null
+++ b/config/waybar/themes/catppuccin
@@ -0,0 +1 @@
+Subproject commit f74ab1eecf2dcaf22569b396eed53b2b2fbe8aff