diff --git a/alacritty/.config/alacritty/alacritty.toml b/alacritty/.config/alacritty/alacritty.toml
index bfdc19b..62e8523 100644
--- a/alacritty/.config/alacritty/alacritty.toml
+++ b/alacritty/.config/alacritty/alacritty.toml
@@ -24,8 +24,8 @@ key = "F11"
 mods = "None"
 
 [env]
-TERM = "xterm-256color"
-
+TERM = "alacritty"
+LC_CTYPE = "en_US.UTF-8"
 
 # Catppuccin theme
 [colors.primary]
diff --git a/grub/catppuccin-mocha-grub-theme/background.png b/grub/catppuccin-mocha-grub-theme/background.png
new file mode 100644
index 0000000..c6eb605
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/background.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/font.pf2 b/grub/catppuccin-mocha-grub-theme/font.pf2
new file mode 100644
index 0000000..b87a776
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/font.pf2 differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/4MLinux.png b/grub/catppuccin-mocha-grub-theme/icons/4MLinux.png
new file mode 100644
index 0000000..0248eed
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/4MLinux.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/AlpineLinux.png b/grub/catppuccin-mocha-grub-theme/icons/AlpineLinux.png
new file mode 100644
index 0000000..845d452
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/AlpineLinux.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/Manjaro.i686.png b/grub/catppuccin-mocha-grub-theme/icons/Manjaro.i686.png
new file mode 100644
index 0000000..160dacd
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/Manjaro.i686.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/Manjaro.x86_64.png b/grub/catppuccin-mocha-grub-theme/icons/Manjaro.x86_64.png
new file mode 100644
index 0000000..160dacd
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/Manjaro.x86_64.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/SystemRescueCD.png b/grub/catppuccin-mocha-grub-theme/icons/SystemRescueCD.png
new file mode 100644
index 0000000..edf6b30
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/SystemRescueCD.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/android.png b/grub/catppuccin-mocha-grub-theme/icons/android.png
new file mode 100644
index 0000000..242455b
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/android.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/anonymous.png b/grub/catppuccin-mocha-grub-theme/icons/anonymous.png
new file mode 100644
index 0000000..ea608b6
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/anonymous.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/antergos.png b/grub/catppuccin-mocha-grub-theme/icons/antergos.png
new file mode 100644
index 0000000..f6cade3
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/antergos.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/arch.png b/grub/catppuccin-mocha-grub-theme/icons/arch.png
new file mode 100644
index 0000000..d376ba5
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/arch.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/archlinux.png b/grub/catppuccin-mocha-grub-theme/icons/archlinux.png
new file mode 100644
index 0000000..d376ba5
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/archlinux.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/arcolinux.png b/grub/catppuccin-mocha-grub-theme/icons/arcolinux.png
new file mode 100644
index 0000000..b12c621
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/arcolinux.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/artix.png b/grub/catppuccin-mocha-grub-theme/icons/artix.png
new file mode 100644
index 0000000..2f78ec1
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/artix.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/cachyos.png b/grub/catppuccin-mocha-grub-theme/icons/cachyos.png
new file mode 100644
index 0000000..5cf6819
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/cachyos.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/cancel.png b/grub/catppuccin-mocha-grub-theme/icons/cancel.png
new file mode 100644
index 0000000..255e201
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/cancel.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/chakra.png b/grub/catppuccin-mocha-grub-theme/icons/chakra.png
new file mode 100644
index 0000000..78ac022
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/chakra.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/debian.png b/grub/catppuccin-mocha-grub-theme/icons/debian.png
new file mode 100644
index 0000000..985af6b
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/debian.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/deepin.png b/grub/catppuccin-mocha-grub-theme/icons/deepin.png
new file mode 100644
index 0000000..df62b9a
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/deepin.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/devuan.png b/grub/catppuccin-mocha-grub-theme/icons/devuan.png
new file mode 100644
index 0000000..d7fdcd8
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/devuan.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/driver.png b/grub/catppuccin-mocha-grub-theme/icons/driver.png
new file mode 100644
index 0000000..1147d02
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/driver.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/edit.png b/grub/catppuccin-mocha-grub-theme/icons/edit.png
new file mode 100644
index 0000000..b1bdc02
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/edit.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/efi.png b/grub/catppuccin-mocha-grub-theme/icons/efi.png
new file mode 100644
index 0000000..29918f8
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/efi.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/elementary.png b/grub/catppuccin-mocha-grub-theme/icons/elementary.png
new file mode 100644
index 0000000..a6e3738
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/elementary.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/endeavouros.png b/grub/catppuccin-mocha-grub-theme/icons/endeavouros.png
new file mode 100644
index 0000000..b30bf70
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/endeavouros.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/fedora.png b/grub/catppuccin-mocha-grub-theme/icons/fedora.png
new file mode 100644
index 0000000..932f36a
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/fedora.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/find.efi.png b/grub/catppuccin-mocha-grub-theme/icons/find.efi.png
new file mode 100644
index 0000000..40d15d9
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/find.efi.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/find.none.png b/grub/catppuccin-mocha-grub-theme/icons/find.none.png
new file mode 100644
index 0000000..ea7cd4c
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/find.none.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/freebsd.png b/grub/catppuccin-mocha-grub-theme/icons/freebsd.png
new file mode 100644
index 0000000..19e20fc
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/freebsd.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/gentoo.png b/grub/catppuccin-mocha-grub-theme/icons/gentoo.png
new file mode 100644
index 0000000..e865944
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/gentoo.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/gnu-linux.png b/grub/catppuccin-mocha-grub-theme/icons/gnu-linux.png
new file mode 100644
index 0000000..f4bfcc0
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/gnu-linux.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/gpart.png b/grub/catppuccin-mocha-grub-theme/icons/gpart.png
new file mode 100644
index 0000000..eba4e36
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/gpart.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/haiku.png b/grub/catppuccin-mocha-grub-theme/icons/haiku.png
new file mode 100644
index 0000000..476d86b
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/haiku.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/help.png b/grub/catppuccin-mocha-grub-theme/icons/help.png
new file mode 100644
index 0000000..6bace79
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/help.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/kali.png b/grub/catppuccin-mocha-grub-theme/icons/kali.png
new file mode 100644
index 0000000..6264877
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/kali.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/kaos.png b/grub/catppuccin-mocha-grub-theme/icons/kaos.png
new file mode 100644
index 0000000..0a86340
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/kaos.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/kbd.png b/grub/catppuccin-mocha-grub-theme/icons/kbd.png
new file mode 100644
index 0000000..a07baf5
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/kbd.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/kernel.png b/grub/catppuccin-mocha-grub-theme/icons/kernel.png
new file mode 100644
index 0000000..b3dc406
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/kernel.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/korora.png b/grub/catppuccin-mocha-grub-theme/icons/korora.png
new file mode 100644
index 0000000..16c60f0
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/korora.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/kubuntu.png b/grub/catppuccin-mocha-grub-theme/icons/kubuntu.png
new file mode 100644
index 0000000..a72fff1
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/kubuntu.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/lang.png b/grub/catppuccin-mocha-grub-theme/icons/lang.png
new file mode 100644
index 0000000..217036b
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/lang.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/lfs.png b/grub/catppuccin-mocha-grub-theme/icons/lfs.png
new file mode 100644
index 0000000..f4bfcc0
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/lfs.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/linux.png b/grub/catppuccin-mocha-grub-theme/icons/linux.png
new file mode 100644
index 0000000..f4bfcc0
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/linux.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/linuxmint.png b/grub/catppuccin-mocha-grub-theme/icons/linuxmint.png
new file mode 100644
index 0000000..53982b1
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/linuxmint.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/lubuntu.png b/grub/catppuccin-mocha-grub-theme/icons/lubuntu.png
new file mode 100644
index 0000000..14a66ec
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/lubuntu.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/macosx.png b/grub/catppuccin-mocha-grub-theme/icons/macosx.png
new file mode 100644
index 0000000..fbf3dfa
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/macosx.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/mageia.png b/grub/catppuccin-mocha-grub-theme/icons/mageia.png
new file mode 100644
index 0000000..494baf7
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/mageia.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/manjaro.png b/grub/catppuccin-mocha-grub-theme/icons/manjaro.png
new file mode 100644
index 0000000..160dacd
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/manjaro.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/manjarolinux.png b/grub/catppuccin-mocha-grub-theme/icons/manjarolinux.png
new file mode 100644
index 0000000..160dacd
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/manjarolinux.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/memtest.png b/grub/catppuccin-mocha-grub-theme/icons/memtest.png
new file mode 100644
index 0000000..1147d02
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/memtest.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/mx-linux.png b/grub/catppuccin-mocha-grub-theme/icons/mx-linux.png
new file mode 100644
index 0000000..e47db84
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/mx-linux.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/neon.png b/grub/catppuccin-mocha-grub-theme/icons/neon.png
new file mode 100644
index 0000000..3a9df69
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/neon.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/nixos.png b/grub/catppuccin-mocha-grub-theme/icons/nixos.png
new file mode 100644
index 0000000..4e5ebb2
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/nixos.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/opensuse.png b/grub/catppuccin-mocha-grub-theme/icons/opensuse.png
new file mode 100644
index 0000000..b010020
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/opensuse.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/parrot.png b/grub/catppuccin-mocha-grub-theme/icons/parrot.png
new file mode 100644
index 0000000..862fb2d
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/parrot.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/pop-os.png b/grub/catppuccin-mocha-grub-theme/icons/pop-os.png
new file mode 100644
index 0000000..fa20d8a
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/pop-os.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/pop.png b/grub/catppuccin-mocha-grub-theme/icons/pop.png
new file mode 100644
index 0000000..fa20d8a
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/pop.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/recovery.png b/grub/catppuccin-mocha-grub-theme/icons/recovery.png
new file mode 100644
index 0000000..3e58156
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/recovery.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/regolith.png b/grub/catppuccin-mocha-grub-theme/icons/regolith.png
new file mode 100644
index 0000000..6fb578c
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/regolith.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/restart.png b/grub/catppuccin-mocha-grub-theme/icons/restart.png
new file mode 100644
index 0000000..366e359
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/restart.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/shutdown.png b/grub/catppuccin-mocha-grub-theme/icons/shutdown.png
new file mode 100644
index 0000000..3a5bb7c
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/shutdown.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/siduction.png b/grub/catppuccin-mocha-grub-theme/icons/siduction.png
new file mode 100644
index 0000000..dcc3b89
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/siduction.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/solus.png b/grub/catppuccin-mocha-grub-theme/icons/solus.png
new file mode 100644
index 0000000..3806d28
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/solus.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/steamos.png b/grub/catppuccin-mocha-grub-theme/icons/steamos.png
new file mode 100644
index 0000000..98d0f81
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/steamos.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/submenu.png b/grub/catppuccin-mocha-grub-theme/icons/submenu.png
new file mode 100644
index 0000000..2ed9ccc
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/submenu.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/type.png b/grub/catppuccin-mocha-grub-theme/icons/type.png
new file mode 100644
index 0000000..87e775c
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/type.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/tz.png b/grub/catppuccin-mocha-grub-theme/icons/tz.png
new file mode 100644
index 0000000..c375d8f
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/tz.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/ubuntu.png b/grub/catppuccin-mocha-grub-theme/icons/ubuntu.png
new file mode 100644
index 0000000..21d205b
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/ubuntu.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/unknown.png b/grub/catppuccin-mocha-grub-theme/icons/unknown.png
new file mode 100644
index 0000000..f4bfcc0
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/unknown.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/unset.png b/grub/catppuccin-mocha-grub-theme/icons/unset.png
new file mode 100644
index 0000000..889cf07
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/unset.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/void.png b/grub/catppuccin-mocha-grub-theme/icons/void.png
new file mode 100644
index 0000000..633a2f6
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/void.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/windows.png b/grub/catppuccin-mocha-grub-theme/icons/windows.png
new file mode 100644
index 0000000..640d43c
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/windows.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/windows11.png b/grub/catppuccin-mocha-grub-theme/icons/windows11.png
new file mode 100644
index 0000000..2289fe4
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/windows11.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/xubuntu.png b/grub/catppuccin-mocha-grub-theme/icons/xubuntu.png
new file mode 100644
index 0000000..b07b4ce
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/xubuntu.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/icons/zorin.png b/grub/catppuccin-mocha-grub-theme/icons/zorin.png
new file mode 100644
index 0000000..8bf7f35
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/icons/zorin.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/logo.png b/grub/catppuccin-mocha-grub-theme/logo.png
new file mode 100644
index 0000000..ef83a2e
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/logo.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/select_c.png b/grub/catppuccin-mocha-grub-theme/select_c.png
new file mode 100644
index 0000000..0275893
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/select_c.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/select_e.png b/grub/catppuccin-mocha-grub-theme/select_e.png
new file mode 100644
index 0000000..6eb93c9
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/select_e.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/select_w.png b/grub/catppuccin-mocha-grub-theme/select_w.png
new file mode 100644
index 0000000..ce7324a
Binary files /dev/null and b/grub/catppuccin-mocha-grub-theme/select_w.png differ
diff --git a/grub/catppuccin-mocha-grub-theme/theme.txt b/grub/catppuccin-mocha-grub-theme/theme.txt
new file mode 100644
index 0000000..84cb2c8
--- /dev/null
+++ b/grub/catppuccin-mocha-grub-theme/theme.txt
@@ -0,0 +1,50 @@
+# GRUB2 gfxmenu pop theme, based and inspired by Vimix and Dracula grub themes
+# Designed for any resolution
+
+# Global Property
+title-text: ""
+desktop-image: "background.png"
+desktop-image-scale-method: "stretch"
+desktop-color: "#1E1E2E"
+terminal-font: "Unifont Regular 16"
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
+# Logo image
++ image {
+	left = 50%-50
+	top = 50%-50
+    file = "logo.png"
+}
+
+# Show the boot menu
++ boot_menu {
+  left = 50%-240
+  top = 60%
+  width = 480
+  height = 30%
+  item_font = "Unifont Regular 16"
+  item_color = "#CDD6F4"
+  selected_item_color = "#CDD6F4"
+  icon_width = 32
+  icon_height = 32
+  item_icon_space = 20
+  item_height = 36
+  item_padding = 5
+  item_spacing = 10
+  selected_item_pixmap_style = "select_*.png"
+}
+
+# Show a countdown message using the label component
++ label {
+  top = 82%
+  left = 35%
+  width = 30%
+  align = "center"
+  id = "__timeout__"
+  text = "Booting in %d seconds"
+  color = "#CDD6F4"
+}
diff --git a/grub/tty.txt b/grub/tty.txt
new file mode 100644
index 0000000..1d876ad
--- /dev/null
+++ b/grub/tty.txt
@@ -0,0 +1 @@
+vt.default_red=30,243,166,249,137,245,148,186,88,243,166,249,137,245,148,166 vt.default_grn=30,139,227,226,180,194,226,194,91,139,227,226,180,194,226,173 vt.default_blu=46,168,161,175,250,231,213,222,112,168,161,175,250,231,213,200
diff --git a/niri/.config/niri/config.kdl b/niri/.config/niri/config.kdl
index efc3193..d5587fa 100644
--- a/niri/.config/niri/config.kdl
+++ b/niri/.config/niri/config.kdl
@@ -81,7 +81,7 @@ input {
 // Find more information on the wiki:
 // https://yalter.github.io/niri/Configuration:-Outputs
 // Remember to uncomment the node by removing "/-"!
-/-output "eDP-1" {
+output "eDP-1" {
     // Uncomment this line to disable this output.
     // off
 
@@ -91,10 +91,10 @@ input {
     // for the resolution.
     // If the mode is omitted altogether or is invalid, niri will pick one automatically.
     // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes.
-    mode "1920x1080@120.030"
+    mode "1920x1080@59.999"
 
     // You can use integer or fractional scale, for example use 1.5 for 150% scale.
-    scale 2
+    scale 1
 
     // Transform allows to rotate the output counter-clockwise, valid values are:
     // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270.
@@ -109,7 +109,7 @@ input {
     // so to put another output directly adjacent to it on the right, set its x to 1920.
     // If the position is unset or results in an overlap, the output is instead placed
     // automatically.
-    position x=1280 y=0
+    // position x=1280 y=0
 }
 
 // Settings that influence how windows are positioned and sized.
diff --git a/noctalia/.config/noctalia/settings.json b/noctalia/.config/noctalia/settings.json
index 0d2a82f..142dc47 100644
--- a/noctalia/.config/noctalia/settings.json
+++ b/noctalia/.config/noctalia/settings.json
@@ -6,13 +6,14 @@
         ],
         "position": "center",
         "sortByMostUsed": true,
+        "terminalCommand": "xterm -e",
         "useApp2Unit": false
     },
     "audio": {
         "cavaFrameRate": 60,
         "mprisBlacklist": [
         ],
-        "preferredPlayer": "",
+        "preferredPlayer": "spotify",
         "visualizerType": "linear",
         "volumeOverdrive": false,
         "volumeStep": 5
@@ -47,9 +48,11 @@
                 },
                 {
                     "autoHide": true,
+                    "colorizeIcons": false,
                     "id": "ActiveWindow",
                     "scrollingMode": "hover",
-                    "showIcon": true
+                    "showIcon": true,
+                    "width": 145
                 },
                 {
                     "autoHide": true,
@@ -65,6 +68,9 @@
                     "id": "ScreenRecorder"
                 },
                 {
+                    "blacklist": [
+                    ],
+                    "colorizeIcons": false,
                     "id": "Tray"
                 },
                 {
@@ -92,10 +98,11 @@
                     "id": "Brightness"
                 },
                 {
+                    "customFont": "",
                     "formatHorizontal": "HH:mm ddd, MMM dd",
                     "formatVertical": "HH mm - dd MM",
                     "id": "Clock",
-                    "useMonospacedFont": true,
+                    "useCustomFont": false,
                     "usePrimaryColor": true
                 },
                 {
@@ -112,17 +119,45 @@
     },
     "colorSchemes": {
         "darkMode": true,
+        "generateTemplatesForPredefined": true,
         "matugenSchemeType": "scheme-rainbow",
         "predefinedScheme": "Catppuccin",
         "useWallpaperColors": false
     },
+    "controlCenter": {
+        "position": "close_to_bar_button",
+        "quickSettingsStyle": "compact",
+        "widgets": {
+            "quickSettings": [
+                {
+                    "id": "WiFi"
+                },
+                {
+                    "id": "Bluetooth"
+                },
+                {
+                    "id": "Notifications"
+                },
+                {
+                    "id": "ScreenRecorder"
+                },
+                {
+                    "id": "PowerProfile"
+                },
+                {
+                    "id": "WallpaperSelector"
+                }
+            ]
+        }
+    },
     "dock": {
-        "autoHide": false,
         "backgroundOpacity": 1,
-        "exclusive": false,
+        "colorizeIcons": false,
+        "displayMode": "always_visible",
         "floatingRatio": 1,
         "monitors": [
         ],
+        "onlySameOutput": true,
         "pinnedApps": [
         ]
     },
@@ -130,6 +165,7 @@
         "animationDisabled": false,
         "animationSpeed": 1.1500000000000001,
         "avatarImage": "/home/foreverpyrite/Pictures/Pysprite/ForeverPyrite Head.png",
+        "compactLockScreen": false,
         "dimDesktop": true,
         "forceBlackScreenCorners": false,
         "radiusRatio": 1,
@@ -142,24 +178,11 @@
         "wallpaperChange": ""
     },
     "location": {
-        "name": "New York",
+        "name": "Dayton, OH",
         "showWeekNumberInCalendar": false,
         "use12hourFormat": false,
         "useFahrenheit": true
     },
-    "matugen": {
-        "enableUserTemplates": false,
-        "foot": false,
-        "fuzzel": false,
-        "ghostty": false,
-        "gtk3": false,
-        "gtk4": false,
-        "kitty": false,
-        "pywalfox": false,
-        "qt5": false,
-        "qt6": false,
-        "vesktop": false
-    },
     "network": {
         "wifiEnabled": true
     },
@@ -170,13 +193,13 @@
         "forced": true,
         "manualSunrise": "06:30",
         "manualSunset": "18:30",
-        "nightTemp": "4000"
+        "nightTemp": "3000"
     },
     "notifications": {
         "alwaysOnTop": false,
         "criticalUrgencyDuration": 15,
         "doNotDisturb": false,
-        "lastSeenTs": 1759199713000,
+        "lastSeenTs": 1759414853000,
         "location": "top_right",
         "lowUrgencyDuration": 3,
         "monitors": [
@@ -185,6 +208,7 @@
         "respectExpireTimeout": false
     },
     "osd": {
+        "alwaysOnTop": false,
         "autoHideMs": 2000,
         "enabled": true,
         "location": "top_right",
@@ -203,15 +227,36 @@
         "videoSource": "portal"
     },
     "settingsVersion": 12,
+    "templates": {
+        "discord": false,
+        "discord_armcord": false,
+        "discord_dorion": false,
+        "discord_equibop": false,
+        "discord_lightcord": false,
+        "discord_vesktop": false,
+        "discord_webcord": false,
+        "enableUserTemplates": false,
+        "foot": false,
+        "fuzzel": false,
+        "ghostty": false,
+        "gtk": false,
+        "kcolorscheme": false,
+        "kitty": false,
+        "pywalfox": false,
+        "qt": false
+    },
     "ui": {
-        "fontBillboard": "Inter",
         "fontDefault": "NimbusSansDOT Nerd Font",
+        "fontDefaultScale": 1,
         "fontFixed": "Hack Nerd Font Mono",
+        "fontFixedScale": 1,
         "idleInhibitorEnabled": false,
         "monitorsScaling": [
-        ]
+        ],
+        "tooltipsEnabled": true
     },
     "wallpaper": {
+        "defaultWallpaper": "/etc/xdg/quickshell/noctalia-shell/Assets/Wallpaper/noctalia.png",
         "directory": "/home/foreverpyrite/Pictures/Wallpapers",
         "enableMultiMonitorDirectories": false,
         "enabled": false,
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index 7a6f0d1..a5108bc 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -4,6 +4,10 @@ require("config.lazy")
 -- Unfortunately, the file paths are too long and break things
 vim.loader.enable(false)
 
+-- Colors for Neovide & Tmux
+vim.o.termguicolors = true
+vim.cmd("colorscheme catppuccin-mocha")
+
 -- Clipboard (hopefully, right now my clipboard provider is tmux ig so...)
 vim.o.clipboard = "unnamedplus"
 vim.api.nvim_set_keymap("", "<D-v>", "+p<CR>", { noremap = true, silent = true })
diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 5315136..2213e60 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -21,6 +21,12 @@ setw -g pane-base-index 1
 # Enable mouse mode (scrolling, pane selection)
 set -g mouse on
 
+# tmux-256color didn't seem to blow over well with many programs, including nvim
+set-option -sa terminal-features ',alacritty:RGB'
+set-option -ga terminal-features ",alacritty:usstyle"
+set-option -ga terminal-overrides ',alacritty:Tc'
+set -g default-terminal "alacritty"
+
 # --- Keybindings ---
 # More intuitive split keys (current path is preserved)
 bind | split-window -h -c "#{pane_current_path}"
diff --git a/xdg-desktop-portal/.config/xdg-desktop-portal/portals.conf b/xdg-desktop-portal/.config/xdg-desktop-portal/portals.conf
new file mode 100644
index 0000000..80d1469
--- /dev/null
+++ b/xdg-desktop-portal/.config/xdg-desktop-portal/portals.conf
@@ -0,0 +1,2 @@
+[preferred]
+default=gtk