diff --git a/dotfiles/system_All/config/alacritty/alacritty.yml b/dotfiles/system_All/config/alacritty/alacritty.yml
new file mode 100644
index 0000000..1488d08
--- /dev/null
+++ b/dotfiles/system_All/config/alacritty/alacritty.yml
@@ -0,0 +1,49 @@
+---
+
+window:
+  padding:
+    x: 10
+    y: 10
+
+scrolling:
+  # history: 262144  # 1024 * 256
+  history: 0
+
+font:
+  size: 12.0
+
+# Colors (Gruvbox dark)
+colors:
+  # Default colors
+  primary:
+    # hard contrast: background = "#1d2021"
+    background: "#282828"
+    # soft contrast: background = "#32302f"
+    foreground: "#ebdbb2"
+  # Normal colors
+  normal:
+    black:   "#282828"
+    red:     "#cc241d"
+    green:   "#98971a"
+    yellow:  "#d79921"
+    blue:    "#458588"
+    magenta: "#b16286"
+    cyan:    "#689d6a"
+    white:   "#a89984"
+  # Bright colors
+  bright:
+    black:   "#928374"
+    red:     "#fb4934"
+    green:   "#b8bb26"
+    yellow:  "#fabd2f"
+    blue:    "#83a598"
+    magenta: "#d3869b"
+    cyan:    "#8ec07c"
+    white:   "#ebdbb2"
+
+mouse:
+  url:
+    modifiers: "Control|Shift"
+
+mouse_bindings:
+ - { mouse: "Middle", action: "None" }
diff --git a/dotfiles/system_All/config/kitty/colorscheme.conf b/dotfiles/system_All/config/kitty/colorscheme.conf
deleted file mode 100644
index 7e8c258..0000000
--- a/dotfiles/system_All/config/kitty/colorscheme.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# gruvbox-dark colorscheme
-# Ref: https://gist.github.com/lunks/0d5731693084b2831c88ca23936d20e8
-
-foreground #ebdbb2
-background #272727
-selection_foreground #655b53
-selection_background #ebdbb2
-url_color #d65c0d
-
-# black
-color0 #272727
-color8 #928373
-
-# red
-color1 #cc231c
-color9 #fb4833
-
-# green
-color2 #989719
-color10 #b8ba25
-
-# yellow
-color3 #d79920
-color11 #fabc2e
-
-# blue
-color4 #448488
-color12 #83a597
-
-# magenta
-color5 #b16185
-color13 #d3859a
-
-# cyan
-color6 #689d69
-color14 #8ec07b
-
-# white
-color7 #a89983
-color15 #ebdbb2
diff --git a/dotfiles/system_All/config/kitty/kitty.conf b/dotfiles/system_All/config/kitty/kitty.conf
deleted file mode 100644
index a1f87d5..0000000
--- a/dotfiles/system_All/config/kitty/kitty.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-include ~/.config/kitty/colorscheme.conf
-
-active_tab_foreground #c78c1e
-active_tab_background #000617
-active_tab_font_style bold
-
-inactive_tab_foreground #d6d5c8
-inactive_tab_background #000617
-inactive_tab_font_style normal
-
-font_size 12.0
-
-mouse_hide_wait 0.0
-remember_window_size no
-# 👇 1024 * 256
-scrollback_lines 262144
-window_padding_width 4.0
-
-tab_bar_edge top
-tab_bar_style separator
-tab_separator " ┇ "
-
-# See: https://github.com/kovidgoyal/kitty/issues/747
-map kitty_mod+k combine : clear_terminal scrollback active : send_text normal,application \x0c
-
-include ~/.config/kitty/custom.conf
diff --git a/dotfiles/system_All/config/youtube-dl/config b/dotfiles/system_All/config/youtube-dl/config
index 6d1bff3..71ba21d 100644
--- a/dotfiles/system_All/config/youtube-dl/config
+++ b/dotfiles/system_All/config/youtube-dl/config
@@ -1,3 +1 @@
---external-downloader aria2c
---external-downloader-args '-c -x 5 -k 2M'
---format 'best[height<=1080]'
+# --format 'best[height<=1080]'
diff --git a/dotfiles/system_All/zsh/00.builtins.plugin.zsh b/dotfiles/system_All/zsh/00.misc.plugin.zsh
similarity index 66%
rename from dotfiles/system_All/zsh/00.builtins.plugin.zsh
rename to dotfiles/system_All/zsh/00.misc.plugin.zsh
index 909d0a4..b7285e9 100644
--- a/dotfiles/system_All/zsh/00.builtins.plugin.zsh
+++ b/dotfiles/system_All/zsh/00.misc.plugin.zsh
@@ -1,12 +1,14 @@
 # See: http://zsh.sourceforge.net/Doc/Release/Parameters.html
 #      http://zsh.sourceforge.net/Doc/Release/Options.html
