diff --git a/modules/home/programs/browsers/firefox/default.nix b/modules/home/programs/browsers/firefox/default.nix
index 0ccad97..fa8348f 100644
--- a/modules/home/programs/browsers/firefox/default.nix
+++ b/modules/home/programs/browsers/firefox/default.nix
@@ -47,6 +47,12 @@ in
             install_url = "https://gitflic.ru/project/magnolia1234/bpc_uploads/blob/raw?file=bypass_paywalls_clean-latest.xpi";
             installation_mode = "force_installed";
           };
+
+          # Ctrl+Number Tabs
+          "{84601290-bec9-494a-b11c-1baa897a9683}" = {
+            install_url = "https://addons.mozilla.org/firefox/downloads/latest/ctrl-number-to-switch-tabs/latest.xpi";
+            installation_mode = "force_installed";
+          };
         };
         Preferences = { };
       } "Policies to apply to firefox";
@@ -57,6 +63,7 @@ in
       (with pkgs.firefox-addons; [
         bitwarden
         darkreader
+        gruvbox-dark-theme
         kagi-search
         sponsorblock
         ublock-origin
diff --git a/modules/home/programs/ghostty/config/ghostty.conf b/modules/home/programs/ghostty/config/ghostty.conf
index 51140be..f8bd1cc 100755
--- a/modules/home/programs/ghostty/config/ghostty.conf
+++ b/modules/home/programs/ghostty/config/ghostty.conf
@@ -2,6 +2,31 @@ command = @BASH_PATH@ --login
 macos-titlebar-style = tabs
 auto-update = off
 font-family = "MesloLGM Nerd Font Mono"
+confirm-close-surface = true
+
+# Keybindings - Tabs & Splits
+keybind = ctrl+t=new_tab
+keybind = ctrl+w=close_surface
+keybind = ctrl+d=new_split:right
+keybind = ctrl+shift+d=new_split:down
+keybind = ctrl+enter=toggle_split_zoom
+
+# Keybindings - Navigation - Splits
+keybind = ctrl+left=goto_split:left
+keybind = ctrl+right=goto_split:right
+keybind = ctrl+up=goto_split:up
+keybind = ctrl+down=goto_split:down
+
+# Keybindings - Navigation - Tabs
+keybind = ctrl+1=goto_tab:1
+keybind = ctrl+2=goto_tab:2
+keybind = ctrl+3=goto_tab:3
+keybind = ctrl+4=goto_tab:4
+keybind = ctrl+5=goto_tab:5
+keybind = ctrl+6=goto_tab:6
+keybind = ctrl+7=goto_tab:7
+keybind = ctrl+8=goto_tab:8
+keybind = ctrl+9=goto_tab:9
 
 # Melange Dark - Adapted From: https://github.com/savq/melange-nvim/blob/master/term/kitty/melange_dark.conf
 palette = 0=#34302C
diff --git a/modules/home/programs/ghostty/default.nix b/modules/home/programs/ghostty/default.nix
index bc44452..6d025aa 100755
--- a/modules/home/programs/ghostty/default.nix
+++ b/modules/home/programs/ghostty/default.nix
@@ -19,6 +19,8 @@ in
       profileExtra = ''
         SHELL="$BASH"
         PATH=~/.bin:$PATH
+        VISUAL=vim
+        EDITOR="$VISUAL"
         eval "$(thefuck --alias)"
         set -o vi || true
         bind "set show-mode-in-prompt on"
diff --git a/modules/home/programs/hyprland/config/hyprland.conf b/modules/home/programs/hyprland/config/hyprland.conf
index 53c2a5d..64ea551 100755
--- a/modules/home/programs/hyprland/config/hyprland.conf
+++ b/modules/home/programs/hyprland/config/hyprland.conf
@@ -1,30 +1,10 @@
-
-# #######################################################################################
-# AUTOGENERATED HYPR CONFIG.
-# PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT,
-# OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS.
-# #######################################################################################
-
-# This is an example Hyprland config file.
-# Refer to the wiki for more information.
-# https://wiki.hyprland.org/Configuring/
-
-# Please note not all available settings / options are set here.
-# For a full list, see the wiki
-
-# You can split this configuration into multiple files
-# Create your files separately and then link them to this file like this:
-# source = ~/.config/hypr/myColors.conf
-
-
 ################
 ### MONITORS ###
 ################
 
 # See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=,highres,auto,1.5
-# monitor=HDMI-A-1,1920x1080,0x0,1
-
+monitor=,highres,auto,1.68 # 2
+debug:disable_scale_checks = true
 
 ###################
 ### MY PROGRAMS ###
diff --git a/modules/home/programs/hyprland/config/waybar-style.css b/modules/home/programs/hyprland/config/waybar-style.css
old mode 100755
new mode 100644
index 1a2fefa..6bdf0ea
--- a/modules/home/programs/hyprland/config/waybar-style.css
+++ b/modules/home/programs/hyprland/config/waybar-style.css
@@ -1,88 +1,122 @@
+@define-color rosewater #f5e0dc;
+@define-color flamingo #f2cdcd;
+@define-color pink #f5c2e7;
+@define-color mauve #cba6f7;
+@define-color red #f38ba8;
+@define-color maroon #eba0ac;
+@define-color peach #fab387;
+@define-color yellow #f9e2af;
+@define-color green #a6e3a1;
+@define-color teal #94e2d5;
+@define-color sky #89dceb;
+@define-color sapphire #74c7ec;
+@define-color blue #89b4fa;
+@define-color lavender #b4befe;
+@define-color text #cdd6f4;
+@define-color subtext1 #bac2de;
+@define-color subtext0 #a6adc8;
+@define-color overlay2 #9399b2;
+@define-color overlay1 #7f849c;
+@define-color overlay0 #6c7086;
+@define-color surface2 #585b70;
+@define-color surface1 #45475a;
+@define-color surface0 #313244;
+@define-color base #1e1e2e;
+@define-color mantle #181825;
+@define-color crust #11111b;
+
+/* Common Styles */
 * {
-  border: none;
-  border-radius: 0;
-  font-family:
-    Cartograph CF Nerd Font,
-    monospace;
-  font-weight: bold;
+  font-family: FantasqueSansMono Nerd Font;
   font-size: 14px;
   min-height: 0;
 }
 
-window#waybar {
-  background: rgba(21, 18, 27, 0);
-  color: #cdd6f4;
+/* Primary Waybar */
+#waybar {
+  background: transparent;
+  color: @text;
 }
 
-tooltip {
-}
-
-#workspaces button {
-}
-
-#workspaces button.active {
-  color: #9ccfd8;
-}
-
-#workspaces button.focused {
-  color: #9ccfd8;
-}
-
-#workspaces button.urgent {
-}
-
-#workspaces button:hover {
-}
-
-#custom-language,
-#custom-updates,
-#custom-caffeine,
-#custom-weather,
+/* Node Styles */
+#workspaces,
 #window,
