diff --git a/nvim/init.lua b/nvim/init.lua
index 054a73c..232c1c8 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -5,7 +5,7 @@ vim.g.maplocalleader = ","
 -- Load Plugins
 require("plugins")
 -- Color Scheme
-vim.cmd.colorscheme "catppuccin"
+vim.cmd.colorscheme "noirbuddy"
 -- vim.cmd([[colorscheme kanagawa]])
 -- Config for Nord, which I usually use
 -- vim.g.nord_italic = false
diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua
index 16a1dd9..a00842c 100644
--- a/nvim/lua/lsp.lua
+++ b/nvim/lua/lsp.lua
@@ -15,7 +15,7 @@ nvim_lsp.pylsp.setup({
             "pants.toml", "pyproject.toml", "setup.py", "setup.cfg", "Pipfile"
         }
         return util.find_git_ancestor(fname) or
-                   util.root_pattern(unpack(root_files))(fname)
+            util.root_pattern(unpack(root_files))(fname)
     end
 })
 nvim_lsp.lua_ls.setup {
@@ -27,14 +27,14 @@ nvim_lsp.lua_ls.setup {
             },
             diagnostics = {
                 -- Get the language server to recognize the `vim` global
-                globals = {"vim"}
+                globals = { "vim" }
             },
             workspace = {
                 -- Make the server aware of Neovim runtime files
                 library = vim.api.nvim_get_runtime_file("", true)
             },
             -- Do not send telemetry data containing a randomized but unique identifier
-            telemetry = {enable = false}
+            telemetry = { enable = false }
         }
     }
 }
