diff --git a/ModularGrid-VCVLibrary.json b/ModularGrid-VCVLibrary.json
index dae038b5..6c589c2b 100644
--- a/ModularGrid-VCVLibrary.json
+++ b/ModularGrid-VCVLibrary.json
@@ -2383,5 +2383,47 @@
     "vcvUrl": "https://library.vcvrack.com/4msCompany/MMAudioExpander",
     "mgUrl": "https://modulargrid.net/e/4ms-company-metaaio",
     "mgModuleId": 50268
+  },
+  {
+    "pluginSlug": "Klavis",
+    "moduleSlug": "Flexshaper",
+    "vcvUrl": "https://library.vcvrack.com/Klavis/Flexshaper",
+    "mgUrl": "https://modulargrid.net/e/klavis-flexshaper",
+    "mgModuleId": 25292
+  },
+  {
+    "pluginSlug": "Klavis",
+    "moduleSlug": "ComPair",
+    "vcvUrl": "https://library.vcvrack.com/Klavis/ComPair",
+    "mgUrl": "https://modulargrid.net/e/klavis-compair",
+    "mgModuleId": 51303
+  },
+  {
+    "pluginSlug": "Klavis",
+    "moduleSlug": "TwoBits",
+    "vcvUrl": "https://library.vcvrack.com/Klavis/TwoBits",
+    "mgUrl": "https://modulargrid.net/e/klavis-two-bits",
+    "mgModuleId": 39871
+  },
+  {
+    "pluginSlug": "Klavis",
+    "moduleSlug": "LogicaXT",
+    "vcvUrl": "https://library.vcvrack.com/Klavis/LogicaXT",
+    "mgUrl": "https://modulargrid.net/e/klavis-logica-xt",
+    "mgModuleId": 18553
+  },
+  {
+    "pluginSlug": "Klavis",
+    "moduleSlug": "Tweakers",
+    "vcvUrl": "https://library.vcvrack.com/Klavis/Tweakers",
+    "mgUrl": "https://modulargrid.net/e/klavis-tweakers",
+    "mgModuleId": 42269
+  },
+  {
+    "pluginSlug": "Klavis",
+    "moduleSlug": "Mixwitch",
+    "vcvUrl": "https://library.vcvrack.com/Klavis/Mixwitch",
+    "mgUrl": "https://modulargrid.net/e/klavis-mixwitch",
+    "mgModuleId": 16225
   }
 ]
\ No newline at end of file
diff --git a/manifests-cache.json b/manifests-cache.json
index 53032098..111be81b 100644
--- a/manifests-cache.json
+++ b/manifests-cache.json
@@ -15339,7 +15339,7 @@
     }
   },
   "Sulamith": {
-    "buildTimestamp": 1750788080.7787793,
+    "buildTimestamp": 1745727880.9225924,
     "creationTimestamp": 1745727881.1625378,
     "modules": {
       "ButtonA": {
@@ -15571,5 +15571,29 @@
         "creationTimestamp": 1752849878.6021922
       }
     }
+  },
+  "Klavis": {
+    "buildTimestamp": 1754062489.4440546,
+    "creationTimestamp": 1754062489.7602348,
+    "modules": {
+      "Flexshaper": {
+        "creationTimestamp": 1754062489.8288572
+      },
+      "ComPair": {
+        "creationTimestamp": 1754062489.8945444
+      },
+      "TwoBits": {
+        "creationTimestamp": 1754062489.9606466
+      },
+      "LogicaXT": {
+        "creationTimestamp": 1754062490.0309415
+      },
+      "Tweakers": {
+        "creationTimestamp": 1754062490.095818
+      },
+      "Mixwitch": {
+        "creationTimestamp": 1754062490.1608202
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/manifests/Klavis.json b/manifests/Klavis.json
new file mode 100644
index 00000000..6e1586a7
--- /dev/null
+++ b/manifests/Klavis.json
@@ -0,0 +1,82 @@
+{
+  "slug": "Klavis",
+  "name": "Klavis",
+  "version": "2.0.0",
+  "license": "proprietary",
+  "brand": "Klavis",
+  "author": "VCV",
+  "authorEmail": "support@vcvrack.com",
+  "authorUrl": "https://vcvrack.com/",
+  "pluginUrl": "https://www.klavis.com/",
+  "sourceUrl": "",
+  "donateUrl": "",
+  "changelogUrl": "https://vcvrack.com/Klavis#changelog",
+  "modules": [
+    {
+      "slug": "Flexshaper",
+      "name": "Flexshaper",
+      "description": "CV-controlled voltage mapper and waveshaper",
+      "manualUrl": "https://www.klavis.com/all-products/flexshaper",
+      "modularGridUrl": "https://modulargrid.net/e/klavis-flexshaper",
+      "tags": [
+        "Waveshaper",
+        "Polyphonic"
+      ]
+    },
+    {
+      "slug": "ComPair",
+      "name": "ComPair",
+      "description": "Dual/window voltage comparator",
+      "manualUrl": "https://www.klavis.com/all-products/compair",
+      "modularGridUrl": "https://modulargrid.net/e/klavis-compair",
+      "tags": [
+        "Logic",
+        "Polyphonic"
+      ]
+    },
+    {
+      "slug": "TwoBits",
+      "name": "Two Bits",
+      "description": "Dual logic processor with chaining and CV functions",
+      "manualUrl": "https://www.klavis.com/all-products/two-bits",
+      "modularGridUrl": "https://modulargrid.net/e/klavis-two-bits",
+      "tags": [
+        "Logic"
+      ]
+    },
+    {
+      "slug": "LogicaXT",
+      "name": "Logica XT",
+      "description": "3-input CV-controlled logic/gate processor",
+      "manualUrl": "https://www.klavis.com/all-products/logica-xt",
+      "modularGridUrl": "https://modulargrid.net/e/klavis-logica-xt",
+      "tags": [
+        "Logic"
+      ]
+    },
+    {
+      "slug": "Tweakers",
+      "name": "Tweakers",
+      "description": "Dual gain, offset, polarity, and mute",
+      "manualUrl": "https://www.klavis.com/all-products/tweakers",
+      "modularGridUrl": "https://modulargrid.net/e/klavis-tweakers",
+      "tags": [
+        "Mixer",
+        "Attenuator",
+        "Polyphonic"
+      ]
+    },
+    {
+      "slug": "Mixwitch",
+      "name": "Mixwitch",
+      "description": "Mixer & CV/clock-controlled switcher",
+      "manualUrl": "https://www.klavis.com/all-products/mixwitch",
+      "modularGridUrl": "https://modulargrid.net/e/klavis-mixwitch",
+      "tags": [
+        "Mixer",
+        "Switch",
+        "Polyphonic"
+      ]
+    }
+  ]
+}
\ No newline at end of file