-
-export HISTFILE="${HOME}/Sync/zhistory"
 export HISTSIZE=50000
 export SAVEHIST="${HISTSIZE}"
+export HISTFILE="${HOME}/Sync/zhistory"
 
-export VISUAL=vim
-
+# See: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_CONFIG_HOME="${HOME}/.config"
 export XDG_CACHE_HOME="${HOME}/.cache"
+
+# See: https://wiki.archlinux.org/index.php/Environment_variables
+export VISUAL=vim
+export EDITOR="${VISUAL}"
diff --git a/dotfiles/system_Darwin/config/kitty/custom.conf b/dotfiles/system_Darwin/config/kitty/custom.conf
deleted file mode 100644
index 0c735b4..0000000
--- a/dotfiles/system_Darwin/config/kitty/custom.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-font_family Hack
-
-macos_option_as_alt left
diff --git a/dotfiles/system_Linux/config/redshift/redshift.conf b/dotfiles/system_Linux/config/gammastep/redshift.conf
similarity index 89%
rename from dotfiles/system_Linux/config/redshift/redshift.conf
rename to dotfiles/system_Linux/config/gammastep/redshift.conf
index 297cc57..5bad92c 100644
--- a/dotfiles/system_Linux/config/redshift/redshift.conf
+++ b/dotfiles/system_Linux/config/gammastep/redshift.conf
@@ -1,4 +1,4 @@
-[redshift]
+[general]
 location-provider=manual
 temp-day=5500
 temp-night=2500
diff --git a/dotfiles/system_Linux/config/kitty/custom.conf b/dotfiles/system_Linux/config/kitty/custom.conf
deleted file mode 100644
index 096857e..0000000
--- a/dotfiles/system_Linux/config/kitty/custom.conf
+++ /dev/null
@@ -1 +0,0 @@
-font_family Monospace
diff --git a/dotfiles/system_Linux/config/mako/config b/dotfiles/system_Linux/config/mako/config
index ec65f44..0f24184 100644
--- a/dotfiles/system_Linux/config/mako/config
+++ b/dotfiles/system_Linux/config/mako/config
@@ -5,3 +5,4 @@ height=200
 border-color=#ebdbb2
 background-color=#1d2021
 text-color=#ebdbb2
+group-by=app-name,summary
diff --git a/dotfiles/system_Linux/config/sway/config b/dotfiles/system_Linux/config/sway/config
index 6a33039..87c4079 100644
--- a/dotfiles/system_Linux/config/sway/config
+++ b/dotfiles/system_Linux/config/sway/config
@@ -6,7 +6,7 @@ include ~/.config/sway/colorscheme
 set $mod  Mod4
 set $font Monospace 12
 set $menu rofi -show run
-set $term kitty
+set $term alacritty
 
 set $ws1 "01 "
 set $ws2 "02 "
@@ -154,7 +154,7 @@ exec_always dconf write /org/gtk/settings/file-chooser/sort-directories-first tr
 
 exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec mako
