diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix
index 04c52e9..c9f9af2 100644
--- a/hosts/JWST/configuration.nix
+++ b/hosts/JWST/configuration.nix
@@ -24,7 +24,6 @@
       efiSupport = true;
       configurationLimit = 10;
       device = "nodev";
-      # extraEntriesBeforeNixOS = true; # still primarily using void
       extraEntries = ''
         menuentry "Void" {
           search --set=void --fs-uuid 987518fa-8ea0-49a6-b1e5-1fed4e4ae50f
diff --git a/users/tacocat/helix/default.nix b/users/tacocat/helix/default.nix
index 8900ca4..2b23f3b 100644
--- a/users/tacocat/helix/default.nix
+++ b/users/tacocat/helix/default.nix
@@ -10,43 +10,26 @@
 
   programs.helix = {
     enable = true;
-
-    # add the following packages to helix's path
-    package = inputs.helix.packages.${pkgs.system}.default.overrideAttrs (self: {
-      makeWrapperArgs = with pkgs;
-        self.makeWrapperArgs
-        or []
-        ++ [
-          "--suffix"
-          "PATH"
-          ":"
-          (lib.makeBinPath [
-            clang-tools
-            marksman
-            nil
-            nodePackages.bash-language-server
-            shellcheck
-            java-language-server
-            texlab
-            tectonic
-            zathura
-          ])
-        ];
-    });
-
+    package = inputs.helix.packages.${pkgs.system}.default;
+    extraPackages = with pkgs; [
+      clang-tools
+      marksman
+      nil
+      nodePackages.bash-language-server
+      shellcheck
+      java-language-server
+      texlab
+      tectonic
+      zathura
+    ];
     settings = {
-      theme = "rose_pine_moon";
+      theme = "catppuccin_frappe";
       editor = {
         line-number = "relative";
         lsp.display-messages = true;
         scrolloff = 10;
         middle-click-paste = false;
         cursorline = true;
-        cursor-shape = {
-          insert = "bar";
-          normal = "block";
-          select = "block";
-        };
         auto-format = false;
         idle-timeout = 400;
         color-modes = true;
diff --git a/users/tacocat/helix/languages.nix b/users/tacocat/helix/languages.nix
index 2d378dd..de008d1 100644
--- a/users/tacocat/helix/languages.nix
+++ b/users/tacocat/helix/languages.nix
@@ -5,44 +5,20 @@
 }: {
   programs.helix.languages = {
     language = [
-      # {
-      #   name = "bash";
-      #   auto-format = false;
-      #   formatter = {
-      #     command = "${pkgs.shfmt}/bin/shfmt";
-      #     args = ["-i" "2"];
-      #   };
-      # }
-
-      {
-        name = "java";
-        language-servers = ["java-language-server"];
-      }
-
       {
         name = "latex";
-        indent.tab-width = 2;
-        indent.unit = "\t";
+        indent = {
+          tab-width = 2;
+          unit = "\t";
+        };
       }
     ];
     language-server = {
-      # bash-language-server = {
-      #   command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server";
-      #   args = ["start"];
-      # };
-
-      # clangd = {
-      #   command = "${pkgs.clang-tools}/bin/clangd";
-      #   clangd.fallbackFlags = ["-std=c++2b"];
-      # };
-
       nil = {
-        # command = lib.getExe pkgs.nil;
         config.nil.formatting.command = ["${lib.getExe pkgs.alejandra}" "-q"];
       };
 
       texlab = {
-        # command = "${pkgs.texlab}/bin/texlab";
         config.texlab = {
           forwardSearch.executable = "zathura";
           forwardSearch.args = ["--synctex-forward" "%l:1:%f" "%p"];
@@ -66,10 +42,6 @@
           };
         };
       };
-
-      # java-language-server = {
-      #   command = "${pkgs.java-language-server}/bin/java-language-server";
-      # };
     };
   };
 }
diff --git a/users/tacocat/wayland/default.nix b/users/tacocat/wayland/default.nix
index de01bde..a13db23 100644
--- a/users/tacocat/wayland/default.nix
+++ b/users/tacocat/wayland/default.nix
@@ -17,6 +17,7 @@
     dunst
     grim
     slurp
+    sway-contrib.grimshot
   ];
 
   home.sessionVariables = {
diff --git a/users/tacocat/wayland/sway/config b/users/tacocat/wayland/sway/config
index 76dda5e..8b63fb8 100755
--- a/users/tacocat/wayland/sway/config
+++ b/users/tacocat/wayland/sway/config
@@ -252,7 +252,7 @@ bindsym $mod+r mode "resize"
 # }
 
 # Screenshot
-    bindsym Print exec IMG=~/Pictures/screenshots/$(date | sed "s/\s/-/g" | sed "s/--/-/g").png&&grim -g "$(slurp)" $IMG && cat $IMG | wl-copy
+    bindsym Print exec grimshot copy area
 
 #
 # Player