diff --git a/init.lua b/init.lua
index 1d27b02d..8274d38b 100644
--- a/init.lua
+++ b/init.lua
@@ -239,7 +239,6 @@ vim.opt.rtp:prepend(lazypath)
 require('lazy').setup({
   -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
   'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
-
   'ThePrimeagen/vim-be-good',
 
   -- NOTE: Plugins can also be added by using a table,
@@ -671,6 +670,7 @@ require('lazy').setup({
         -- You can use a sub-list to tell conform to run *until* a formatter
         -- is found.
         javascript = { { 'prettierd', 'prettier' } },
+        ['*'] = { 'trim_whitespace' },
       },
     },
   },
@@ -789,7 +789,7 @@ require('lazy').setup({
     'folke/tokyonight.nvim',
     priority = 1000, -- make sure to load this before all the other start plugins
     init = function()
-      vim.cmd.colorscheme 'rose-pine'
+      -- vim.cmd.colorscheme 'rose-pine'
 
       -- You can configure highlights by doing something like
       vim.cmd.hi 'Comment gui=none'
diff --git a/lua/custom/plugins/colorbuddy.lua b/lua/custom/plugins/colorbuddy.lua
new file mode 100644
index 00000000..81bfdee8
--- /dev/null
+++ b/lua/custom/plugins/colorbuddy.lua
@@ -0,0 +1,47 @@
+return {
+  'tjdevries/colorbuddy.nvim',
+  config = function()
+    require('colorbuddy').colorscheme 'gruvbuddy'
+
+    local colorbuddy = require 'colorbuddy'
+    local Color = colorbuddy.Color
+    local Group = colorbuddy.Group
+    local c = colorbuddy.colors
+    local g = colorbuddy.groups
+    local s = colorbuddy.styles
+
+    Color.new('white', '#f2e5bc')
+    Color.new('red', '#cc6666')
+    Color.new('pink', '#fef601')
+    Color.new('green', '#99cc99')
+    Color.new('yellow', '#f8fe7a')
+    Color.new('blue', '#81a2be')
+    Color.new('aqua', '#8ec07c')
+    Color.new('cyan', '#8abeb7')
+    Color.new('purple', '#8e6fbd')
+    Color.new('violet', '#b294bb')
+    Color.new('orange', '#de935f')
+    Color.new('brown', '#a3685a')
+
+    Color.new('seagreen', '#698b69')
+    Color.new('turquoise', '#698b69')
+
+    local background_string = '#111111'
+    Color.new('background', background_string)
+    Color.new('gray0', background_string)
+
+    Group.new('Normal', c.superwhite, c.gray0)
+
+    Group.new('@constant', c.orange, nil, s.none)
+    Group.new('@function', c.yellow, nil, s.none)
+    Group.new('@function.bracket', g.Normal, g.Normal)
+    Group.new('@keyword', c.violet, nil, s.none)
+    Group.new('@keyword.faded', g.nontext.fg:light(), nil, s.none)
+    Group.new('@property', c.blue)
+    Group.new('@variable', c.superwhite, nil)
+    Group.new('@variable.builtin', c.purple:light():light(), g.Normal)
+
+    -- I've always liked lua function calls to be blue. I don't know why.
+    Group.new('@function.call.lua', c.blue:dark(), nil, nil)
+  end,
+}
diff --git a/lua/custom/plugins/ts-autotag.lua b/lua/custom/plugins/ts-autotag.lua
new file mode 100644
index 00000000..efb9c7cb
--- /dev/null
+++ b/lua/custom/plugins/ts-autotag.lua
@@ -0,0 +1,46 @@
+return {
+  'windwp/nvim-ts-autotag',
+  config = function()
+    local options = {
+      auto_install = true,
+      ensure_installed = {
+        'lua',
+        'vim',
+        'go',
+        'toml',
+        'css',
+        'tsx',
+        'css',
+        'html',
+        'lua',
+      },
+      highlight = {
+        enable = true,
+        use_languagetree = true,
+      },
+      autotag = {
+        enable = true,
+        filetypes = {
+          'html',
+          'javascript',
+          'typescript',
+          'javascriptreact',
+          'typescriptreact',
+          'svelte',
+          'vue',
+          'tsx',
+          'jsx',
+          'rescript',
+          'css',
+          'lua',
+          'xml',
+          'php',
+          'markdown',
+        },
+      },
+      indent = { enable = true },
+    }
+
+    require('nvim-treesitter.configs').setup(options)
+  end,
+}