diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md
index 44a41cd8..b0e53071 100644
--- a/docs/manual/release-notes/rl-0.9.md
+++ b/docs/manual/release-notes/rl-0.9.md
@@ -93,6 +93,8 @@
 
 - Renamed `jsonls` to `vscode-json-language-server`.
 
+- Renamed `cssls` to `vscode-css-language-server`.
+
 - Renamed `jdtls` to `jdt-language-server`.
 
 - Renamed `elixirls` to `elixir-ls`.
diff --git a/modules/plugins/languages/css.nix b/modules/plugins/languages/css.nix
index 27516400..fc34ea37 100644
--- a/modules/plugins/languages/css.nix
+++ b/modules/plugins/languages/css.nix
@@ -6,29 +6,17 @@
 }: let
   inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption literalExpression;
+  inherit (lib) genAttrs;
   inherit (lib.meta) getExe;
   inherit (lib.modules) mkIf mkMerge;
-  inherit (lib.types) enum;
+  inherit (lib.types) enum listOf;
   inherit (lib.nvim.types) mkGrammarOption deprecatedSingleOrListOf;
   inherit (lib.nvim.attrsets) mapListToAttrs;
 
   cfg = config.vim.languages.css;
 
-  defaultServer = ["cssls"];
-  servers = {
-    cssls = {
-      cmd = ["${pkgs.vscode-langservers-extracted}/bin/vscode-css-language-server" "--stdio"];
-      filetypes = ["css" "scss" "less"];
-      # needed to enable formatting
-      init_options = {provideFormatter = true;};
-      root_markers = [".git" "package.json"];
-      settings = {
-        css.validate = true;
-        scss.validate = true;
-        less.validate = true;
-      };
-    };
-  };
+  defaultServer = ["vscode-css-language-server"];
+  servers = ["vscode-css-language-server"];
 
   defaultFormat = ["prettier"];
   formats = {
@@ -68,7 +56,7 @@ in {
         };
 
       servers = mkOption {
-        type = deprecatedSingleOrListOf "vim.language.css.lsp.servers" (enum (attrNames servers));
+        type = listOf (enum servers);
         default = defaultServer;
         description = "CSS LSP server to use";
       };
@@ -92,12 +80,17 @@ in {
     })
 
     (mkIf cfg.lsp.enable {
-      vim.lsp.servers =
-        mapListToAttrs (name: {
-          inherit name;
-          value = servers.${name};
-        })
-        cfg.lsp.servers;
+      vim.lsp = {
+        presets = genAttrs cfg.lsp.servers (_: {enable = true;});
+        servers = genAttrs cfg.lsp.servers (_: {
+          filetypes = [
+            "css"
+            # TODO: split in their own modules
+            "scss"
+            "less"
+          ];
+        });
+      };
     })
 
     (mkIf cfg.format.enable {