diff --git a/.envrc b/.envrc
index 3550a30..a0818f4 100644
--- a/.envrc
+++ b/.envrc
@@ -1 +1,2 @@
+# shellcheck disable=SC2148
 use flake
diff --git a/config/aerospace/aerospace.toml b/config/aerospace/aerospace.toml
index 05aa841..81c63e0 100644
--- a/config/aerospace/aerospace.toml
+++ b/config/aerospace/aerospace.toml
@@ -30,6 +30,7 @@ on-focus-changed = [
     alt-enter = 'exec-and-forget open -na Ghostty'
     alt-m = ['workspace 7', 'exec-and-forget open -na Ghostty --args --title="Music" -e /etc/profiles/per-user/rayandrew/bin/spotify_player']
 
+    alt-tab = 'workspace-back-and-forth'
     alt-h = 'focus --boundaries-action wrap-around-the-workspace left'
     alt-j = 'focus --boundaries-action wrap-around-the-workspace down'
     alt-k = 'focus --boundaries-action wrap-around-the-workspace up'
diff --git a/config/fish/config.fish b/config/fish/config.fish
index 4486bf1..3753bd1 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -4,7 +4,7 @@ function sesh-sessions
     set -l session (sesh list -t -c | fzf --height 40% --reverse --border-label ' sesh ' --border --prompt '⚡  ')
     commandline -f repaint
     if test -z "$session"
-       	return 
+        return
     end
     sesh connect $session
 end
@@ -29,18 +29,18 @@ function sesh-list
 	    --prompt '⚡  ')
     commandline -f repaint
     if test -z "$session"
-       	return 
+        return
     end
     sesh connect $session
 end
 
 function y
-  set tmp (mktemp -t "yazi-cwd.XXXXXX")
-  yazi $argv --cwd-file="$tmp"
-  if read -z cwd < "$tmp"; and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
-    builtin cd -- "$cwd"
-  end
-  rm -f -- "$tmp"
+    set tmp (mktemp -t "yazi-cwd.XXXXXX")
+    yazi $argv --cwd-file="$tmp"
+    if read -z cwd <"$tmp"; and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ]
+        builtin cd -- "$cwd"
+    end
+    rm -f -- "$tmp"
 end
 
 ###############
@@ -64,7 +64,7 @@ bind -M visual \cn down-or-search
 ## Sesh keybindings: keybinding: C-\
 if functions -q fish_vi_key_bindings
     bind -M default \x1c sesh-list
-    bind -M insert  \x1c sesh-list
+    bind -M insert \x1c sesh-list
 else
     bind \x1c sesh-list
 end
@@ -72,11 +72,9 @@ end
 # Keybinding: C-]
 if functions -q fish_vi_key_bindings
     bind -M default \c] sesh-sessions
-    bind -M insert  \c] sesh-sessions
+    bind -M insert \c] sesh-sessions
 else
     bind \c] sesh-sessions
 end
 
