diff --git a/nvim.lua/.config/nvim/lua/lualine_setup.lua b/nvim.lua/.config/nvim/lua/lualine_setup.lua
index 9bea4c0..8ceba41 100644
--- a/nvim.lua/.config/nvim/lua/lualine_setup.lua
+++ b/nvim.lua/.config/nvim/lua/lualine_setup.lua
@@ -4,7 +4,7 @@ vim.cmd([[set noshowmode]])
 return require('lualine').setup {
     options = {
         icons_enabled = true,
-        theme = '16color',
+        theme = 'everforest',
         section_separators = '',
         component_seaparators = '',
     }
diff --git a/nvim.lua/.config/nvim/lua/plugins.lua b/nvim.lua/.config/nvim/lua/plugins.lua
index dde90a9..6d2cce3 100644
--- a/nvim.lua/.config/nvim/lua/plugins.lua
+++ b/nvim.lua/.config/nvim/lua/plugins.lua
@@ -62,22 +62,13 @@ return require('packer').startup(function(use)
         end,
     }
 
-    -- use {
-    --     'sainnhe/everforest',
-    --     config = function()
-    --         vim.cmd([[
-    --         set termguicolors
-    --         let g:everforest_transparent_background = 2
-    --         colorscheme everforest
-    --         ]])
-    --     end,
-    -- }
     use {
-        'casonadams/walh',
+        'sainnhe/everforest',
         config = function()
             vim.cmd([[
-            set notermguicolors
-            colorscheme walh-default
+            set termguicolors
+            let g:everforest_transparent_background = 2
+            colorscheme everforest
             ]])
         end,
     }
@@ -136,7 +127,7 @@ return require('packer').startup(function(use)
             vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = 'Telescope live grep' })
             vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = 'Telescope find files' })
             vim.keymap.set('n', '<leader>fG', builtin.git_files, { desc = 'Telescope find git ls-files' })
-            vim.keymap.set('n', '<leader>b', builtin.buffers, { desc = 'Telescope buffers' })
+            vim.keymap.set('n', '<leader>fb', builtin.buffers, { desc = 'Telescope buffers' })
             vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = 'Telescope help tags' })
         end,
     }
diff --git a/sway/.config/i3status-rust/config.toml b/sway/.config/i3status-rust/config.toml
index b56486d..347bcf2 100644
--- a/sway/.config/i3status-rust/config.toml
+++ b/sway/.config/i3status-rust/config.toml
@@ -4,9 +4,6 @@ theme = "foot"
 [icons]
 icons = "material-nf"
 
-[[block]]
-block = "scratchpad"
-
 [[block]]
 block = "time"
 format = " $icon $timestamp.datetime(f:'%a %F %R', l:nl_NL) "
@@ -60,8 +57,7 @@ format = " $icon{ | $ip $ipv6 }"
 
 [[block]]
 block = "memory"
-warning_swap = 100.0
-critical_swap = 100.0
+format = " $icon $mem_used_percents "
 
 [[block]]
 block = "load"
