diff --git a/config/waybar.nix b/config/waybar.nix
index b37ae3e..78e505a 100644
--- a/config/waybar.nix
+++ b/config/waybar.nix
@@ -31,13 +31,12 @@ with lib;
         ];
         modules-right = [
           "custom/hyprbindings"
-          "custom/exit"
           "idle_inhibitor"
           "custom/themeselector"
           "custom/notification"
           "battery"
-          "clock"
           "tray"
+          "clock"
         ];
 
         "hyprland/workspaces" = {
@@ -126,7 +125,7 @@ with lib;
         };
         "custom/startmenu" = {
           tooltip = false;
-          format = " ";
+          format = "";
           # exec = "rofi -show drun";
           on-click = "sleep 0.1 && rofi-launcher";
         };
@@ -189,231 +188,147 @@ with lib;
     ];
     style = concatStrings [
       ''
-              * {
-        	    font-size: 16px;
-        	    font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
-            	font-weight: bold;
-              }
-              window#waybar {
-        	    background-color: #${palette.base00};
-        	    border-bottom: 1px solid rgba(26,27,38,0);
-        	    border-radius: 0px;
-        	    color: #${palette.base0F};
-              }
-              #workspaces {
-        	    background: #${palette.base01};
-        	    margin: 2px;
-        	    padding: 0px 1px;
-        	    border-radius: 15px;
-        	    border: 0px;
-        	    font-style: normal;
-        	    color: #${palette.base00};
-              }
-              #workspaces button {
-        	    padding: 0px 5px;
-        	    margin: 4px 3px;
-        	    border-radius: 10px;
-        	    border: 0px;
-        	    color: #${palette.base00};
-                background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
-                background-size: 300% 300%;
-                ${
-                  if waybarAnimations == true then
-                    ''
-                      animation: gradient_horizontal 15s ease infinite;
-                    ''
-                  else
-                    ''''
-                }
-        	    opacity: 0.5;
-                transition: ${betterTransition};
-              }
-              #workspaces button.active {
-        	    padding: 0px 5px;
-        	    margin: 4px 3px;
-        	    border-radius: 10px;
-        	    border: 0px;
-        	    color: #${palette.base00};
-                background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
-                background-size: 300% 300%;
-                ${
-                  if waybarAnimations == true then
-                    ''
-                      animation: gradient_horizontal 15s ease infinite;
-                    ''
-                  else
-                    ''''
-                }
-                transition: ${betterTransition};
-        	    opacity: 1.0;
-        	    min-width: 40px;
-              }
-              #workspaces button:hover {
-        	    border-radius: 10px;
-        	    color: #${palette.base00};
-                background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
-                background-size: 300% 300%;
-                ${
-                  if waybarAnimations == true then
-                    ''
-                      animation: gradient_horizontal 15s ease infinite;
-                    ''
-                  else
-                    ''''
-                }
-        	    opacity: 0.8;
-                transition: ${betterTransition};
-              }
-              @keyframes gradient_horizontal {
-        	    0% {
-        	      background-position: 0% 50%;
-        	    }
-        	    50% {
-        	      background-position: 100% 50%;
-        	    }
-        	    100% {
-        	      background-position: 0% 50%;
-        	    }
-              }
-              @keyframes swiping {
-                0% {
-        	      background-position: 0% 200%;
-        	    }
-        	    100% {
-        	      background-position: 200% 200%;
-        	    }
-              }
-              tooltip {
-        	    background: #${palette.base00};
-            	border: 1px solid #${palette.base0E};
-            	border-radius: 10px;
-              }
-              tooltip label {
-        	    color: #${palette.base07};
-              }
-              #window {
-        	    margin: 4px;
-        	    padding: 2px 10px;
-        	    color: #${palette.base05};
-        	    background: #${palette.base01};
-        	    border-radius: 10px;
-              }
-              #memory {
-               	color: #${palette.base0F};
-            	background: #${palette.base01};
-            	margin: 4px;
-            	padding: 2px 10px;
-            	border-radius: 10px;
-              }
-              #clock {
-            	color: #${palette.base01};
-                background: linear-gradient(45deg, #${palette.base0C}, #${palette.base0F}, #${palette.base0B}, #${palette.base08});
-                background-size: 300% 300%;
-                ${
-                  if waybarAnimations == true then
-                    ''
-                      animation: gradient_horizontal 15s ease infinite;
-                    ''
-                  else
-                    ''''
-                }
-            	margin: 4px;
-            	padding: 2px 10px;
-            	border-radius: 10px;
-              }
-              #cpu {
-            	color: #${palette.base07};
-            	background: #${palette.base01};
-            	margin: 4px;
-            	padding: 2px 10px;
-            	border-radius: 10px;
-              }
-              #disk {
-            	color: #${palette.base03};
-            	background: #${palette.base01};
-            	margin: 4px;
-            	padding: 2px 10px;
-            	border-radius: 10px;
-              }
-              #battery {
-            	color: #${palette.base08};
-            	background: #${palette.base01};
-            	margin: 4px;
-            	padding: 2px 10px;
-            	border-radius: 10px;
-              }
-              #network {
-            	color: #${palette.base09};
-            	background: #${palette.base01};
-            	margin: 4px;
-            	padding: 2px 10px;
-            	border-radius: 10px;
-              }
-              #custom-hyprbindings {
-            	color: #${palette.base0E};
-            	background: #${palette.base01};
-            	margin: 4px;
-            	padding: 2px 10px;
-            	border-radius: 10px;
-              }
-              #tray {
-            	color: #${palette.base05};
-            	background: #${palette.base01};
-            	margin: 4px;
-            	padding: 2px 10px;
-            	border-radius: 10px;
-              }
-              #pulseaudio {
-            	color: #${palette.base0D};
-            	background: #${palette.base01};
-            	margin: 4px;
-            	padding: 2px 10px;
-            	border-radius: 10px;
-              }
-              #custom-notification {
-            	color: #${palette.base0C};
-            	background: #${palette.base01};
-            	margin: 4px;
-            	padding: 2px 10px;
-            	border-radius: 10px;
-              }
-              #custom-themeselector {
-            	color: #${palette.base0D};
-            	background: #${palette.base01};
-            	margin: 4px 0px;
-            	padding: 2px 10px 2px 5px;
-            	border-radius: 0px 10px 10px 0px;
-              }
-              #custom-startmenu {
-            	color: #${palette.base00};
-                background: linear-gradient(45deg, #${palette.base09}, #${palette.base03}, #${palette.base0C}, #${palette.base07});
-                background-size: 300% 300%;
-                ${
-                  if waybarAnimations == true then
-                    ''
-                      animation: gradient_horizontal 15s ease infinite;
-                    ''
-                  else
-                    ''''
-                }
-            	margin: 4px;
-            	padding: 2px 10px;
-            	border-radius: 10px;
-              }
-              #idle_inhibitor {
-            	color: #${palette.base09};
-            	background: #${palette.base01};
-            	margin: 4px 0px;
-            	padding: 2px 14px;
-            	border-radius: 0px;
-              }
-              #custom-exit {
-            	color: #${palette.base0E};
-            	background: #${palette.base01};
-            	border-radius: 10px 0px 0px 10px;
-            	margin: 4px 0px;
-            	padding: 2px 5px 2px 15px;
-              } ''
+        {
+          font-size: 16px;
+          border-radius: 0px;
+          border: none;
+          font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
+          min-height: 0px;
+        }
+          window#waybar {
+          background-color: #${palette.base00};
+        }
+        #workspaces {
+          color: #${palette.base00};
+          background: #${palette.base01};
+          margin: 5px 5px;
+          padding: 8px 5px;
+          border-radius: 16px;
+        }
+        #workspaces button {
+          padding: 0px 5px;
+          margin: 0px 3px;
+          border-radius: 16px;
+          color: #${palette.base00};
+          background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
+          background-size: 300% 300%;
+          ${
+            if waybarAnimations == true then
+              ''
+                animation: gradient_horizontal 15s ease infinite;
+              ''
+            else
+              ''''
+          }
+          opacity: 0.5;
+          transition: ${betterTransition};
+        }
+        #workspaces button.active {
+          padding: 0px 5px;
+          margin: 4px 3px;
+          border-radius: 16px;
+          color: #${palette.base00};
+          background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
+          background-size: 300% 300%;
+          ${
+            if waybarAnimations == true then
+              ''
+                animation: gradient_horizontal 15s ease infinite;
+              ''
+            else
+              ''''
+          }
+          transition: ${betterTransition};
+          opacity: 1.0;
+          min-width: 40px;
+        }
+        #workspaces button:hover {
+          border-radius: 16px;
+          color: #${palette.base00};
+          background: linear-gradient(45deg, #${palette.base0E}, #${palette.base0F}, #${palette.base0D}, #${palette.base09});
+          background-size: 300% 300%;
+          ${
+            if waybarAnimations == true then
+              ''
+                animation: gradient_horizontal 15s ease infinite;
+              ''
+            else
+              ''''
+          }
+          opacity: 0.8;
+          transition: ${betterTransition};
+        }
+        @keyframes gradient_horizontal {
+          0% {
+            background-position: 0% 50%;
+          }
+          50% {
+            background-position: 100% 50%;
+          }
+          100% {
+            background-position: 0% 50%;
+          }
+        }
+        @keyframes swiping {
+          0% {
+            background-position: 0% 200%;
+          }
+          100% {
+            background-position: 200% 200%;
+          }
+        }
+        tooltip {
+          background: #${palette.base00};
+          border: 1px solid #${palette.base0E};
+          border-radius: 12px;
+        }
+        tooltip label {
+          color: #${palette.base07};
+        }
+        #window, #pulseaudio, #cpu, #memory {
+          font-weight: bold;
+          margin: 5px 0px;
+          margin-left: 7px;
+          padding: 0 18px;
+          color: #${palette.base05};
+          background: #${palette.base01};
+          border-radius: 24px 10px 24px 10px;
+        }
+        #custom-startmenu {
+          color: #${palette.base0D};
+          background: #${palette.base01};
+          font-size: 28px;
+          margin: 0px;
+          padding: 0px 35px 0px 15px;
+          border-radius: 0px 0px 40px 0px;
+        }
+        #custom-hyprbindings, #idle_inhibitor, #custom-themeselector, #battery,
+        #custom-notification, tray {
+          font-weight: bold;
+          background: #${palette.base01};
+          color: #${palette.base05};
+          margin: 5px 0px;
+          margin-left: 7px;
+          border-radius: 10px 24px 10px 24px;
+          padding: 0 18px;
+        }
+        #clock {
+          color: #${palette.base00};
+          background: linear-gradient(45deg, #${palette.base0C}, #${palette.base0F}, #${palette.base0B}, #${palette.base08});
+          background-size: 300% 300%;
+          ${
+            if waybarAnimations == true then
+              ''
+                animation: gradient_horizontal 15s ease infinite;
+              ''
+            else
+              ''''
+          }
+          margin: 0px;
+          padding: 0px 35px 0px 15px;
+          border-radius: 0px 0px 0px 40px;
+        }
+      ''
     ];
   };
 }
diff --git a/hosts/familypc/home.nix b/hosts/familypc/home.nix
index d064c19..4f466fb 100644
--- a/hosts/familypc/home.nix
+++ b/hosts/familypc/home.nix
@@ -142,7 +142,7 @@ in
   };
 
   # Scripts
-  home.packages = with pkgs; [
+  home.packages = [
     (import ../../scripts/emopicker9000.nix { inherit pkgs; })
     (import ../../scripts/task-waybar.nix { inherit pkgs; })
     (import ../../scripts/squirtle.nix { inherit pkgs; })
@@ -168,86 +168,81 @@ in
 
   programs = {
     gh.enable = true;
-    neovim =
-      let
-        toLua = str: "lua << EOF\n${str}\nEOF\n";
-        toLuaFile = file: "lua << EOF\n${builtins.readFile file}\nEOF\n";
-      in
-      {
-        enable = true;
-        defaultEditor = true;
-        viAlias = true;
-        vimAlias = true;
-        vimdiffAlias = true;
-        withNodeJs = true;
-        extraPackages = with pkgs; [
-          lua-language-server
-          gopls
-          xclip
-          wl-clipboard
-          luajitPackages.lua-lsp
-          nil
-          rust-analyzer
-          nodePackages.bash-language-server
-          yaml-language-server
-          pyright
-          marksman
-        ];
-        plugins = with pkgs.vimPlugins; [
-          alpha-nvim
-          auto-session
-          bufferline-nvim
-          dressing-nvim
-          indent-blankline-nvim
-          nvim-treesitter.withAllGrammars
-          lualine-nvim
-          nvim-autopairs
-          nvim-web-devicons
-          nvim-cmp
-          nvim-surround
-          nvim-lspconfig
-          cmp-nvim-lsp
-          cmp-buffer
-          luasnip
-          cmp_luasnip
-          friendly-snippets
-          lspkind-nvim
-          comment-nvim
-          nvim-ts-context-commentstring
-          {
-            plugin = dracula-nvim;
-            config = "colorscheme dracula";
-          }
-          plenary-nvim
-          neodev-nvim
-          luasnip
-          telescope-nvim
-          todo-comments-nvim
-          nvim-tree-lua
-          telescope-fzf-native-nvim
-          vim-tmux-navigator
-        ];
-        extraLuaConfig = ''
-          ${builtins.readFile ../../config/nvim/options.lua}
-          ${builtins.readFile ../../config/nvim/keymaps.lua}
-          ${builtins.readFile ../../config/nvim/plugins/alpha.lua}
-          ${builtins.readFile ../../config/nvim/plugins/autopairs.lua}
-          ${builtins.readFile ../../config/nvim/plugins/auto-session.lua}
-          ${builtins.readFile ../../config/nvim/plugins/comment.lua}
-          ${builtins.readFile ../../config/nvim/plugins/cmp.lua}
-          ${builtins.readFile ../../config/nvim/plugins/lsp.lua}
-          ${builtins.readFile ../../config/nvim/plugins/nvim-tree.lua}
-          ${builtins.readFile ../../config/nvim/plugins/telescope.lua}
-          ${builtins.readFile ../../config/nvim/plugins/todo-comments.lua}
-          ${builtins.readFile ../../config/nvim/plugins/treesitter.lua}
-          require("ibl").setup()
-          require("bufferline").setup{}
-          require("lualine").setup({
-            icons_enabled = true,
-            theme = 'dracula',
-          })
-        '';
-      };
+    neovim = {
+      enable = true;
+      defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
+      vimdiffAlias = true;
+      withNodeJs = true;
+      extraPackages = with pkgs; [
+        lua-language-server
+        gopls
+        xclip
+        wl-clipboard
+        luajitPackages.lua-lsp
+        nil
+        rust-analyzer
+        nodePackages.bash-language-server
+        yaml-language-server
+        pyright
+        marksman
+      ];
+      plugins = with pkgs.vimPlugins; [
+        alpha-nvim
+        auto-session
+        bufferline-nvim
+        dressing-nvim
+        indent-blankline-nvim
+        nvim-treesitter.withAllGrammars
+        lualine-nvim
+        nvim-autopairs
+        nvim-web-devicons
+        nvim-cmp
+        nvim-surround
+        nvim-lspconfig
+        cmp-nvim-lsp
+        cmp-buffer
+        luasnip
+        cmp_luasnip
+        friendly-snippets
+        lspkind-nvim
+        comment-nvim
+        nvim-ts-context-commentstring
+        {
+          plugin = dracula-nvim;
+          config = "colorscheme dracula";
+        }
+        plenary-nvim
+        neodev-nvim
+        luasnip
+        telescope-nvim
+        todo-comments-nvim
+        nvim-tree-lua
+        telescope-fzf-native-nvim
+        vim-tmux-navigator
+      ];
+      extraLuaConfig = ''
+        ${builtins.readFile ../../config/nvim/options.lua}
+        ${builtins.readFile ../../config/nvim/keymaps.lua}
+        ${builtins.readFile ../../config/nvim/plugins/alpha.lua}
+        ${builtins.readFile ../../config/nvim/plugins/autopairs.lua}
+        ${builtins.readFile ../../config/nvim/plugins/auto-session.lua}
+        ${builtins.readFile ../../config/nvim/plugins/comment.lua}
+        ${builtins.readFile ../../config/nvim/plugins/cmp.lua}
+        ${builtins.readFile ../../config/nvim/plugins/lsp.lua}
+        ${builtins.readFile ../../config/nvim/plugins/nvim-tree.lua}
+        ${builtins.readFile ../../config/nvim/plugins/telescope.lua}
+        ${builtins.readFile ../../config/nvim/plugins/todo-comments.lua}
+        ${builtins.readFile ../../config/nvim/plugins/treesitter.lua}
+        require("ibl").setup()
+        require("bufferline").setup{}
+        require("lualine").setup({
+          icons_enabled = true,
+          theme = 'dracula',
+        })
+      '';
+    };
     kitty = {
       enable = true;
       package = pkgs.kitty;