diff --git a/.config/sway/config b/.config/sway/config
index f64e782..6aaab1b 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -199,17 +199,6 @@ bindsym $mod+r mode "resize"
 # Read `man 5 sway-bar` for more information about this section.
 bar {
     swaybar_command waybar
-    position top
-
-    # When the status_command prints a new line to stdout, swaybar updates.
-    # The default just shows the current date and time.
-    status_command while date +'%Y-%m-%d %l:%M:%S %p'; do sleep 1; done
-
-    colors {
-        statusline #ffffff
-        background #323232
-        inactive_workspace #32323200 #32323200 #5c5c5c
-    }
 }
 
 ### Start personal settings
@@ -227,7 +216,7 @@ focus_follows_mouse no
 gaps inner 10
 
 # Remove the title bar of each window
-#default_border pixel 3
+default_border pixel 3
 
 ### End personal settings
 
diff --git a/.config/waybar/config b/.config/waybar/config
new file mode 100644
index 0000000..b121673
--- /dev/null
+++ b/.config/waybar/config
@@ -0,0 +1,47 @@
+{
+    "layer": "top",
+    "position": "top",
+    "height": 24,
+    "modules-left": ["sway/workspaces"],
+    "modules-center": ["sway/window"],
+    "modules-right": ["tray", "pulseaudio", "network", "temperature", "cpu", "memory", "clock", "custom/germany"],
+    "sway/workspaces": {
+        "disable-scroll": true,
+        "disable-click": true,
+    },
+    "tray": {
+        "spacing": 10,
+    },
+    "clock": {
+        "format": "{:%a %Y %b %d %R}"
+    },
+    "custom/germany": {
+        "format": "{}",
+        "exec": "TZ=Europe/Berlin date \"+%H:%M %Z\"",
+        "interval": 30,
+    },
+    "cpu": {
+        "format": " {usage}%"
+    },
+    "memory": {
+        "format": " {}%"
+    },
+    "temperature": {
+        "critical-threshold": 85,
+        "format": " {temperatureC}°C"
+    },
+    "network": {
+        "format-wifi": " {essid}",
+        "format-disconnected": "⚠ Disconnected"
+    },
+    "pulseaudio": {
+        "format": "{icon} {volume}%",
+        "format-muted": "",
+        "format-icons": {
+            "headphones": "",
+            "default": ["", ""]
+        },
+        "on-click": "pavucontrol"
+    },
+}
+