diff --git a/sway/.config/kanshi/config b/sway/.config/kanshi/config
index 2e46355..0f3df43 100644
--- a/sway/.config/kanshi/config
+++ b/sway/.config/kanshi/config
@@ -10,5 +10,5 @@ profile {
 # Work
 profile {
     output eDP-1 enable position 0,1200 adaptive_sync on
-    output "Samsung Electric Company LF24T450G HNMTA01726" enable mode 1920x1200@74.939Hz position 0,0 adaptive_sync on
+    output "Samsung Electric Company LF24T450G HNMTA01726" enable mode 1920x1200@60Hz position 0,0 adaptive_sync on
 }
diff --git a/sway/.config/sway/colors/foot-colors b/sway/.config/sway/colors
similarity index 100%
rename from sway/.config/sway/colors/foot-colors
rename to sway/.config/sway/colors
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index ef5f24c..52eefd5 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -17,7 +17,6 @@ set $right l
 set $term foot
 set $floatterm foot -a floating-foot
 set $lock $HOME/.config/sway/lock.sh
-set $locknow $HOME/.config/sway/locknow.sh
 
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
@@ -25,15 +24,37 @@ set $locknow $HOME/.config/sway/locknow.sh
 set $menu rofi -show combi | xargs swaymsg exec --
 
 ### Output configuration
+#
+# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/)
+# output * bg /run/current-system/sw/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
 output * bg /home/0xa/Pictures/tiles/343.png tile
+# output * bg /home/grue/Pictures/paper.jpg fill
+# output * bg ./wall.jpg fill
 
-# screen lock
+#
+# Example configuration:
+#
+#   output HDMI-A-1 resolution 1920x1080 position 1920,0
+#
+# You can get the names of your outputs by running: swaymsg -t get_outputs
+
+### Idle configuration
+#
+# Example configuration:
+#
 exec swayidle -w \
          timeout 300 $lock \
          timeout 303 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
          before-sleep $lock
+#
+# This will lock your screen after 300 seconds of inactivity, then turn off
+# 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.
 
 ### Input configuration
+#
+# Example configuration:
+#
 input type:touchpad {
     accel_profile adaptive
     click_method clickfinger
@@ -49,6 +70,9 @@ input type:keyboard {
     xkb_layout "us,ru"
     xkb_options "caps:ctrl_modifier,grp:alt_space_toggle"
 }
+#
+# 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.
 
 focus_follows_mouse yes
 # mouse_warping container
@@ -101,7 +125,8 @@ seat * hide_cursor 5000
     bindsym --to-code $mod+Print exec 'grim -g "$(slurp)" ~/Pictures/$(date +"%Y-%m-%d-%H-%M-%S").png'
     bindsym --to-code $mod+Mod1+p exec 'grim -g "$(slurp)" ~/Pictures/$(date +"%Y-%m-%d-%H-%M-%S").png'
     # Notifications
-    bindsym --to-code $mod+m exec 'swaync-client -t'
+    bindsym --to-code $mod+m exec 'makoctl dismiss -a'
+    bindsym --to-code $mod+Shift+m exec 'makoctl restore'
     # Check mail
     bindsym --to-code $mod+n exec 'systemctl --user start mbsync.service'
 
@@ -273,7 +298,7 @@ mode "resize" {
 bindsym --to-code $mod+r mode "resize"
 
 ## Styling: colors
-include ./colors/foot-colors
+include colors
 
 ## Window styling
 #                       Border      BG          Text        Indicator   Child Border
@@ -309,8 +334,32 @@ font pango:Hack 9
 # Startup applications
 exec iwgtk -i
 exec blueman-applet
+# exec wlsunset -l 52 -L 5
+# exec gammastep-indicator
 exec_always pkill kanshi; exec kanshi
-exec swaync
+# exec udiskie --tray --no-automount
+
+# window rules
+# floating
+for_window [app_id="imv"] floating enable; border normal
+for_window [app_id="org.twosheds.iwgtk"] floating enable; border normal
+for_window [app_id=".blueman-manager-wrapped"] floating enable; border normal
+for_window [app_id="com.nextcloud.desktopclient.nextcloud"] floating enable; border normal
+
+# tabbed containers
+for_window [app_id="CubicSDR"] layout tabbed
+for_window [app_id="org.wireshark.Wireshark"] layout tabbed
+
+for_window [app_id="zoom" title="^zoom$"] border none, floating enable
+# For specific Zoom windows
+for_window [app_id="zoom" title="^(Zoom|About)$"] border pixel, floating enable
+for_window [app_id="zoom" title="Settings"] floating enable, floating_minimum_size 960 x 700
+# Open Zoom Meeting windows on a new workspace (a bit hacky)
+for_window [app_id="zoom" title="Zoom Meeting(.*)?"] workspace next_on_output --create, move container to workspace current, floating disable, inhibit_idle open
+# kill firefox sharing indicator
+for_window [app_id="firefox" title="Firefox — Sharing Indicator"] kill
+# fix picture-in-picture behaviour
+for_window [app_id="firefox" title="Picture-in-Picture"] floating enable, sticky enable, border none
 
 include ./config.d/*
 include /etc/sway/config.d/*
diff --git a/sway/.config/sway/config.d/window_overrides b/sway/.config/sway/config.d/window_overrides
deleted file mode 100644
index 640c88a..0000000
--- a/sway/.config/sway/config.d/window_overrides
+++ /dev/null
@@ -1,22 +0,0 @@
-# window rules
-# floating
-for_window [app_id="imv"] floating enable; border normal
-for_window [app_id="org.twosheds.iwgtk"] floating enable; border normal
-for_window [app_id=".blueman-manager-wrapped"] floating enable; border normal
-for_window [app_id="com.nextcloud.desktopclient.nextcloud"] floating enable; border normal
-
-# tabbed containers
-for_window [app_id="CubicSDR"] layout tabbed
-for_window [app_id="org.wireshark.Wireshark"] layout tabbed
-
-for_window [app_id="zoom" title="^zoom$"] border none, floating enable
-# For specific Zoom windows
-for_window [app_id="zoom" title="^(Zoom|About)$"] border pixel, floating enable
-for_window [app_id="zoom" title="Settings"] floating enable, floating_minimum_size 960 x 700
-# Open Zoom Meeting windows on a new workspace (a bit hacky)
-for_window [app_id="zoom" title="Zoom Meeting(.*)?"] workspace next_on_output --create, move container to workspace current, floating disable, inhibit_idle open
-# kill firefox sharing indicator
-for_window [app_id="firefox" title="Firefox — Sharing Indicator"] kill
-# fix picture-in-picture behaviour
-for_window [app_id="firefox" title="Picture-in-Picture"] floating enable, sticky enable
-
diff --git a/sway/.config/sway/wallpapers/ibm.jpg b/sway/.config/sway/ibm.jpg
similarity index 100%
rename from sway/.config/sway/wallpapers/ibm.jpg
rename to sway/.config/sway/ibm.jpg
diff --git a/sway/.config/sway/wallpapers/lock-fullhd.png b/sway/.config/sway/lock-fullhd.png
similarity index 100%
rename from sway/.config/sway/wallpapers/lock-fullhd.png
rename to sway/.config/sway/lock-fullhd.png
diff --git a/sway/.config/sway/wallpapers/lock-wuxga.png b/sway/.config/sway/lock-wuxga.png
similarity index 100%
rename from sway/.config/sway/wallpapers/lock-wuxga.png
rename to sway/.config/sway/lock-wuxga.png
diff --git a/sway/.config/sway/locknow.sh b/sway/.config/sway/locknow.sh
deleted file mode 100755
index e45f248..0000000
--- a/sway/.config/sway/locknow.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-swayidle -w \
-    timeout 1 'swaymsg "output * dpms off"' \
-    resume 'swaymsg "output * dpms on"' \
-    before-sleep '$HOME/.config/sway/lock.sh'
-
-pid=$!
-kill pid
diff --git a/sway/.config/sway/colors/moonfly b/sway/.config/sway/moonfly
similarity index 100%
rename from sway/.config/sway/colors/moonfly
rename to sway/.config/sway/moonfly
diff --git a/sway/.config/sway/wallpapers/wall.jpg b/sway/.config/sway/wall.jpg
similarity index 100%
rename from sway/.config/sway/wallpapers/wall.jpg
rename to sway/.config/sway/wall.jpg
diff --git a/sway/.config/swayimg/config b/sway/.config/swayimg/config
deleted file mode 100644
index a7b6e1a..0000000
--- a/sway/.config/swayimg/config
+++ /dev/null
@@ -1,105 +0,0 @@
-# https://git.deuill.org/deuill/dotfiles
-################################################################################
-# Viewer mode configuration
-################################################################################
-[viewer]
-# Window background color (RGBA)
-window = #00000000
-# Background for transparent images (grid/RGBA)
-transparency = grid
-# Default image scale (optimal/fit/width/height/fill/real)
-scale = optimal
-# Fix position of the image on the window surface (yes/no)
-fixed = yes
-# Anti-aliasing (yes/no)
-antialiasing = no
-# Run slideshow at startup (yes/no)
-slideshow = no
-# Slideshow image display time (seconds)
-slideshow_time = 3
-# Number of previously viewed images to store in cache
-history = 1
-# Number of preloaded images (read ahead)
-preload = 1
-
-################################################################################
-# Gallery mode configuration
-################################################################################
-[gallery]
-# Max size of the thumbnail (pixels)
-size = 300
-# Max number of thumbnails in cache, 0 to unlimit
-cache = 100
-# Fill the entire tile with thumbnail (yes/no)
-fill = yes
-# Use anti-aliasing for thumbnails (yes/no)
-antialiasing = no
-# Background color of the window (RGBA)
-window = #00000000
-# Background color of the tile (RGBA)
-background = #202020ff
-# Background color of the selected tile (RGBA)
-select = #333333ff
-# Border color of the selected tile (RGBA)
-border = #ab4642ff
-# Shadow color of the selected tile (RGBA)
-shadow = #00000000
-
-################################################################################
-# Font configuration
-################################################################################
-[font]
-# Font name
-name = Iosevka
-# Font size (pt)
-size = 18
-# Font color (RGBA)
-color = #fefefeff
-# Shadow color (RGBA)
-shadow = #333333ff
-
-################################################################################
-# Image meta info scheme (format, size, EXIF, etc)
-################################################################################
-
-# Display scheme for viewer mode (position = content)
-[info.viewer]
-top_left = +name,+format,+filesize,+imagesize,+exif
-top_right = index
-bottom_left = scale,frame
-bottom_right = status
-
-# Display scheme for gallery mode (position = content)
-[info.gallery]
-top_left = none
-top_right = none
-bottom_left = none
-bottom_right = name,status
-
-################################################################################
-# Viewer mode key binding configuration.
-################################################################################
-[keys.viewer]
-h = prev_file
-j = zoom -10
-k = zoom +10
-l = next_file
-
-Shift+h = prev_dir
-Shift+j = rotate_left
-Shift+k = rotate_right
-Shift+l = next_dir
-
-Alt+h = step_left 10
-Alt+j = step_down 10
-Alt+k = step_up 10
-Alt+l = step_right 10
-
-################################################################################
-# Gallery mode key binding configuration.
-################################################################################
-[keys.gallery]
-h = step_left
-j = step_down
-k = step_up
-l = step_right