@@ -42,14 +42,14 @@ nvim_lsp.lua_ls.setup {
 nvim_lsp.janet_lsp.setup {
     cmd = {
         "janet",
-        "-i",
-        "/home/noah/repos/janet-lsp/jpm_tree/lib/janet-lsp.jimage",
-        "--stdio",
+        "/home/noah/repos/janet-lsp/.jpm/bin/janet-lsp",
+        "--stdio"
     }
 }
 
 -- LSPs that just use default config
 local simple_lsps = {
+    --"htmx",
     "nil_ls", "bzl", "bufls", "crystalline", "dockerls",
     "erlangls", "elixirls", "fortls", "gleam", "gopls", "hls", "jsonls",
     "vimls", "asm_lsp", "ccls", "pyright", -- ruff", idk if this is wrong?
@@ -59,14 +59,15 @@ local simple_lsps = {
     "ocamllsp", "reason_ls", "racket_langserver", "rust_analyzer",
     "scheme_langserver", "sqls", "thriftls", "typst_lsp", "vhdl_ls", "yamlls",
     "zls", "ts_ls", "eslint", "metals", "futhark_lsp", "roc_ls",
-    -- disabled because broken
+    -- disabled because it's broken
     -- "scheme_langserver",
-    -- "htmx",
 }
 -- #simple_lsps is the length of the table when treated as a list... funky!
-for _, v in pairs(simple_lsps) do nvim_lsp[v].setup {
-    capabilities = capabilities
-} end
+for _, v in pairs(simple_lsps) do
+    nvim_lsp[v].setup {
+        capabilities = capabilities
+    }
+end
 
 nvim_lsp.fennel_ls.setup({
     capabilities = capabilities,
@@ -78,7 +79,7 @@ local on_attach = function(ev)
     -- Enable completion triggered by <c-x><x-o>
     vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
 
-    local opts = {noremap = true, silent = true, buffer = ev.buf}
+    local opts = { noremap = true, silent = true, buffer = ev.buf }
     local protocol = require("vim.lsp.protocol")
     -- Mappings.
     -- See `:help vim.lsp.*` for documentation on any of the below functions
@@ -101,7 +102,7 @@ local on_attach = function(ev)
     vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts)
     vim.keymap.set("n", "<space>q", vim.diagnostic.setloclist, opts)
     vim.keymap.set("n", "<space>f",
-                   function() vim.lsp.buf.format {async = true} end, opts)
+        function() vim.lsp.buf.format { async = true } end, opts)
     vim.keymap.set("n", "<space>s", vim.lsp.buf.workspace_symbol, opts)
 
     --  require'completion'.on_attach(client, bufnr)
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index bc52a89..3138b36 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -27,11 +27,23 @@ require("lazy").setup({
         "neanias/everforest-nvim",
         version = false,
         lazy = true,
-        priority = 500, -- make sure to load this before all the other start plugins
+        priority = 1000, -- make sure to load this before all the other start plugins
         main = "everforest",
         opts = { background = "hard" }
     },
     { "rebelot/kanagawa.nvim",          opts = { compile = true }, priority = 1000, lazy = true },
+    {
+        'jesseleite/nvim-noirbuddy',
+        dependencies = {
+            'tjdevries/colorbuddy.nvim',
+        },
+        lazy = false,
+        priority = 1000,
+        opts = {
+            -- All of your `setup(opts)` will go here
+            preset = "oxide",
+        },
+    },
     -- show indents and whitespace characters
     "lukas-reineke/indent-blankline.nvim", -- Completion
     -- Completion
@@ -80,13 +92,13 @@ require("lazy").setup({
             "nvim-treesitter/nvim-treesitter-textobjects",
             "nvim-treesitter/nvim-treesitter-context",
         },
-    },                     -- Git stuff
+    },                        -- Git stuff
     -- GitGutter, shows inline difs
     "airblade/vim-gitgutter", -- "tpope/vim-fugitive", -- old git command
     {
         "NeogitOrg/neogit",
         dependencies = {
-            "nvim-lua/plenary.nvim", -- required
+            "nvim-lua/plenary.nvim",  -- required
             "sindrets/diffview.nvim", -- optional - Diff integration
             "nvim-telescope/telescope.nvim"
         },
@@ -96,7 +108,7 @@ require("lazy").setup({
     {
         "stevearc/conform.nvim",
         lazy = true,
-        opt = {
+        opts = {
             python = { "isort", "black" },
             lua = { "lua-format" },
             clojure = { "cljfmt" },
@@ -177,7 +189,6 @@ require("lazy").setup({
         },
     },
     -- Lithsps
-    --{ "m4xshen/autoclose.nvim" },
     {
         "windwp/nvim-autopairs",
         event = "InsertEnter",
@@ -298,7 +309,6 @@ require("lazy").setup({
         end,
     },
     { "hiphish/rainbow-delimiters.nvim" },
-    --{ "gpanders/nvim-parinfer",         ft = { "scheme", "scm", "lisp", "fennel", "clojure", "lua", "janet" } },
     -- Conjure, lisp is magical
     {
         "Olical/conjure",
@@ -343,16 +353,16 @@ require("lazy").setup({
         dependencies = { "nvim-lua/plenary.nvim" },
         config = function() require("crates").setup() end,
         ft = { "rust" }
-    },                                      -- RISC-V Assembly syntax highlighting
+    },                                         -- RISC-V Assembly syntax highlighting
     { "kylelaker/riscv.vim",   ft = "riscv" }, -- Hare Stuff
     -- Haredoc
     {
         url = "https://git.sr.ht/~torresjrjr/vim-haredoc",
         ft = { "hare" },
         branch = "dev"
-    },                                                              -- Hare.vim
+    },                                                                 -- Hare.vim
     { url = "https://git.sr.ht/~sircmpwn/hare.vim", ft = { "hare" } }, -- TCL
-    { "lewis6991/tree-sitter-tcl",                  build = "make" }, -- LF
+    { "lewis6991/tree-sitter-tcl",                  build = "make" },  -- LF
     { "ptzz/lf.vim",                                cmd = { "Lf" }, dependencies = { "voldikss/vim-floaterm" } },
     -- SuperMaven, another AI coding tool
     {
@@ -367,7 +377,7 @@ require("lazy").setup({
         lazy = true,
         ft = "markdown",
         dependencies = { "nvim-lua/plenary.nvim" },
-        opt = {
+        opts = {
             workspaces = {
                 { name = "athenaeum",          path = "~/Documents/Athenaeum" },
                 -- Mage, the Awakening and other Chronicles of Darkness