diff --git a/.config/sway/config b/.config/sway/config
index b22be71..756419c 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -30,10 +30,11 @@ output * bg $HOME/.config/backgrounds/arch-blue-noise.jpg fill
 
 # You can get the names of your outputs by running: swaymsg -t get_outputs
 # Example configuration: output HDMI-A-1 resolution 1920x1080 position 1920,0
-# <displays>
+output eDP-1 res 1920x1080 pos 0 0
 
 # start applications
 exec nm-applet --indicator
+exec blueman-applet
 
 ### Idle configuration
 #
@@ -48,8 +49,10 @@ exec nm-applet --indicator
 # your displays after another 300 seconds, and turn your screens back on when
 # resumed. It will also lock your screen before your computer goes to sleep.
 exec swayidle -w \
-	timeout 60 'swaylock' \
-	timeout 120 'swaymsg "output * dpms off"' \
+	timeout 120 'swaylock' \
+	timeout 150 'swaymsg "output * dpms off"' \
+	resume 'swaymsg "output * dpms on"' \
+	timeout 60 'if pgrep swaylock; then swaymsg "output * dpms off"; fi' \
 	resume 'swaymsg "output * dpms on"' \
 	before-sleep 'swaylock'
 
@@ -67,6 +70,11 @@ exec swayidle -w \
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.
 
+input "1267:30:Elan_Touchpad" {
+  tap enabled
+  natural_scroll enabled
+}
+
 input "type:keyboard" {
     xkb_layout us,de
     xkb_options grp:win_space_toggle,terminate:ctrl_alt_bksp,caps:escape_shifted_capslock
@@ -88,6 +96,7 @@ input "type:keyboard" {
     # Program shortcuts
     bindsym $mod+Shift+t exec thunar
     bindsym $mod+Shift+b exec firefox
+    bindsym $mod+q exec swaylock
 
     # Screenshots
     bindsym $mod+Shift+s exec grim -g "$(slurp)" - | wl-copy
@@ -98,6 +107,9 @@ input "type:keyboard" {
     bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -10%
     bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +10%
     bindsym XF86AudioMicMute exec pactl set-source-mute @DEFAULT_SOURCE@ toggle
+    bindsym XF86MonBrightnessDown exec light -U 10
+    bindsym XF86MonBrightnessUp exec light -A 10
+    # wifi (XF86WLAN) works out of the box
 
     # Drag floating windows by holding down $mod and left mouse button.
     # Resize them with right mouse button + $mod.
diff --git a/.config/waybar/config b/.config/waybar/config
index 0bdb0e9..58ec2e6 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -7,13 +7,13 @@
     // Choose the order of the modules
     "modules-left": ["sway/workspaces", "sway/mode"],
     "modules-center": [],
-    "modules-right": ["network", "pulseaudio", "temperature", "cpu", "memory", "disk", "clock", "tray"],
+    "modules-right": ["network", "pulseaudio", "temperature", "cpu", "memory", "disk", "backlight", "battery", "clock", "tray"],
     "sway/workspaces": {
         "disable-scroll": true,
         "all-outputs": false,
         "format": "{name}",
         "persistent_workspaces": {
-            "1": []
+            "1": ["eDP-1"]
         }
     },
     "sway/mode": {
@@ -81,6 +81,36 @@
         "tooltip-format": "{path}: {used} of {total}",
         "interval": 60
     },
+    "backlight": {
+        "device": "intel-backlight",
+        "format": "{icon} {percent:2}%",
+        "states": {
+            "low": 0,
+            "medium": 40,
+            "bright": 80
+        },
+        "format-icons": ["", "", ""],
+        "on-scroll-up": "light -A 1",
+        "on-scroll-down": "light -U 1",
+        "interval": 60
+    },
+    "battery": {
+        "states": {
+            "critical": 0,
+            "warning": 15,
+            "low": 30,
+            "good": 50,
+            "full": 90
+        },
+        "format-time": "{H}:{M}h",
+        "format": "{icon} {capacity}% {time}",
+        "format-charging": " {capacity}% {time}",
+        "format-plugged": " {capacity}%",
+        "format-alt": "{capacity}%",
+        "format-icons": ["", "", "", "", ""],
+        "interval": 60,
+        "tooltip": true
+    },
     "clock": {
         "timezone": "Europe/Berlin",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index f0b404b..6d3bf1a 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -62,6 +62,8 @@ window#waybar.solo {
 #cpu,
 #memory,
 #disk,
+#backlight,
+#battery,
 #clock,
 #tray {
     padding: 0 5px;
@@ -123,6 +125,41 @@ window#waybar.solo {
     background-color: #2b2e39;
 }
 
+#backlight {
+    background-color: #3c414e;
+}
+
+#battery {
+    background-color: #2b2e39;
+}
+
+#battery.charging {
+    background-color: #498b12;
+}
+
+@keyframes blink {
+    to {
+        background-color: #ad1d82;
+    }
+}
+
+#battery.critical:not(.charging) {
+    background-color: #eb4d4b;
+    animation-name: blink;
+    animation-duration: 0.5s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+}
+
+#battery.warning:not(.charging) {
+    background-color: #a18d18;
+}
+
+#battery.full {
+    background-color: #498b12;
+}
+
 #clock {
     background-color: #3c414e;
 }