diff --git a/.config/configfiles/lockscreen.jpg b/.config/configfiles/lockscreen.jpg
new file mode 100644
index 0000000..a289238
Binary files /dev/null and b/.config/configfiles/lockscreen.jpg differ
diff --git a/.config/sway/config b/.config/sway/config
index d273cda..a0a717f 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -23,10 +23,12 @@ exec_always "pkill kanshi; kanshi"
 
 ### Idle configuration
 #
+ exec pkill swayidle
  exec swayidle -w \
-          timeout 300 'swaylock -f -c 000000' \
-          timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-          before-sleep 'swaylock -f -c 000000'
+          timeout 300 'swaylock -f -c 000000 -i ~/.config/configfiles/lockscreen.jpg' \
+          timeout 600 'swaymsg "output * dpms off"' \
+          resume 'swaymsg "output * dpms on"' \
+          before-sleep 'swaylock -f -c 000000 -i ~/.config/configfiles/lockscreen.jpg'
 
 ### Input configuration
 #
diff --git a/.config/waybar/config b/.config/waybar/config
index 215d60d..6b69da9 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -34,7 +34,7 @@
     }
   },
   "pulseaudio": {
-    "format": "{icon}      {volume}%",
+    "format": "{icon} {volume}%",
     "format-icons": {
       "default": ["\uf026", "\uf027", "\uf028"]
     },
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 72d4fd8..2cbbaa0 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,12 +1,106 @@
 @import "mocha.css";
 
 * {
-  /* reference the color by using @color-name */
-  color: @text;
+    border: none;
+    border-radius: 0;
+    font-family: "GoMono Nerd Font Propo";
+    font-size: 13px;
+    min-height: 0;
+    color: @text;
 }
 
 window#waybar {
-  /* you can also GTK3 CSS functions! */
-  background-color: shade(@base, 0.9);
-  border: 2px solid alpha(@crust, 0.3);
+    /*background: transparent;*/
+    color: white;
+    /* you can also GTK3 CSS functions! */
+    background-color: shade(@base, 0.9);
+    border: 2px solid alpha(@crust, 0.3);
+}
+
+#window {
+    font-weight: bold;
+    font-family: "GoMono Nerd Font Propo";
+}
+/*
+#workspaces {
+    padding: 0 5px;
+}
+*/
+
+#workspaces button {
+    padding: 0 5px;
+    background: transparent;
+    color: white;
+    border-top: 2px solid transparent;
+}
+
+#workspaces button.focused {
+    color: #c9545d;
+    border-top: 2px solid #c9545d;
+}
+
+#mode {
+    background: #64727D;
+    border-bottom: 3px solid white;
+}
+
+#clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode {
+    padding: 0 3px;
+    margin: 0 2px;
+}
+
+#clock {
+    font-weight: bold;
+}
+
+#battery {
+}
+
+#battery icon {
+    color: red;
+}
+
+#battery.charging {
+}
+
+@keyframes blink {
+    to {
+        background-color: #ffffff;
+        color: black;
+    }
+}
+
+#battery.warning:not(.charging) {
+    color: white;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#cpu {
+}
+
+#memory {
+}
+
+#network {
+}
+
+#network.disconnected {
+    background: #f53c3c;
+}
+
+#pulseaudio {
+}
+
+#pulseaudio.muted {
+}
+
+#custom-spotify {
+    color: rgb(102, 220, 105);
+}
+
+#tray {
 }