diff --git a/lua/toolchain/angular.lua b/lua/toolchain/angular.lua
index 706f3f8..51c64ec 100644
--- a/lua/toolchain/angular.lua
+++ b/lua/toolchain/angular.lua
@@ -5,17 +5,6 @@ local K = require('core.keymap')
 function M.setup()
     T.add_highlighter_autoinstalls('angular')
 
-    T.add_null_ls_module(function(null_ls)
-        return {
-            -- Diagnostics
-            null_ls.builtins.diagnostics.stylelint,
-            -- Formatter
-            null_ls.builtins.formatting.prettier.with({
-                command = 'prettierd',
-            }),
-        }
-    end)
-
     T.add_lsp_autoinstalls('angularls')
 
     T.add_lsps(function(lspconfig, capabilities)
diff --git a/lua/toolchain/text.lua b/lua/toolchain/text.lua
index 7ee1c22..0a1e23c 100644
--- a/lua/toolchain/text.lua
+++ b/lua/toolchain/text.lua
@@ -5,16 +5,27 @@ function M.setup()
     T.add_highlighter_autoinstalls('markdown')
 
     T.add_null_ls_module(function(null_ls)
+        local markdownlint_options = {
+            extra_args = {
+                '--disable',
+                'MD022', -- Empty Line after Heading
+                '--disable',
+                'MD024', -- Duplicate Headings
+                '--disable',
+                'MD032', -- List Should be surounded by Empty Lines
+            },
+        }
         return {
             -- Actions
             null_ls.builtins.code_actions.proselint,
             -- Diagnostics
-            null_ls.builtins.diagnostics.alex,
+            --null_ls.builtins.diagnostics.alex,
             null_ls.builtins.diagnostics.trail_space,
             -- Formatter
-            null_ls.builtins.diagnostics.markdownlint.with({
-                extra_args = { '--disable', 'MD024' }, -- Duplicate Headings
-            }),
+            null_ls.builtins.diagnostics.markdownlint.with(
+                markdownlint_options
+            ),
+            null_ls.builtins.formatting.markdownlint.with(markdownlint_options),
         }
     end)
 
diff --git a/lua/toolchain/web.lua b/lua/toolchain/web.lua
index 3f498f4..0f4aee0 100644
--- a/lua/toolchain/web.lua
+++ b/lua/toolchain/web.lua
@@ -16,6 +16,15 @@ function M.setup()
             null_ls.builtins.diagnostics.stylelint,
             -- Formatter
             null_ls.builtins.formatting.prettier.with({
+                filetypes = {
+                    'html',
+                    'css',
+                    'scss',
+                    'sass',
+                    'less',
+                    'javascript',
+                    'typescript',
+                },
                 command = 'prettierd',
             }),
         }