diff --git a/docs/manual/hacking/additional-plugins.md b/docs/manual/hacking/additional-plugins.md
index 08cae680..0ed252c7 100644
--- a/docs/manual/hacking/additional-plugins.md
+++ b/docs/manual/hacking/additional-plugins.md
@@ -8,13 +8,13 @@ Use:
 
 Then run:
 
-`npins --name <plugin name> github <owner> <repo> -b <branch>`
+`npins add --name <plugin name> github <owner> <repo> -b <branch>`
 
 Be sure to replace any non-alphanumeric characters with `-` for `--name`
 
 For example 
 
-`npins --name lazydev-nvim github folke laztdev.nvim -b main`
+`npins add --name lazydev-nvim github folke lazydev.nvim -b main`
 
 You can now reference this plugin as a **string**.
 
diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md
index 3ceef93f..5ff8c5f2 100644
--- a/docs/release-notes/rl-0.8.md
+++ b/docs/release-notes/rl-0.8.md
@@ -149,3 +149,16 @@
 [nezia1](https://github.com/nezia1)
 
 - Add support for [nixd](https://github.com/nix-community/nixd) language server.
+
+[folospior](https://github.com/folospior)
+
+- Fix plugin name for lsp/lspkind.
+
+[iynaix](https://github.com/iynaix)
+
+- Add lsp options support for [nixd](https://github.com/nix-community/nixd)
+  language server.
+
+[Mr-Helpful](https://github.com/Mr-Helpful)
+
+- Corrects pin names used for nvim themes
diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix
index d6ca6d32..1ae2693e 100644
--- a/modules/plugins/languages/nix.nix
+++ b/modules/plugins/languages/nix.nix
@@ -10,9 +10,9 @@
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.lists) isList;
   inherit (lib.strings) optionalString;
-  inherit (lib.types) enum either listOf package str;
+  inherit (lib.types) anything attrsOf enum either listOf nullOr package str;
   inherit (lib.nvim.types) mkGrammarOption diagnostics;
-  inherit (lib.nvim.lua) expToLua;
+  inherit (lib.nvim.lua) expToLua toLuaObject;
   inherit (lib.nvim.languages) diagnosticsToLua;
 
   cfg = config.vim.languages.nix;
@@ -87,6 +87,7 @@
                 command = {"${cfg.format.package}/bin/nixfmt"},
               },
             ''}
+          options = ${toLuaObject cfg.lsp.options},
             },
           },
         ''}
@@ -173,6 +174,12 @@ in {
         type = either package (listOf str);
         default = servers.${cfg.lsp.server}.package;
       };