-
-
-alias vim "nvim"
+alias vim nvim
diff --git a/config/spotify-player/app.toml b/config/spotify-player/app.toml
index c08d9cf..a2a1d40 100644
--- a/config/spotify-player/app.toml
+++ b/config/spotify-player/app.toml
@@ -1,4 +1,4 @@
-theme = "dracula"
+theme = "noctis_azureus"
 client_port = 8080
 login_redirect_uri = "http://127.0.0.1:8989/login"
 playback_format = """
diff --git a/config/spotify-player/theme.toml b/config/spotify-player/theme.toml
new file mode 100644
index 0000000..3eb2996
--- /dev/null
+++ b/config/spotify-player/theme.toml
@@ -0,0 +1,290 @@
+# a theme based on the application's `default` theme
+[[themes]]
+name = "default2"
+[themes.palette]
+# default theme doesn't have `foreground` and `background` specified
+black = "black"
+red = "red"
+green = "green"
+yellow = "yellow"
+blue = "blue"
+magenta = "magenta"
+cyan = "cyan"
+white = "white"
+bright_black = "bright_black"
+bright_red = "bright_red"
+bright_green = "bright_green"
+bright_yellow = "bright_yellow"
+bright_blue = "bright_blue"
+bright_magenta = "bright_magenta"
+bright_cyan = "bright_cyan"
+bright_white = "bright_white"
+
+[[themes]]
+name = "dracula"
+[themes.palette]
+background = "#1e1f29"
+foreground = "#f8f8f2"
+black = "#000000"
+red = "#ff5555"
+green = "#50fa7b"
+yellow = "#f1fa8c"
+blue = "#bd93f9"
+magenta = "#ff79c6"
+cyan = "#8be9fd"
+white = "#bbbbbb"
+bright_black = "#555555"
+bright_red = "#ff5555"
+bright_green = "#50fa7b"
+bright_yellow = "#f1fa8c"
+bright_blue = "#bd93f9"
+bright_magenta = "#ff79c6"
+bright_cyan = "#8be9fd"
+bright_white = "#ffffff"
+
+# same colors as dracula, but includes non-default component styles
+[[themes]]
+name = "dracula2"
+[themes.palette]
+background = "#1e1f29"
+foreground = "#f8f8f2"
+black = "#000000"
+red = "#ff5555"
+green = "#50fa7b"
+yellow = "#f1fa8c"
+blue = "#bd93f9"
+magenta = "#ff79c6"
+cyan = "#8be9fd"
+white = "#bbbbbb"
+bright_black = "#555555"
+bright_red = "#ff5555"
+bright_green = "#50fa7b"
+bright_yellow = "#f1fa8c"
+bright_blue = "#bd93f9"
+bright_magenta = "#ff79c6"
+bright_cyan = "#8be9fd"
+bright_white = "#ffffff"
+[themes.component_style]
+like = { fg = "Red", modifiers = ["Bold"] }
+selection = { bg = "Black", fg = "White", modifiers = ["Bold"] }
+secondary_row = { bg = "#677075" }
+
+[[themes]]
+name = "gruvbox_dark"
+[themes.palette]
+background = "#282828"
+foreground = "#ebdbb2"
+black = "#282828"
+red = "#cc241d"
+green = "#98971a"
+yellow = "#d79921"
+blue = "#458588"
+magenta = "#b16286"
+cyan = "#689d6a"
+white = "#a89984"
+bright_black = "#928374"
+bright_red = "#fb4934"
+bright_green = "#b8bb26"
+bright_yellow = "#fabd2f"
+bright_blue = "#83a598"
+bright_magenta = "#d3869b"
+bright_cyan = "#8ec07c"
+bright_white = "#ebdbb2"
+
+[[themes]]
+name = "gruvbox_light"
+[themes.palette]
+background = "#fbf1c7"
+foreground = "#282828"
+black = "#fbf1c7"
+red = "#9d0006"
+green = "#79740e"
+yellow = "#b57614"
+blue = "#076678"
+magenta = "#8f3f71"
+cyan = "#427b58"
+white = "#3c3836"
+bright_black = "#9d8374"
+bright_red = "#cc241d"
+bright_green = "#98971a"
+bright_yellow = "#d79921"
+bright_blue = "#458588"
+bright_magenta = "#b16186"
+bright_cyan = "#689d69"
+bright_white = "#7c6f64"
+
+[[themes]]
+name = "solarized_dark"
+[themes.palette]
+background = "#002b36"
+foreground = "#839496"
+black = "#073642"
+red = "#dc322f"
+green = "#859900"
+yellow = "#b58900"
+blue = "#268bd2"
+magenta = "#d33682"
+cyan = "#2aa198"
+white = "#eee8d5"
+bright_black = "#002b36"
+bright_red = "#cb4b16"
+bright_green = "#586e75"
+bright_yellow = "#657b83"
+bright_blue = "#839496"
+bright_magenta = "#6c71c4"
+bright_cyan = "#93a1a1"
+bright_white = "#fdf6e3"
+
+[[themes]]
+name = "solarized_light"
+[themes.palette]
+background = "#fdf6e3"
+foreground = "#657b83"
+black = "#073642"
+red = "#dc322f"
+green = "#859900"
+yellow = "#b58900"
+blue = "#268bd2"
+magenta = "#d33682"
+cyan = "#2aa198"
+white = "#eee8d5"
+bright_black = "#002b36"
+bright_red = "#cb4b16"
+bright_green = "#586e75"
+bright_yellow = "#657b83"
+bright_blue = "#839496"
+bright_magenta = "#6c71c4"
+bright_cyan = "#93a1a1"
+bright_white = "#fdf6e3"
+
+[[themes]]
+name = "tokyonight"
+[themes.palette]
+background = "#1f2335"
+foreground = "#c0caf5"
+black = "#414868"
+red = "#f7768e"
+green = "#9ece6a"
+yellow = "#e0af68"
+blue = "#2ac3de"
+magenta = "#bb9af7"
+cyan = "#7dcfff"
+white = "#eee8d5"
+bright_black = "#24283b"
+bright_red = "#ff4499"
+bright_green = "#73daca"
+bright_yellow = "#657b83"
+bright_blue = "#839496"
+bright_magenta = "#ff007c"
+bright_cyan = "#93a1a1"
+bright_white = "#fdf6e3"
+
+[[themes]]
+name = "catppuccin_latte"
+[themes.palette]
+background = "#eff1f5"
+foreground = "#4c4f69"
+black = "#5c5f77"
+red = "#d20f39"
+green = "#40a02b"
+yellow = "#df8e1d"
+blue = "#1e66f5"
+magenta = "#ea76cb"
+cyan = "#179299"
+white = "#acb0be"
+bright_black = "#6c6f85"
+bright_red = "#de293e"
+bright_green = "#49af3d"
+bright_yellow = "#eea02d"
+bright_blue = "#456eff"
+bright_magenta = "#fe85d8"
+bright_cyan = "#2d9fa8"
+bright_white = "#bcc0cc"
+
+[[themes]]
+name = "catppuccin_frappe"
+[themes.palette]
+background = "#303446"
+foreground = "#c6d0f5"
+black = "#51576d"
+red = "#e78284"
+green = "#a6d189"
+yellow = "#e5c890"
+blue = "#8caaee"
+magenta = "#f4b8e4"
+cyan = "#81c8be"
+white = "#a5adce"
+bright_black = "#626880"
+bright_red = "#e67172"
+bright_green = "#8ec772"
+bright_yellow = "#d9ba73"
+bright_blue = "#7b9ef0"
+bright_magenta = "#f2a4db"
+bright_cyan = "#5abfb5"
+bright_white = "#b5bfe2"
+
+[[themes]]
+name = "catppuccin_macchiato"
+[themes.palette]
+background = "#24273a"
+foreground = "#cad3f5"
+black = "#494d64"
+red = "#ed8796"
+green = "#a6da95"
+yellow = "#eed49f"
+blue = "#8aadf4"
+magenta = "#f5bde6"
+cyan = "#8bd5ca"
+white = "#a5adcb"
+bright_black = "#5b6078"
+bright_red = "#ec7486"
+bright_green = "#8ccf7f"
+bright_yellow = "#e1c682"
+bright_blue = "#78a1f6"
+bright_magenta = "#f2a9dd"
+bright_cyan = "#63cbc0"
+bright_white = "#b8c0e0"
+
+[[themes]]
+name = "catppuccin_mocha"
+[themes.palette]
+background = "#1e1e2e"
+foreground = "#cdd6f4"
+black = "#45475a"
+red = "#f38ba8"
+green = "#a6e3a1"
+yellow = "#f9e2af"
+blue = "#89b4fa"
+magenta = "#f5c2e7"
+cyan = "#94e2d5"
+white = "#a6adc8"
+bright_black = "#585b70"
+bright_red = "#f37799"
+bright_green = "#89d88b"
+bright_yellow = "#ebd391"
+bright_blue = "#74a8fc"
+bright_magenta = "#f2aede"
+bright_cyan = "#6bd7ca"
+bright_white = "#bac2de"
+
+[[themes]]
+name = "noctis_azureus"
+[themes.palette]
+background = "#051b29"
+foreground = "#becfda"
+black = "#28353e"
+red = "#e66533"
+green = "#49e9a6"
+yellow = "#e4b781"
+blue = "#49ace9"
+magenta = "#df769b"
+cyan = "#49d6e9"
+white = "#aec3d0"
+bright_black = "#475e6c"
+bright_red = "#e97749"
+bright_green = "#60ebb1"
+bright_yellow = "#e69533"
+bright_blue = "#60b6eb"
+bright_magenta = "#df769b"
+bright_cyan = "#60dbeb"
+bright_white = "#becfda"
diff --git a/flake.nix b/flake.nix
index fbe1abd..0fb3d4e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -99,6 +99,8 @@
           programs.nixfmt.enable = true;
           programs.stylua.enable = true;
           programs.shfmt.enable = true;
+          programs.fish_indent.enable = true;
+          programs.shellcheck.enable = true;
           settings.global.excludes = [ "flake.lock" ];
         }
       );
diff --git a/home/i3/default.nix b/home/i3/default.nix
index 168316c..94eba5f 100644
--- a/home/i3/default.nix
+++ b/home/i3/default.nix
@@ -157,7 +157,8 @@
                   "Right" = "resize grow width 10 px or 10 ppt";
                   "Escape" = "mode default";
                   "Return" = "mode default";
-                } // exitMode;
+                }
+                // exitMode;
                 "${powerManagementMode}" = {
                   l = "mode default, exec loginctl lock-session";
                   e = "mode default, exec loginctl terminate-session $XDG_SESSION_ID";
@@ -165,11 +166,13 @@
                   h = "mode default, exec systemctl hibernate";
                   "Shift+r" = "mode default, exec systemctl reboot";
                   "Shift+s" = "mode default, exec systemctl poweroff";
-                } // exitMode;
+                }
+                // exitMode;
                 "${miscellaneousMode}" = {
                   p = "mode default, exec kill -SIGUSR1 $(pidof dunst)";
                   c = "mode default, exec kill -SIGUSR2 $(pidof dunst";
-                } // exitMode;
+                }
+                // exitMode;
               };
             startup = [
               {
diff --git a/packages/ps2pdfcrop/ps2pdfcrop.sh b/packages/ps2pdfcrop/ps2pdfcrop.sh
index ca8a6b3..e6351d6 100644
--- a/packages/ps2pdfcrop/ps2pdfcrop.sh
+++ b/packages/ps2pdfcrop/ps2pdfcrop.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# shellcheck disable=SC2068
+
 readonly PS2PDF=@ps2pdf@
 
 "$PS2PDF" -dEPSCrop -dALLOWPSTRANSPARENCY $@