-#clock,
+#cpu,
+#memory,
 #battery,
+#backlight,
 #pulseaudio,
 #network,
-#workspaces,
-#tray,
-#backlight {
-}
-
-#tray {
+#clock {
+  margin-top: 0.75rem;
+  padding: 0px 0.5rem;
+  background-color: @surface0;
 }
 
 #workspaces {
-}
-
-#custom-caffeine {
-}
-
-#custom-language {
-}
-
-#custom-updates {
+  margin-left: 1rem;
+  border-radius: 1rem;
+  padding: 0px;
+  background-color: @surface0;
 }
 
 #window {
+  background: transparent;
+  margin-left: 0.5rem;
+  margin-right: 8rem; /* Notch */
+}
+
+#workspaces button {
+  color: @lavender;
+  border-radius: 1rem;
+}
+
+#workspaces button.active {
+  color: @sky;
+  background-color: @surface2;
+  border-radius: 1rem;
+}
+
+#workspaces button:hover {
+  color: @sapphire;
+  border-radius: 1rem;
 }
 
 #clock {
+  color: @blue;
+  border-radius: 0px 1rem 1rem 0px;
+  margin-right: 1rem;
+}
+
+#memory {
+  color: @blue;
+  border-radius: 0px 1rem 1rem 0px;
+  margin-right: 0.5rem;
 }
 
 #network {
