diff --git a/.config/sway/config.d/10-variables.conf b/.config/sway/config.d/10-variables.conf
index 7697ae9..f2d4c4b 100644
--- a/.config/sway/config.d/10-variables.conf
+++ b/.config/sway/config.d/10-variables.conf
@@ -6,7 +6,7 @@ set $up j
 set $right l
 
 set $menu               dmenu_path | dmenu | xargs swaymsg exec --
-set $term               alacritty
+set $term               kitty
 set $browser            firefox
 set $files              pcmanfm
 set $wallpapers         $HOME/.config/wallpapers
diff --git a/.config/sway/config.d/30-startup.conf b/.config/sway/config.d/30-startup.conf
index f2a26bc..252e0b0 100644
--- a/.config/sway/config.d/30-startup.conf
+++ b/.config/sway/config.d/30-startup.conf
@@ -1,26 +1,17 @@
 # fix slow startup time
 exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
 
-# Lock after $screen_timeout
-# Turn off screen after $screem_timeout - 10
+# Turn off screen after $screen_timeout
+# Lock after $screen_timeout + 10s
 # Lock if screen off
-exec swayidle -w \
-         timeout $(($screen_timeout + 10)) "$lock"              \
-         timeout $screen_timeout 'swaymsg "output * dpms off"'  \
-                          resume 'swaymsg "output * dpms on"'   \
-         before-sleep "$lock"
-
-# GTK theme
-exec gsettings set org.gnome.desktop.interface gtk-theme "Materia-dark"
-exec gsettings set org.gnome.desktop.interface icon-theme "Papirus-Dark"
+exec swayidle -w                                           \
+    timeout $(($screen_timeout + 10)) "$lock"              \
+    timeout $screen_timeout 'swaymsg "output * dpms off"'  \
+                     resume 'swaymsg "output * dpms on"'   \
+    before-sleep "$lock"
 
 bar swaybar_command waybar
 
-exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-#exec swayidle -w \
-#         timeout $(($screen_timeout + 10)) $lock                \
-#         timeout $screen_timeout 'swaymsg "output * dpms off"'  \
-#                          resume 'swaymsg "output * dpms on"'   \
-#         before-sleep $lock
+exec /usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1
 exec gammastep
 exec nm-applet --indicator
diff --git a/.config/waybar/config b/.config/waybar/config
index d9616d6..10a38ee 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,7 +1,8 @@
 {
     "modules-left": ["sway/workspaces"],
     "modules-center": ["sway/window"],
-    "modules-right": ["pulseaudio", "cpu", "memory", "temperature", "backlight", "battery", "tray", "clock"],
+    //"modules-right": ["pulseaudio", "cpu", "memory", "temperature", "backlight", "battery", "tray", "clock"],
+    "modules-right": ["pulseaudio", "cpu", "memory", "temperature", "backlight", "battery", "tray", "custom/clock"],
     "backlight": {
         "format": "{percent}% {icon}",
         "format-icons": ["", ""],
@@ -20,9 +21,13 @@
         "format-alt": "{time} {icon}",
         "format-icons": ["", "", "", "", ""],
     },
-    "clock": {
-        "format": "{:%a %b %d, %R}",
-        "tooltip-format": "<tt>{calendar}</tt>",
+    //"clock": {
+    //    "format": "{:%a %b %d, %R}",
+    //    "tooltip-format": "<tt>{calendar}</tt>",
+    //},
+    "custom/clock": {
+        "exec": "date '+%a %b %d, %R'",
+        "interval": 5,
     },
     "cpu": {
         "format": "{usage}% ",
@@ -54,8 +59,8 @@
             "default": ["", "", ""],
         },
         "on-click": "pavucontrol",
-        "on-scroll-up": "set-vol +2",
-        "on-scroll-down": "set-vol -2",
+        "on-scroll-up": "set-vol +5",
+        "on-scroll-down": "set-vol -5",
         "smooth-scrolling-threshold": 1,
     },
     "temperature": {
diff --git a/.config/zsh/.p10k.zsh b/.config/zsh/.p10k.zsh
index dc15cc7..c49c54f 100644
--- a/.config/zsh/.p10k.zsh
+++ b/.config/zsh/.p10k.zsh
@@ -985,7 +985,7 @@
   typeset -g POWERLEVEL9K_PYENV_SOURCES=(shell local global)
   # If set to false, hide python version if it's the same as global:
   # $(pyenv version-name) == $(pyenv global).
-  typeset -g POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW=false
+  typeset -g POWERLEVEL9K_PYENV_PROMPT_ALWAYS_SHOW=true
   # If set to false, hide python version if it's equal to "system".
   typeset -g POWERLEVEL9K_PYENV_SHOW_SYSTEM=true
 
diff --git a/.xinitrc b/.xinitrc
index c84537f..3d8f6b6 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,6 +1,10 @@
 #!/bin/sh
 
-xrandr \
-    --output HDMI-2 --auto --primary
+xrandr                               \
+    --output HDMI-2 --auto --primary \
     --output eDP-1 --left-of HDMI-2
+
+# fix touchscreen
+xinput --map-to-output 'Raydium Corporation Raydium Touch System' 'eDP-1'
+
 exec x-window-manager
diff --git a/bin/set-light b/bin/set-light
index d95a265..527c75f 100755
--- a/bin/set-light
+++ b/bin/set-light
@@ -5,8 +5,10 @@ shopt -s extglob nullglob
 set_brightness() {
     MAX="$(cat "$1"/max_brightness)"
     FILE="$1"/brightness
-    VAL="$(($2 * MAX / 100))"
+    VAL="$(($2 * MAX / 100 + 1))"
 
+    [ "$VAL" -lt 0 ] && VAL=0
+    [ "$VAL" -gt "$MAX" ] && VAL="$MAX"
     echo "$VAL" > "$FILE"
 }