diff --git a/lua/core/keymaps/async/tsserver.lua b/lua/core/keymaps/async/ts_ls.lua
similarity index 100%
rename from lua/core/keymaps/async/tsserver.lua
rename to lua/core/keymaps/async/ts_ls.lua
diff --git a/lua/core/plugins/init.lua b/lua/core/plugins/init.lua
index e8a7cb9b..1f88ccfa 100644
--- a/lua/core/plugins/init.lua
+++ b/lua/core/plugins/init.lua
@@ -158,6 +158,18 @@ local plugins = {
     branch = "master"
   },
 
+  {
+    "luckasRanarison/tailwind-tools.nvim",
+    name = "tailwind-tools",
+    build = ":UpdateRemotePlugins",
+    dependencies = {
+      "nvim-treesitter/nvim-treesitter",
+      "nvim-telescope/telescope.nvim", -- optional
+      "neovim/nvim-lspconfig",         -- optional
+    },
+    opts = {}                          -- your configuration
+  },
+
   -- require plugins with more complex config
 
   require 'core.plugins.todo-comments',
diff --git a/lua/core/setup/language-servers.lua b/lua/core/setup/language-servers.lua
index 24e14fe3..5832e28f 100644
--- a/lua/core/setup/language-servers.lua
+++ b/lua/core/setup/language-servers.lua
@@ -14,7 +14,7 @@ local servers = {
   -- pyright = {},
   -- rust_analyzer = {},
   eslint = {},
-  tsserver = {
+  ts_ls = {
     typescript = {
       settings = {
         preferences = {
@@ -77,7 +77,9 @@ local function organize_imports()
   vim.lsp.buf.execute_command(params)
 end
 
-local tsserverKeymaps = require('core.keymaps.async.tsserver')
+-- TODO Add back OrganizeImports command
+
+local tsserverKeymaps = require('core.keymaps.async.ts_ls')
 
 local tsserver_on_attach = function(_, bufnr)
   lspKeymaps(bufnr)
@@ -87,7 +89,7 @@ local tsserver_on_attach = function(_, bufnr)
   })
 end
 
-require('lspconfig').tsserver.setup {
+require('lspconfig').ts_ls.setup {
   on_attach = tsserver_on_attach,
   capabilities = capabilities,
   commands = {
diff --git a/lua/kickstart/plugins/autoformat.lua b/lua/kickstart/plugins/autoformat.lua
index bc56b15b..1bbd622e 100644
--- a/lua/kickstart/plugins/autoformat.lua
+++ b/lua/kickstart/plugins/autoformat.lua
@@ -46,9 +46,9 @@ return {
 
         -- Tsserver usually works poorly. Sorry you work with bad languages
         -- You can remove this line if you know what you're doing :)
-        if client.name == 'tsserver' then
-          return
-        end
+        -- if client.name == 'tsserver' then
+        --   return
+        -- end
 
         -- Create an autocmd that will run *before* we save the buffer.
         --  Run the formatting command for the LSP that has just attached.