+
+      options = mkOption {
+        type = nullOr (attrsOf anything);
+        default = null;
+        description = "Options to pass to nixd LSP server";
+      };
     };
 
     format = {
diff --git a/modules/plugins/lsp/lspkind/config.nix b/modules/plugins/lsp/lspkind/config.nix
index abe14524..982caff2 100644
--- a/modules/plugins/lsp/lspkind/config.nix
+++ b/modules/plugins/lsp/lspkind/config.nix
@@ -25,7 +25,7 @@ in {
     ];
 
     vim = {
-      startPlugins = ["lspkind"];
+      startPlugins = ["lspkind-nvim"];
 
       lsp.lspkind.setupOpts.before = config.vim.autocomplete.nvim-cmp.format;
       autocomplete = {
diff --git a/modules/plugins/utility/ccc/config.nix b/modules/plugins/utility/ccc/config.nix
index ab2d1788..33948562 100644
--- a/modules/plugins/utility/ccc/config.nix
+++ b/modules/plugins/utility/ccc/config.nix
@@ -9,9 +9,7 @@
   cfg = config.vim.utility.ccc;
 in {
   config = mkIf cfg.enable {
-    vim.startPlugins = [
-      "ccc"
-    ];
+    vim.startPlugins = ["ccc-nvim"];
 
     vim.pluginRC.ccc = entryAnywhere ''
       local ccc = require("ccc")
diff --git a/modules/plugins/visuals/rainbow-delimiters/config.nix b/modules/plugins/visuals/rainbow-delimiters/config.nix
index 361a0426..79996aea 100644
--- a/modules/plugins/visuals/rainbow-delimiters/config.nix
+++ b/modules/plugins/visuals/rainbow-delimiters/config.nix
@@ -9,7 +9,7 @@
   cfg = config.vim.visuals.rainbow-delimiters;
 in {
   vim = mkIf cfg.enable {
-    startPlugins = ["rainbow-delimiters"];
+    startPlugins = ["rainbow-delimiters-nvim"];
 
     pluginRC.rainbow-delimiters = entryAnywhere ''
       vim.g.rainbow_delimiters = ${toLuaObject cfg.setupOpts}
diff --git a/npins/sources.json b/npins/sources.json
index 70df6065..929da85c 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -24,7 +24,7 @@
       "url": "https://github.com/goolord/alpha-nvim/archive/de72250e054e5e691b9736ee30db72c65d560771.tar.gz",
       "hash": "0c1jkhxamfn2md7m1r5b2wpxa26y90b98yzjwf68m3fymalvkn5h"
     },
-    "base16-nvim": {
+    "base16": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -288,7 +288,7 @@
       "url": "https://github.com/sindrets/diffview.nvim/archive/4516612fe98ff56ae0415a259ff6361a89419b0a.tar.gz",
       "hash": "0brabpd02596hg98bml118bx6z2sly98kf1cr2p0xzybiinb4zs9"
     },
-    "dracula-nvim": {
+    "dracula": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -420,7 +420,7 @@
       "url": "https://github.com/ellisonleao/glow.nvim/archive/238070a686c1da3bccccf1079700eb4b5e19aea4.tar.gz",
       "hash": "1j63y3hb03n5m4jig8576sxnb3jixxlr66m9xcs8vgfm5h0mrhqs"
     },
-    "gruvbox-nvim": {
+    "gruvbox": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1247,7 +1247,7 @@
       "url": "https://github.com/nvimtools/none-ls.nvim/archive/bb680d752cec37949faca7a1f509e2fe67ab418a.tar.gz",
       "hash": "11zgc86cjkv1vi183mplx3bsqa2x7ardk7ybyrp702xx5hmd882l"
     },
-    "nord-nvim": {
+    "nord": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1583,7 +1583,7 @@
       "url": "https://github.com/Hoffs/omnisharp-extended-lsp.nvim/archive/4916fa12e5b28d21a1f031f0bdd10aa15a75d85d.tar.gz",
       "hash": "0w2zbiz2sxblnmhnqp6f6n7d9g9cm40ksk66anl3s7qnqffvc3cl"
     },
-    "onedark-nvim": {
+    "onedark": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1619,7 +1619,7 @@
       "url": "https://github.com/jmbuhr/otter.nvim/archive/e8c662e1aefa8b483cfba6e00729a39a363dcecc.tar.gz",
       "hash": "0csl3ddm8782fw836adj4fp4h3fg2ygv7ik632llk55mp1q4dw1l"
     },
-    "oxocarbon-nvim": {
+    "oxocarbon": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1859,7 +1859,7 @@
       "url": "https://github.com/akinsho/toggleterm.nvim/archive/344fc1810292785b3d962ddac2de57669e1a7ff9.tar.gz",
       "hash": "0awj2kj3lam2j48bgld5wyb4m1v09gpxmzww35rgysq7wipliqx1"
     },
-    "tokyonight-nvim": {
+    "tokyonight": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -1991,7 +1991,7 @@
       "url": "https://github.com/folke/which-key.nvim/archive/8ab96b38a2530eacba5be717f52e04601eb59326.tar.gz",
       "hash": "12wkl04apgag0p5njw8mczzlbxqf5h08k61qciwy10n4q1harzvz"
     },
-    "yanky.nvim": {
+    "yanky-nvim": {
       "type": "Git",
       "repository": {
         "type": "GitHub",
@@ -2005,4 +2005,4 @@
     }
   },
   "version": 3
-}
\ No newline at end of file
+}