-exec redshift
+exec gammastep
 exec swayidle -w \
   timeout 300  'swaylock -f' \
   timeout 360  'swaymsg "output * dpms off"' \
diff --git a/dotfiles/system_Linux/config/sway/status.toml b/dotfiles/system_Linux/config/sway/status.toml
index 5ca9063..4549656 100644
--- a/dotfiles/system_Linux/config/sway/status.toml
+++ b/dotfiles/system_Linux/config/sway/status.toml
@@ -4,7 +4,6 @@ name = "gruvbox-dark"
 [icons]
 name = "awesome5"
 
-
 [[block]]
 block = "music"
 buttons = ["play", "next"]
@@ -26,6 +25,12 @@ format_swap = "{SUp}%"
 block = "cpu"
 interval = 2
 
+[[block]]
+block = "custom"
+command = ''' echo "{\"icon\":\"net_vpn\",\"state\":\"Info\",\"text\":\"$(curl -sS -m5 https://am.i.mullvad.net/country)\"}" '''
+json = true
+interval = 600
+
 [[block]]
 block = "net"
 interval = 2
diff --git a/dotfiles/system_Linux/config/swaylock/config b/dotfiles/system_Linux/config/swaylock/config
index 6287045..00f8345 100644
--- a/dotfiles/system_Linux/config/swaylock/config
+++ b/dotfiles/system_Linux/config/swaylock/config
@@ -6,6 +6,8 @@ show-failed-attempts
 indicator-radius=100
 indicator-thickness=25
 
+image=~/Pictures/swaylock5.jpg
+
 color=000000
 font=Monospace
 
diff --git a/dotfiles/system_Linux/packages/aur.txt b/dotfiles/system_Linux/packages/aur.txt
index 1a4159e..6424b56 100644
--- a/dotfiles/system_Linux/packages/aur.txt
+++ b/dotfiles/system_Linux/packages/aur.txt
@@ -3,11 +3,11 @@ clipman
 downgrade
 i3status-rust-git
 console-blanking
+gammastep
 kind-bin
 peco-bin
 pqiv
 qgnomeplatform
-redshift-wlr-gamma-control-git
 refind-theme-ambience-black-git
 tailscale
 yay-bin
diff --git a/dotfiles/system_Linux/packages/pacman.txt b/dotfiles/system_Linux/packages/pacman.txt
index e865488..8aba59b 100644
--- a/dotfiles/system_Linux/packages/pacman.txt
+++ b/dotfiles/system_Linux/packages/pacman.txt
@@ -1,3 +1,4 @@
+alacritty
 alsa-utils
 android-tools
 android-udev
@@ -10,7 +11,7 @@ base
 bat
 bbswitch-dkms
 beancount
-bind-tools
+bind
 blueberry
 bluez-utils
 bookworm
@@ -38,6 +39,7 @@ firefox
 firewalld
 fwupd
 gnome-themes-extra
+gopass
 gramps
 graphicsmagick
 graphviz
@@ -50,14 +52,15 @@ inetutils
 intel-compute-runtime
 intel-media-sdk
 intel-ucode
+intel-undervolt
 iotop
 ipcalc
 iperf3
 jdownloader2
 jre8-openjdk-headless
 keychain
-kitty
 kubectl
+kubectx
 kvantum-qt5
 libreoffice-fresh
 libva-intel-driver
@@ -94,12 +97,11 @@ noto-fonts-cjk
 obs-studio
 p7zip
 pacutils
-pass
 pavucontrol
 perl-image-exiftool
 perl-rename
-postgresql-libs
 polkit-gnome
+postgresql-libs
 powertop
 progress
 pulseaudio-alsa
@@ -139,6 +141,7 @@ vinagre
 virt-manager
 virtualbox
 wavemon
+wf-recorder
 wireguard-dkms
 wireguard-tools
 wireshark-qt