diff --git a/home/user/.config/i3blocks/config b/home/user/.config/i3blocks/config
index 58d4ec6..dd29e25 100644
--- a/home/user/.config/i3blocks/config
+++ b/home/user/.config/i3blocks/config
@@ -44,12 +44,12 @@ interval=30
 [volume]
 command=i3blocks_helper volume
 interval=1
-signal=10
+signal=3
 
 [pomodoro]
 command=i3blocks_helper pomodoro
 interval=1
-signal=10
+signal=2
 
 [language]
 command=i3blocks_helper language
diff --git a/home/user/.config/sway/autostart.conf b/home/user/.config/sway/autostart.conf
index 647f2aa..799e26d 100644
--- a/home/user/.config/sway/autostart.conf
+++ b/home/user/.config/sway/autostart.conf
@@ -8,4 +8,6 @@ exec swayidle -w \
 
 # Notifications
 #systemctl --user enable --now dbus.service
-exec --no-startup-id mako
+exec mako
+
+exec --no-startup-id pomodoro daemon
diff --git a/home/user/.config/sway/bindings.conf b/home/user/.config/sway/bindings.conf
index f990b8b..8cff27c 100644
--- a/home/user/.config/sway/bindings.conf
+++ b/home/user/.config/sway/bindings.conf
@@ -16,7 +16,7 @@ bindsym XF86MonBrightnessUp exec xbacklight -inc 20
 bindsym XF86MonBrightnessDown exec xbacklight -dec 20
 
 
-# bindsym $mod+p exec pomodoro toggle
+bindsym $mod+p exec pomodoro toggle && pkill -RTMIN+2 i3blocks
 
 bindsym $mod+z exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ 0                        ## Hold to talk
 bindsym --release $mod+z exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ 1              ## Release to mute
diff --git a/home/user/.config/zsh/.zprofile b/home/user/.config/zsh/.zprofile
index 70c6225..a26ef1d 100644
--- a/home/user/.config/zsh/.zprofile
+++ b/home/user/.config/zsh/.zprofile
@@ -4,15 +4,8 @@ if [[ "${TTY}" =~ /dev/tty* ]]; then
     setfont cyr-sun16
 fi
 
-if [ "${TTY}" = "/dev/tty1" ] && [ "${XDG_VTNR}" -eq 1 ] && [ -z "${DISPLAY}" ] && systemctl -q is-active graphical.target; then
-    x11_dir="${XDG_STATE_HOME:-${HOME}/.local/state}/x11"
-    mkdir -p "${x11_dir}"
-    exec startx >> "${x11_dir}/x11.log" 2>&1
-
+if [ "${TTY}" = "/dev/tty1" ] && [ -z "${WAYLAND_DISPLAY}" ] && [ -n "${XDG_VTNR}" ] && [ "${XDG_VTNR}" -eq 1 ] && systemctl -q is-active graphical.target; then
+    wayland_dir="${XDG_STATE_HOME:-${HOME}/.local/state}/wayland"
+    mkdir -p "${wayland_dir}"
+    exec sway >> "${wayland_dir}/sway.log" 2>&1
 fi
-
-# if [ "${TTY}" = "/dev/tty1" ] && [ -z "${WAYLAND_DISPLAY}" ] && [ -n "${XDG_VTNR}" ] && [ "${XDG_VTNR}" -eq 1 ] && systemctl -q is-active graphical.target; then
-#     wayland_dir="${XDG_STATE_HOME:-${HOME}/.local/state}/wayland"
-#     mkdir -p "${wayland_dir}"
-#     exec sway --unsupported-gpu >> "${wayland_dir}/sway.log" 2>&1
-# fi