diff --git a/config/waybar/config b/config/waybar/config
index 9ef5a18..33b89ff 100644
--- a/config/waybar/config
+++ b/config/waybar/config
@@ -2,19 +2,22 @@
 {
   "layer": "bottom",
     "position": "bottom",
-    "margin-right": 5,
-    "margin-left": 5,
-    "margin-bottom": 5,
+    "margin": 4,
     "modules-left": [
-      "sway/workspaces"
+      "sway/workspaces",
+      "sway/mode"
+    ],
+    "modules-center": [
     ],
-    "modules-center": [],
     "modules-right": [
       "disk#1",
     "disk#2",
     "network",
     "cpu",
     "memory",
+    "temperature#1",
+    "temperature#2",
+    "temperature#3",
     "pulseaudio",
     "custom/multimedia_previous",
     "custom/multimedia_current",
@@ -22,6 +25,12 @@
     "clock",
     "tray"
     ],
+    "sway/workspaces": {
+      "all-outputs": true
+    },
+    "sway/mode": {
+      "format": " {}"
+    },
     "disk#1": {
       "interval": 60,
       "format": " {percentage_used:2}%",
@@ -43,6 +52,21 @@
     "memory": {
       "format": " {percentage}%"
     },
+    "temperature#1": {
+      "thermal-zone": 2,
+      "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
+      "format": " {temperatureC}°C"
+    },
+    "temperature#2": {
+      "thermal-zone": 0,
+      "hwmon-path": "/sys/class/hwmon/hwmon0/temp1_input",
+      "format": "{temperatureC}°C"
+    },
+    "temperature#3": {
+      "thermal-zone": 1,
+      "hwmon-path": "/sys/class/hwmon/hwmon1/temp1_input",
+      "format": "{temperatureC}°C"
+    },
     "pulseaudio": {
       "format": "♪ {volume}% {icon}",
       "format-bluetooth": "{volume}% {icon}",
@@ -66,7 +90,7 @@
     "custom/multimedia_current": {
       "interval": 10,
       "exec": "~/Bin/nowPlaying.sh",
-      "on-click": "~/Bin/music.sh PlayPause",
+      "on-click": "~/Bin/music.sh PlayPause"
     },
     "custom/multimedia_next": {
       "format": "",
diff --git a/config/waybar/style.css b/config/waybar/style.css
index ef64aea..28cad8c 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -12,10 +12,12 @@ window#waybar {
 
 /* Base styling for modules */
 #workspaces,
+#mode,
 #disk,
 #network,
 #cpu,
 #memory,
+#temperature,
 #pulseaudio,
 #custom-spotify,
 #custom-multimedia_previous,
@@ -37,19 +39,41 @@ window#waybar {
   border-radius: 4px;
   background: rgba(94,129,172,0.7);
   margin: 0 1px;
+  color: rgba(46, 52, 64, 1);
+}
+#workspaces button.current_output {
+  background: rgba(136, 192, 208, 0.7);
 }
 #workspaces button.focused {
   border-radius: 4px;
-  background: rgba(136, 192, 208, 0.7);
-  color: rgba(46, 52, 64, 1);
+  background: rgba(163, 190, 140, 0.7);
 }
 #workspaces button.urgent {
-  background: rgba(208, 135, 112, 0.7)
+  background: rgba(208, 135, 112, 0.7);
 }
 
 #network.disconnected {
   background: rgba(191, 97, 106, 0.7);
 }
+
+#temperature.1 {
+  margin-right: 0;
+  padding-right: 4px;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+#temperature.2 {
+  margin: 0;
+  padding: 0 4px;
+  border-radius: 0;
+}
+#temperature.3 {
+  margin-left: 0;
+  padding-left: 4px;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
 /* Style for buttons */
 #custom-spotify,
 #custom-multimedia_previous,