diff --git a/config/home/neovim.nix b/config/home/neovim.nix
index 010ad86..2f6f9e8 100644
--- a/config/home/neovim.nix
+++ b/config/home/neovim.nix
@@ -56,7 +56,6 @@ in {
 	  "<leader>lg" = "live_grep";
 	};
       };
-      neo-tree.enable = true;
       indent-blankline.enable = true;
       nvim-colorizer.enable = true;
       nvim-autopairs.enable = true;
@@ -115,6 +114,8 @@ in {
       };
     };
 
+    extraPlugins = [ plugins.telescope-file-browser-nvim ];
+
     # FOR NEOVIDE
     extraConfigLua = '' 
       vim.opt.guifont = "JetBrainsMono\\ NFM,Noto_Color_Emoji:h14"
@@ -187,9 +188,9 @@ in {
     keymaps = [
       {
         mode = "n";
-        key = "<leader>fb";
-        action = "<cmd>Neotree reveal right<CR>";
-        options.silent = false;
+        key = "<space>fb";
+        action = ":Telescope file_browser<CR>";
+        options.noremap = true;
       }
       {
         key = "<Tab>";
diff --git a/config/home/waybar.nix b/config/home/waybar.nix
index 1192a5b..bc53ba0 100644
--- a/config/home/waybar.nix
+++ b/config/home/waybar.nix
@@ -2,7 +2,7 @@
 
 let
   palette = config.colorScheme.palette;
-  inherit (import ../../options.nix) slickbar slickbar-num simplebar clock24h;
+  inherit (import ../../options.nix) slickbar bar-number simplebar clock24h;
 in with lib; {
   # Configure & Theme Waybar
   programs.waybar = {
@@ -12,16 +12,12 @@ in with lib; {
       layer = "top";
       position = "top";
 
-      modules-center = if simplebar == true then [ "hyprland/window" ] 
-      else [ "custom/hyprbindings" "pulseaudio" "cpu" "hyprland/workspaces" "memory" "disk" "clock" ];
-      modules-left = if simplebar == true then ["custom/startmenu" "hyprland/workspaces" "cpu" "memory" "custom/hyprbindings"  ]
-      else [ "custom/startmenu" "hyprland/window" ];
-      modules-right = if simplebar == true then [ "idle_inhibitor" "custom/themeselector" "custom/notification" "pulseaudio" "clock"  "tray" ]
-      else [ "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "battery" "tray" ];
+      modules-center = [ "hyprland/workspaces" ] ;
+      modules-left = [ "custom/startmenu" "hyprland/window" "pulseaudio" "cpu" "memory"];
+      modules-right = [ "custom/hyprbindings" "custom/exit" "idle_inhibitor" "custom/themeselector" "custom/notification" "pulseaudio" "clock"  "tray" ];
 
       "hyprland/workspaces" = {
-      	format = if simplebar == true ||
-		    slickbar-num == true then "{name}" else "{icon}";
+      	format = if bar-number == true then "{name}" else "{icon}";
       	format-icons = {
           default = " ";
           active = " ";
@@ -150,7 +146,7 @@ in with lib; {
     	font-weight: bold;
       }
       window#waybar {
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background-color: rgba(26,27,38,0);
 	  border-bottom: 1px solid rgba(26,27,38,0);
 	  border-radius: 0px;
@@ -168,7 +164,7 @@ in with lib; {
 	''}
       }
       #workspaces {
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: linear-gradient(180deg, #${palette.base00}, #${palette.base01});
 	  margin: 5px;
 	  padding: 0px 1px;
@@ -193,7 +189,7 @@ in with lib; {
 	''}
       }
       #workspaces button {
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  padding: 0px 5px;
 	  margin: 4px 3px;
 	  border-radius: 15px;
@@ -220,7 +216,7 @@ in with lib; {
 	''}
       }
       #workspaces button.active {
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  padding: 0px 5px;
 	  margin: 4px 3px;
 	  border-radius: 15px;
@@ -249,7 +245,7 @@ in with lib; {
 	''}
       }
       #workspaces button:hover {
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  border-radius: 15px;
 	  color: #${palette.base00};
 	  background: linear-gradient(45deg, #${palette.base0D}, #${palette.base0E});
@@ -276,7 +272,7 @@ in with lib; {
 	color: #${palette.base07};
       }
       #window {
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  color: #${palette.base05};
 	  background: #${palette.base00};
 	  border-radius: 50px 15px 50px 15px;
@@ -296,7 +292,7 @@ in with lib; {
       }
       #memory {
    	color: #${palette.base0F};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 15px 50px 15px 50px;
 	  margin: 5px;
@@ -314,7 +310,7 @@ in with lib; {
       }
       #clock {
     	color: #${palette.base0B};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 15px 50px 15px 50px;
 	  margin: 5px;
@@ -332,7 +328,7 @@ in with lib; {
       }
       #idle_inhibitor {
     	color: #${palette.base0A};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 50px 15px 50px 15px;
 	  margin: 5px;
@@ -350,7 +346,7 @@ in with lib; {
       }
       #cpu {
     	color: #${palette.base07};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 50px 15px 50px 15px;
 	  margin: 5px;
@@ -368,7 +364,7 @@ in with lib; {
       }
       #disk {
     	color: #${palette.base03};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 15px 50px 15px 50px;
 	  margin: 5px;
@@ -386,7 +382,7 @@ in with lib; {
       }
       #battery {
     	color: #${palette.base08};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 15px 50px 15px 50px;
 	  margin: 5px;
@@ -404,7 +400,7 @@ in with lib; {
       }
       #network {
     	color: #${palette.base09};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 50px 15px 50px 15px;
 	  margin: 5px;
@@ -422,7 +418,7 @@ in with lib; {
       }
       #custom-hyprbindings {
     	color: #${palette.base0E};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 50px 15px 50px 15px;
 	  margin: 5px;
@@ -440,7 +436,7 @@ in with lib; {
       }
       #tray {
     	color: #${palette.base05};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 15px 0px 0px 50px;
 	  margin: 5px 0px 5px 5px;
@@ -458,7 +454,7 @@ in with lib; {
       }
       #pulseaudio {
     	color: #${palette.base0D};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 50px 15px 50px 15px;
 	  margin: 5px;
@@ -476,7 +472,7 @@ in with lib; {
       }
       #custom-notification {
     	color: #${palette.base0C};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 15px 50px 15px 50px;
 	  margin: 5px;
@@ -494,7 +490,7 @@ in with lib; {
       }
       #custom-themeselector {
     	color: #${palette.base0D};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 15px 50px 15px 50px;
 	  margin: 5px;
@@ -512,7 +508,7 @@ in with lib; {
       }
       #custom-startmenu {
     	color: #${palette.base03};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 0px 15px 50px 0px;
 	  margin: 5px 5px 5px 0px;
@@ -530,7 +526,7 @@ in with lib; {
       }
       #idle_inhibitor {
     	color: #${palette.base09};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 15px 50px 15px 50px;
 	  margin: 5px;
@@ -548,7 +544,7 @@ in with lib; {
       }
       #custom-exit {
     	color: #${palette.base0E};
-	${if slickbar == true || slickbar-num == true then ''
+	${if slickbar == true then ''
 	  background: #${palette.base00};
 	  border-radius: 15px 50px 15px 50px;
 	  margin: 5px;
diff --git a/config/home/zsh.nix b/config/home/zsh.nix
index a31cf97..66649f9 100644
--- a/config/home/zsh.nix
+++ b/config/home/zsh.nix
@@ -44,7 +44,7 @@ lib.mkIf (theShell == "zsh") {
 
     };
     shellAliases = {
-      sv="sudo vim";
+      sv="sudo nvim";
       flake-rebuild="nh os switch --nom --hostname ${hostname}";
       flake-update="nh os switch --nom --hostname ${hostname} --update";
       gcCleanup="nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot";
diff --git a/options.nix b/options.nix
index 768712d..042db8a 100644
--- a/options.nix
+++ b/options.nix
@@ -8,7 +8,7 @@ let
   hostname = "hyprnix";
   userHome = "/home/${username}";
   flakeDir = "${userHome}/zaneyos";
-  waybarStyle = "default"; # simplebar, slickbar, slickbar-num, or default
+  waybarStyle = "default"; # simplebar, slickbar, or default
 in {
   # User Variables
   username = "${username}";
@@ -17,8 +17,8 @@ in {
   gitEmail = "tylerzanekelley@gmail.com";
   theme = "gigavolt";
   slickbar = if waybarStyle == "slickbar" then true else false;
-  slickbar-num = if waybarStyle == "slickbar-num" then true else false;
   simplebar = if waybarStyle == "simplebar" then true else false;
+  bar-number = false; # Enable / Disable Workspace Numbers In Waybar
   borderAnim = true;
   browser = "firefox";
   wallpaperGit = "https://gitlab.com/Zaney/my-wallpapers.git"; # This will give you my wallpapers
@@ -28,7 +28,7 @@ in {
   flakeDir = "${flakeDir}";
   flakePrev = "${userHome}/.zaneyos-previous";
   flakeBackup = "${userHome}/.zaneyos-backup";
-  terminal = "wezterm"; # This sets the terminal that is used by the hyprland terminal keybinding
+  terminal = "kitty"; # This sets the terminal that is used by the hyprland terminal keybinding
 
   # System Settings
   clock24h = false;
@@ -38,7 +38,7 @@ in {
   theKBDVariant = "";
   theLCVariables = "en_US.UTF-8";
   theTimezone = "America/Chicago";
-  theShell = "zsh"; # Possible options: bash, zsh
+  theShell = "bash"; # Possible options: bash, zsh
   theKernel = "zen"; # Possible options: default, latest, lqx, xanmod, zen
   sdl-videodriver = "x11"; # Either x11 or wayland ONLY. Games might require x11 set here
   # For Hybrid Systems intel-nvidia
@@ -78,7 +78,7 @@ in {
   # If You Disable All You Get Kitty
   wezterm = true;
   alacritty = false;
-  kitty = false;
+  kitty = true;
 
   # Enable Python & PyCharm
   python = false;