diff --git a/waybar/config.template b/waybar/config.template
index 8603d5500..7f7bbe2d0 100644
--- a/waybar/config.template
+++ b/waybar/config.template
@@ -4,26 +4,6 @@
 // The script will build a config with these settings for each enabled display.
 // The '__' variables are defined in the hash in that script file.
 [{
-    "name": "window",
-    "output": __OUTPUT__,
-    "ipc": true,
-    "id": "bar-1",
-    "width": 1000,
-    "mode": "hide",
-    "hidden_state": "hide",
-    "layer": "top", // Waybar at top layer
-    "position": "top", // Waybar position (top|bottom|left|right)
-    "margin-left": 75,
-    "margin-right": 75,
-    "margin-top": 68,
-    "modules-left": [],
-    "modules-center": ["sway/mode", "sway/window"],
-    "modules-right": [],
-    "sway/mode": {
-        "format": "<span style=\"italic\">{}</span>"
-    },
-},
-{
     "name": "bar",
     "output": __OUTPUT__,
     "ipc": true,
@@ -32,13 +12,13 @@
     "hidden_state": "hide",
     "layer": "top", // Waybar at top layer
     "position": "top", // Waybar position (top|bottom|left|right)
-    "margin-left": 20,
-    "margin-right": 20,
-    "margin-top": 20,
+    //"margin-left": 20,
+    //"margin-right": 20,
+    //"margin-top": 20,
     // Choose the order of the modules
-    "modules-left": ["sway/workspaces"],
+    "modules-left": ["sway/workspaces", "sway/window"],
     "modules-center": [],
-    "modules-right": ["custom/weather", "network", "network#wireguard", "cpu", "memory", "custom/disk", "temperature", "backlight", "custom/battery", "pulseaudio","tray", "custom/wallpaper", "custom/todo", "custom/osk", "custom/pkg", "custom/bar", "custom/gammastep", "idle_inhibitor", "custom/hibernate_inhibitor", "custom/clock", "custom/power"],
+    "modules-right": ["sway/mode", "custom/weather", "network", "network#wireguard", "cpu", "memory", "custom/disk", "temperature", "custom/battery", "pulseaudio","tray", "custom/wallpaper", "custom/todo", "custom/osk", "custom/pkg", "custom/bar", "custom/gammastep", "idle_inhibitor", "custom/hibernate_inhibitor", "custom/clock", "custom/power"],
     // Modules configuration
     "sway/workspaces": {
         // "disable-scroll": true,
@@ -125,14 +105,14 @@
         "critical-threshold": 80,
         "format": "\u200a{temperatureC}°C"
     },
-    "backlight": {
+    //"backlight": {
         // "device": "acpi_video1",
-        "format": "{icon}\u200a{percent}%",
-        "format-icons": [ "•", "☼", "o", "", ""],
-        "on-click": "${HOME}/scripts/thinkpad/blc.pl --notify %",
-        "on-scroll-up": "${HOME}/scripts/thinkpad/blc.pl --notify ++",
-        "on-scroll-down": "${HOME}/scripts/thinkpad/blc.pl --notify --"
-    },
+        //"format": "{icon}\u200a{percent}%",
+        //"format-icons": [ "•", "☼", "o", "", ""],
+        //"on-click": "${HOME}/scripts/thinkpad/blc.pl --notify %",
+        //"on-scroll-up": "${HOME}/scripts/thinkpad/blc.pl --notify ++",
+        //"on-scroll-down": "${HOME}/scripts/thinkpad/blc.pl --notify --"
+    //},
     "custom/battery": {
         "format": "{}",
         "return-type": "json",
@@ -162,7 +142,7 @@
     },
     "custom/wallpaper": {
         "interval": 86400,
-        "exec": "echo '🌌\nRotate wallpaper\nactive'",
+        "exec": "echo '✶\nRotate wallpaper\nactive'",
         "on-click": "${HOME}/scripts/sway/rotate-wallpaper.sh"
     },
     "custom/todo": {
diff --git a/waybar/style.css b/waybar/style.css
index da9f5f65d..b81491f94 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -46,49 +46,40 @@
 }
 
 window#waybar.window {
-    font-size: 14px;
 }
 
 window#waybar {
     margin: -5px;
-    border-radius: 30px;
-    border: solid 2px @fg;
-    font-size: 14px;
+    border-bottom: solid 1px @fg;
     background-color: @bg;
     animation-name: fadeIn;
     animation-duration: 1s;
     color: @fg;
 }
 
-#window, #workspaces, #mode, #mpd, #network, #cpu, #memory, #custom-disk, #temperature, #backlight, #custom-battery, #pulseaudio, #custom-clock, #tray, #custom-todo, #custom-osk, #idle_inhibitor, #custom-power, #custom-weather {
+#window, #mode, #custom-weather, #mpd, #network, #cpu, #memory, #custom-disk, #temperature, #custom-battery, #pulseaudio, #tray, #custom-wallpaper, #custom-todo, #custom-osk, #custom-pkg, #custom-bar, #custom-gammastep, #idle_inhibitor, #custom-hibernate_inhibitor, #custom-clock, #custom-power {
     color: @grey06;
-    padding: 0 3px;
+    padding: 0px 2px;
     margin: 0px;
 }
 
 /* Tray */
 
-#tray, #custom-todo, #custom-osk, #custom-pkg, #custom-bar, #custom-gammastep, #idle_inhibitor, #custom-clock, #custom-power {
+#tray, #custom-wallpaper,  #custom-todo, #custom-osk, #custom-pkg, #custom-bar, #custom-gammastep, #idle_inhibitor, #custom-clock, #custom-power {
     color: @bluehi;
 }
 
-#mode, #mpd, #network, #cpu, #memory, #custom-disk, #temperature, #backlight, #custom-battery, #custom-clock, #tray, #custom-todo, #custom-osk, #idle_inhibitor {
-    border-top: solid 2px @fg;
-    border-bottom: solid 2px @fg;
-}
+/* Wallpaper rotation */
 
-#window {
-    padding: 5px;
+#custom-wallpaper {
+    margin: -10px -4px -5px -4px;
+    font-size: 20px;
 }
 
 /* Workspaces */
 
 #workspaces {
     color: @fg;
-    padding: 0px 0px;
-    margin: 0px;
-    margin-left: 15px;
-    border-radius: 0px;
 }
 
 #workspaces button.visible {
@@ -126,8 +117,7 @@ window#waybar {
 }
 
 #custom-weather {
-    font-size: 14px;
-    margin-top: -5px;
+    margin-top: -7px;
 }
 
 /* Networks */
@@ -140,6 +130,8 @@ window#waybar {
 
 #network.wireguard {
     padding: 0px;
+    font-size: 18px;
+    margin-top: -2px;
     margin-right: 2px;
 }
 
@@ -229,7 +221,7 @@ window#waybar {
 /* Tray */
 
 #tray {
-    font-size: 14px;
+    margin-right: -2px;
 }
 
 /* Todo-txt */
@@ -299,8 +291,8 @@ window#waybar {
 /* Power button */
 
 #custom-power {
-    margin-right: 8px;
-    margin-top: 8px;
+    margin-right: 0px;
+    margin-top: 5px;
     color: @red;
 }