diff --git a/gui/waybar/config b/gui/waybar/config
deleted file mode 100644
index ce621eb2..00000000
--- a/gui/waybar/config
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "_comment": "jstm's waybar config",
-  "layer": "top",
-  "position": "top",
-  "height": 30,
-  "spacing": 4,
-  "modules-left": ["hyprland/window"],
-  "modules-center": ["mpris"],
-  "modules-right": ["pulseaudio","clock","tray"],
-  "hyprland/window": {
-    "format": "⚙️ {}"
-  },
-  "mpris": {
-    "interval": 1,
-    "player-icons": {
-      "firefox": "🌐",
-      "mpv": "🎧️",
-      "vlc": "🚧"
-    },
-    "status-icons": {
-      "playing": "▶️",
-      "paused": "⏸️",
-      "stopped": ""
-    },
-    "format": "{player_icon} {status_icon} {artist} - {title} ({position}/{length})",
-    "ignored-players": ["firefox","vlc"]
-  },
-  "tray": {
-    // "icon-size": 21,
-    "spacing": 10
-  },
-  "clock": {
-    "interval": 1,
-    "timezone": "Europe/Berlin",
-    "format": "{:%H:%M:%S}"
-  },
-  "pulseaudio": {
-    "scroll-step": 5,
-    "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"
-  }
-}
-
diff --git a/gui/waybar/config.jsonc b/gui/waybar/config.jsonc
new file mode 100644
index 00000000..d8f159e2
--- /dev/null
+++ b/gui/waybar/config.jsonc
@@ -0,0 +1,71 @@
+{
+ "name": "mainbar",
+ "output": [ "DP-1" ],
+ "layer": "top",
+ "position": "top",
+ "height": 36,
+ "spacing": 4,
+ 
+ "modules-left": [ "hyprland/window" ],
+ "modules-center": [],
+ "modules-right": [ "pulseaudio", "battery", "clock", "tray" ],
+ 
+ "hyprland/window": {
+  "format": "{}",
+  "icon": true,
+  "icon-size": 28,
+  
+  "rewrite": {
+   "(.*) – Mozilla Firefox": "Firefox: $1",
+   "(.*) — Konsole": "Konsole: $1",
+   "Loading Fabric Loader": "Initializing Minecraft",
+   "Minecraft\\* (.*)": "Minecraft $1",
+  },
+ },
+ "tray": {
+  // "icon-size": 21,
+  "show-passive-items": true,
+  "spacing": 10,
+ },
+ "pulseaudio": {
+  "scroll-step": 1,
+  
+  "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",
+ },
+ "battery": {
+  "full-at": 95,
+  "bat-compatibility": true,
+  
+  "format": "{capacity}%",
+  "format-time": "Duration: {H}:{M}",
+  
+  "states": {
+   "warning": 15,
+   "critical": 10,
+  },
+ },
+ "clock": {
+  "interval": 1,
+  "format": "{:%H:%M:%S}",
+  
+  "timezone": "Europe/Berlin",
+ },
+}
+
diff --git a/gui/waybar/style.css b/gui/waybar/style.css
index a63fafde..858b3236 100644
--- a/gui/waybar/style.css
+++ b/gui/waybar/style.css
@@ -1,13 +1,15 @@
 /* jstm's waybar stylesheet */
 
 * {
-	font-family: Jost;
-	font-size: 14px;
-	font: 14px Jost;
+	font-family: Jost, 'Fira Code';
+	font: 18px 'Fira Code';
+	font-size: 18px;
+	font-weight: 500;
 }
-window#waybar {
-	/*background-color: #1b1b1b;*/
+window#waybar.mainbar {
+	/* background-color: #1b1b1b; */
 	background-color: transparent;
+	
 	color: #ffffff;
 	transition-property: background-color;
 	transition-duration: .5s;
@@ -16,22 +18,11 @@ window#waybar.hidden {
 	opacity: 0.2;
 }
 
-#window,
-#mpris,
-#pulseaudio,
-#clock,
-#tray {
-	padding: 0 10px 0 10px;
+*.module {
+	padding: 0 20px 0 20px;
+	
 	color: #ffffff;
-	animation-name: blink;
-	/*animation-duration: 1s;
-	animation-iteration-count: infinite;
-	animation-direction: alternate;*/
-}
-
-@keyframes blink {
-    to {
-        background-color: #ffffff;
-        color: #000000;
-    }
+	background-color: #d60532;
+	
+	border-radius: 32px;
 }