diff --git a/aerc/aerc.conf b/aerc/aerc.conf
index 343d303..d0b6530 100644
--- a/aerc/aerc.conf
+++ b/aerc/aerc.conf
@@ -31,7 +31,6 @@ show-headers=false
 [compose]
 header-layout=To|From,Cc|Bcc,Subject
 editor=nvim
-reply-to-self=false
 address-book-cmd=khard email --parsable --remove-first-line %s
 
 [filters]
diff --git a/sway/config b/sway/config
index 412391a..d74dc4b 100644
--- a/sway/config
+++ b/sway/config
@@ -104,7 +104,7 @@ bindsym Ctrl+space exec makoctl dismiss
 bindsym Ctrl+Shift+space exec makoctl dismiss --all
 
 # Passmenu
-bindcode $mod+55 exec gopass ls --flat | bemenu -i -l 10 -m all -p Password: --fn "DejaVu Sans 12" | xargs --no-run-if-empty gopass show -c --nosync
+bindcode $mod+55 exec gopass ls --flat | bemenu -i -l 10 -m all -p Password: --fn "DejaVu Sans 12" | xargs --no-run-if-empty gopass show -c
 
 # Timew
 bindcode $mod+56 exec ~/.local/bin/timewmenu -i -l 10 -m all -p "Track:" --fn "DejaVu Sans 12"
@@ -156,7 +156,6 @@ bindcode $mod+Shift+55 mode "$mode_system"
 
 # Systemd environment
 exec "systemctl --user import-environment; systemctl --user start sway-session.target"
-exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
 
 # Input configuration
 input type:keyboard {
diff --git a/sway/yuki b/sway/yuki
index 40e9fac..db15906 100644
--- a/sway/yuki
+++ b/sway/yuki
@@ -1,6 +1,7 @@
 # Output configuration
 output * bg "~/.config/sway/bg.png" fill
-output DP-1 resolution 3840x2160 scale 1.5 position 0,0 color_profile icc "~/.config/sway/yuki.icc"
+output HDMI-A-1 position 0,0
+output DP-1 resolution 1920x1080 position 1920,0
 
 # Input configuration
 input type:pointer {
@@ -34,5 +35,5 @@ mode "$mode_audio" {
 }
 bindcode $mod+Shift+40 mode "$mode_audio"
 
-
-exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
+# Window rules
+floating_maximum_size 1024 x 768
diff --git a/systemd/user/swayidle.service b/systemd/user/swayidle.service
index edf0888..abbc2a7 100644
--- a/systemd/user/swayidle.service
+++ b/systemd/user/swayidle.service
@@ -6,10 +6,10 @@ PartOf=graphical-session.target
 [Service]
 Type=simple
 ExecStart=/usr/bin/swayidle -w \
-    timeout 600 'swaymsg "output * dpms off"' \
+    timeout 6000 'swaymsg "output * dpms off"' \
     resume 'swaymsg "output * dpms on"' \
-    lock 'gtklock -d --idle-hide --idle-timeout 5 --start-hidden' \
-    before-sleep 'gtklock -d --idle-hide --idle-timeout 5 --start-hidden'
+    lock 'swaylock -f -s center -i "~/.config/sway/lockscreen.png"' \
+    before-sleep 'swaylock -f -s center -i "~/.config/sway/lockscreen.png"'
 
 [Install]
 WantedBy=sway-session.target
diff --git a/waybar/config b/waybar/config
index 19c1c9e..081f058 100644
--- a/waybar/config
+++ b/waybar/config
@@ -3,7 +3,7 @@
     "position": "top",
     "height": 24,
     "modules-left": ["sway/workspaces", "sway/mode"],
-    "modules-center": ["cpu", "memory", "custom/solar", "tray"],
+    "modules-center": ["cpu", "memory", "tray"],
     "modules-right": ["custom/vpn", "custom/timew", "clock#time", "clock#date"],
     "sway/mode": {
         "format": "<span style=\"italic\">{}</span>"
@@ -19,12 +19,6 @@
         "format": " {:%H:%M}",
         "timezone": "Europe/Berlin"
     },
-    "custom/solar": {
-        "format": " {}",
-        "max-length": 20,
-        "interval": 20,
-        "exec": "curl http://dtu/api/livedata/status | jq -j '(.total.Power.v|round), \" \", .total.Power.u, \", \", .total.YieldDay.v, \" \", .total.YieldDay.u'"
-    },
     "clock#date": {
         "interval": 60,
         "format": " {:%d.%m.%Y}"
diff --git a/waybar/style.css b/waybar/style.css
index 3393558..606c6bd 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -39,7 +39,6 @@ window#waybar.hidden {
 #backlight,
 #network,
 #pulseaudio,
-#custom-solar,
 #custom-media,
 #custom-vpn,
 #custom-timew,