-}
-
-#pulseaudio {
-}
-
-#pulseaudio.microphone {
+  color: @mauve;
 }
 
 #battery {
+  color: @green;
 }
 
-#custom-weather {
+#battery.charging {
+  color: @green;
 }
 
-#custom-endright {
+#battery.warning:not(.charging) {
+  color: @red;
+}
+
+#backlight {
+  color: @yellow;
+}
+
+#pulseaudio,
+#cpu {
+  color: @maroon;
+  border-radius: 1rem 0px 0px 1rem;
+  margin-left: 0.5rem;
 }
diff --git a/modules/home/programs/hyprland/default.nix b/modules/home/programs/hyprland/default.nix
index 3130e16..17edc09 100755
--- a/modules/home/programs/hyprland/default.nix
+++ b/modules/home/programs/hyprland/default.nix
@@ -28,23 +28,17 @@ in
         height = 0;
         modules-left = [
           "hyprland/workspaces"
-          "custom/divider"
-          "custom/divider"
-          "cpu"
-          "custom/divider"
-          "memory"
+          "hyprland/window"
         ];
-        modules-center = [ "hyprland/window" ];
+        # modules-center = [ "hyprland/window" ];
         modules-right = [
+          "cpu"
+          "memory"
           "tray"
-          "network"
-          "custom/divider"
-          "backlight"
-          "custom/divider"
           "pulseaudio"
-          "custom/divider"
+          "backlight"
           "battery"
-          "custom/divider"
+          "network"
           "clock"
         ];
         "hyprland/window" = { format = "{}"; };
@@ -57,18 +51,18 @@ in
         battery = { format = "󰁹 {}%"; };
         cpu = {
           interval = 10;
-          format = "󰻠 {}%";
+          format = "󰻠  {}%";
           max-length = 10;
           on-click = "";
         };
         memory = {
           interval = 30;
-          format = "  {}%";
-          format-alt = " {used:0.1f}G";
+          format = "  {}%";
+          format-alt = "  {used:0.1f}G";
           max-length = 10;
         };
         backlight = {
-          format = "󰖨 {}";
+          format = "󰖨  {}%";
           device = "acpi_video0";
         };
         tray = {
@@ -77,19 +71,20 @@ in
           spacing = 10;
         };
         network = {
-          format = "󰖩 {essid}";
-          format-disconnected = "󰖪 disconnected";
+          format = "󰖩  {essid}";
+          format-disconnected = "󰖪  disconnected";
         };
         clock = {
-          format = " {:%I:%M %p   %m/%d} ";
+          format = "   {:%Y-%m-%d %H:%M:%S}";
+          interval = 1;
           tooltip-format = ''
             <big>{:%Y %B}</big>
             <tt><small>{calendar}</small></tt>'';
         };
         pulseaudio = {
-          format = "{icon} {volume}%";
+          format = "{icon}   {volume}%";
           tooltip = false;
-          format-muted = " Muted";
+          format-muted = "  Muted";
           on-click = "pamixer -t";
           on-scroll-up = "pamixer -i 5";
           on-scroll-down = "pamixer -d 5";
@@ -114,16 +109,6 @@ in
           on-scroll-down = "pamixer --default-source -d 5";
           scroll-step = 5;
         };
-        "custom/divider" = {
-          format = " | ";
-          interval = "once";
-          tooltip = false;
-        };
-        "custom/endright" = {
-          format = "_";
-          interval = "once";
-          tooltip = false;
-        };
       }];
     };
 
diff --git a/systems/aarch64-linux/mbp-nixos/default.nix b/systems/aarch64-linux/mbp-nixos/default.nix
index 76c3bcf..0d9238a 100755
--- a/systems/aarch64-linux/mbp-nixos/default.nix
+++ b/systems/aarch64-linux/mbp-nixos/default.nix
@@ -18,9 +18,12 @@
   };
 
   # Boot Loader Config
-  boot.loader = {
-    systemd-boot.enable = true;
-    efi.canTouchEfiVariables = false;
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = false;
+    };
+    kernelParams = [ "apple_dcp.show_notch=1" ];
   };
 
   # Networking Config