diff --git a/flake.lock b/flake.lock
index 9cf989a..4ea8986 100644
--- a/flake.lock
+++ b/flake.lock
@@ -390,6 +390,22 @@
         "type": "github"
       }
     },
+    "labellenixpkgs": {
+      "locked": {
+        "lastModified": 1732691756,
+        "narHash": "sha256-/XYtpmaMUhgxebN6dJKOcy70Gf50nf+RHfQhZgbjNYc=",
+        "owner": "FabianRig",
+        "repo": "nixpkgs",
+        "rev": "3da636775e87fe45fe5bbe79dafb2d8ea36648ec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "FabianRig",
+        "ref": "update-labelle-1.3.2",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nix-darwin": {
       "inputs": {
         "nixpkgs": [
@@ -630,16 +646,33 @@
         "type": "github"
       }
     },
+    "onixpkgs": {
+      "locked": {
+        "lastModified": 1730137625,
+        "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
+        "type": "indirect"
+      }
+    },
     "root": {
       "inputs": {
         "disko": "disko",
         "flake-utils": "flake-utils",
         "home-manager": "home-manager",
+        "labellenixpkgs": "labellenixpkgs",
         "nix-on-droid": "nix-on-droid",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixvim": "nixvim",
         "nur": "nur",
+        "onixpkgs": "onixpkgs",
         "stylix": "stylix",
         "unixpkgs": "unixpkgs"
       }
@@ -679,17 +712,17 @@
         "tinted-tmux": "tinted-tmux"
       },
       "locked": {
-        "lastModified": 1733153724,
-        "narHash": "sha256-28nueT0pl+YpwUey44InOqct4+7p+DkiKOfkBBDCOeU=",
+        "lastModified": 1732993760,
+        "narHash": "sha256-t1J6wgzGjvvGNfdd0ei8HnZf9sTw+SpvCNAX0i6Qgwc=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "74ee1ed5057e44edbcc36aa189a91d31eda60485",
+        "rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe",
         "type": "github"
       },
       "original": {
         "owner": "danth",
-        "ref": "master",
         "repo": "stylix",
+        "rev": "d13ffb381c83b6139b9d67feff7addf18f8408fe",
         "type": "github"
       }
     },
diff --git a/hm/extra/default.nix b/hm/extra/default.nix
index 0f84a26..a83705c 100644
--- a/hm/extra/default.nix
+++ b/hm/extra/default.nix
@@ -54,7 +54,7 @@ in
       krita
 
       # downloading
-      transmission-qt
+      transmission_4-qt
       # wine only makes sense on x86_64
     ] ++ lib.optionals pkgs.stdenv.isx86_64 [
       wine
diff --git a/hm/vim/code.nix b/hm/vim/code.nix
index ccd04c3..8937153 100644
--- a/hm/vim/code.nix
+++ b/hm/vim/code.nix
@@ -53,18 +53,20 @@ in
         # Catches attention when cursor changed position
         specs = {
           enable = true;
-          min_jump = 5;
-          settings.popup.fader = "require('specs').pulse_fader";
+          settings = {
+            min_jump = 5;
+            popup.fader = "require('specs').pulse_fader";
+          };
         };
 
         # Treesitter
         treesitter = {
           # Allows for better syntax highlighting
           enable = true;
-          incrementalSelection = {
-            enable = true;
+          settings = {
+            incremental_selection.enable = true;
+            # indent = true; # Not very working last time I tried apparently
           };
-          # indent = true; # Not very working last time I tried apparently
         };
         indent-blankline.enable = true; # Show indent guides
         rainbow-delimiters.enable = true; # Randomly colore paired brackets
diff --git a/hm/vim/decoration.nix b/hm/vim/decoration.nix
index 94c4715..f09f10a 100644
--- a/hm/vim/decoration.nix
+++ b/hm/vim/decoration.nix
@@ -51,26 +51,26 @@
             normal_ina = { fg = base02; bg = base01; };
             inverted_ina = { fg = base00; bg = base02; };
           in
-          rec {
+          {
             enable = true;
-            inactiveSections = sections;
-            sections = {
-              lualine_a = [{
-                name = ''string.format('%d', vim.fn.line('$'))'';
-              }];
-              lualine_b = [
-                "mode"
-              ];
-              lualine_c = [{
-                name = "filename";
-                color = {
-                  __raw = ''
-                    function(section)
-                      return { fg = vim.bo.modified and '${base08}' or '${normal.fg}' }
-                    end
-                  '';
-                };
-                extraConfig = {
+            settings = rec {
+              inactive_sections = sections;
+              sections = {
+                lualine_a = [{
+                  name = ''string.format('%d', vim.fn.line('$'))'';
+                }];
+                lualine_b = [
+                  "mode"
+                ];
+                lualine_c = [{
+                  name = "filename";
+                  color = {
+                    __raw = ''
+                      function(section)
+                        return { fg = vim.bo.modified and '${base08}' or '${normal.fg}' }
+                      end
+                    '';
+                  };
                   path = 1; # Relative path
                   symbols = {
                     modified = "●";
@@ -78,31 +78,27 @@
                     readonly = "󰏯";
                     unnamed = "󱀶";
                   };
-                };
-              }
-                "location"];
-              lualine_x = [{
-                name = ''(next(vim.lsp.buf_get_clients()) == nil) and "󰒲 " or ""'';
-                extraConfig.separator = { left = ""; right = ""; };
-              }] ++ (lib.mapAttrsToList
-                (diag_name: diag_color: {
-                  name = "diagnostics";
-                  extraConfig = {
+                }
+                  "location"];
+                lualine_x = [{
+                  name = ''(next(vim.lsp.buf_get_clients()) == nil) and "󰒲 " or ""'';
+                  separator = { left = ""; right = ""; };
+                }] ++ (lib.mapAttrsToList
+                  (diag_name: diag_color: {
+                    name = "diagnostics";
                     color.bg = diag_color;
                     colored = false;
                     separator = { left = ""; right = ""; };
                     sections = [ diag_name ];
-                  };
-                })
-                {
-                  error = base08;
-                  warn = base0A;
-                  hint = base0C;
-                  info = base0B;
-                });
-              lualine_y = [{
-                name = "diff";
-                extraConfig = {
+                  })
+                  {
+                    error = base08;
+                    warn = base0A;
+                    hint = base0C;
+                    info = base0B;
+                  });
+                lualine_y = [{
+                  name = "diff";
                   diff_color = {
                     added.fg = base0B;
                     modified.fg = base0A;
@@ -113,38 +109,38 @@
                     modified = " ";
                     removed = " ";
                   };
+                }
+                  "branch"];
+                lualine_z = [
+                  "filetype"
+                  "fileformat"
+                  "encoding"
+                ];
+              };
+              options.theme = (lib.mapAttrs
+                (mode_name: mode_color: {
+                  a = inverted;
+                  b = inverted // { bg = mode_color; gui = "bold"; };
+                  c = normal;
+                  x = inverted;
+                  y = normal;
+                  z = inverted // { bg = mode_color; };
+                })
+                {
+                  normal = base0D;
+                  insert = base0B;
+                  visual = base0F;
+                  replace = base08;
+                  command = base0E;
+                }) // {
+                inactive = {
+                  a = inverted_ina;
+                  b = normal_ina // { bg = base00; gui = "bold"; };
+                  c = normal_ina;
+                  x = inverted_ina;
+                  y = normal_ina;
+                  z = normal_ina // { bg = base00; };
                 };
-              }
-                "branch"];
-              lualine_z = [
-                "filetype"
-                "fileformat"
-                "encoding"
-              ];
-            };
-            theme = (lib.mapAttrs
-              (mode_name: mode_color: {
-                a = inverted;
-                b = inverted // { bg = mode_color; gui = "bold"; };
-                c = normal;
-                x = inverted;
-                y = normal;
-                z = inverted // { bg = mode_color; };
-              })
-              {
-                normal = base0D;
-                insert = base0B;
-                visual = base0F;
-                replace = base08;
-                command = base0E;
-              }) // {
-              inactive = {
-                a = inverted_ina;
-                b = normal_ina // { bg = base00; gui = "bold"; };
-                c = normal_ina;
-                x = inverted_ina;
-                y = normal_ina;
-                z = normal_ina // { bg = base00; };
               };
             };
           };
@@ -153,6 +149,7 @@
             enable = true;
             settings.max_lines = 5;
           };
+          web-devicons.enable = true; # TODO Check out plugins.mini.enable
         };
       };
     };
diff --git a/hm/vim/default.nix b/hm/vim/default.nix
index ad94fc7..b056b72 100644
--- a/hm/vim/default.nix
+++ b/hm/vim/default.nix
@@ -79,7 +79,7 @@
         # Or at least something to live_grep the curent word.
 
         # Surrounding pairs
-        surround.enable = true; # Change surrounding pairs (e.g. brackets, quotes)
+        vim-surround.enable = true; # Change surrounding pairs (e.g. brackets, quotes)
 
         undotree.enable = true; # Navigate edition history