diff --git a/init.lua b/init.lua
index ca5f2819..8185fdae 100644
--- a/init.lua
+++ b/init.lua
@@ -601,13 +601,6 @@ require('lazy').setup({
         -- gopls = {},
         pyright = {},
         -- rust_analyzer = {},
-        --
-        -- TODO: look into typescript-tools.nvim
-        -- Some languages (like typescript) have entire language plugins that can be useful:
-        --    https://github.com/pmizio/typescript-tools.nvim
-        --
-        -- But for many setups, the LSP (`ts_ls`) will work just fine
-        -- ts_ls = {},
       }
 
       -- Ensure the servers and tools above are installed
@@ -622,7 +615,6 @@ require('lazy').setup({
         'lua-language-server', -- Lua Language server
         'stylua', -- Used to format Lua code
         -- You can add other tools here that you want Mason to install
-        'typescript-language-server', -- Typescript Language Server
         'omnisharp', -- C# Language Server
       })
 
@@ -698,6 +690,8 @@ require('lazy').setup({
         --
         -- You can use 'stop_after_first' to run the first available formatter from the list
         javascript = { 'prettierd', 'prettier', stop_after_first = true },
+        typescript = { 'prettierd', 'prettier', stop_after_first = true },
+        typescriptreact = { 'prettierd', 'prettier', stop_after_first = true },
       },
     },
   },
@@ -796,9 +790,9 @@ require('lazy').setup({
     },
   },
 
+  -- THEMES
   { 'catppuccin/nvim', name = 'catppuccin', priority = 1000 },
   { 'rose-pine/neovim', name = 'rose-pine', priority = 1000 },
-
   { -- You can easily change to a different colorscheme.
     -- Change the name of the colorscheme plugin below, and then
     -- change the command in the config to whatever the name of that colorscheme is.
diff --git a/lua/custom/plugins/typescript-tools.lua b/lua/custom/plugins/typescript-tools.lua
new file mode 100644
index 00000000..ba7fb204
--- /dev/null
+++ b/lua/custom/plugins/typescript-tools.lua
@@ -0,0 +1,5 @@
+return {
+  'pmizio/typescript-tools.nvim',
+  dependencies = { 'nvim-lua/plenary.nvim', 'neovim/nvim-lspconfig' },
+  opts = {},
+}