diff --git a/config.yaml b/config.yaml
index fafd3407..05fe9c28 100644
--- a/config.yaml
+++ b/config.yaml
@@ -51,6 +51,12 @@ params:
             issueTerm: pathname
             label:
 
+        beaudar:
+            repo:
+            issueTerm: pathname
+            label:
+            theme:        
+
         remark42:
             host:
             site:
diff --git a/exampleSite/config.yaml b/exampleSite/config.yaml
index 30a37daf..d8c02fe7 100644
--- a/exampleSite/config.yaml
+++ b/exampleSite/config.yaml
@@ -93,6 +93,12 @@ params:
             issueTerm: pathname
             label:
 
+        beaudar:
+            repo:
+            issueTerm: pathname
+            label:
+            theme:        
+
         remark42:
             host:
             site:
diff --git a/layouts/partials/comments/provider/beaudar.html b/layouts/partials/comments/provider/beaudar.html
new file mode 100644
index 00000000..761801fa
--- /dev/null
+++ b/layouts/partials/comments/provider/beaudar.html
@@ -0,0 +1,46 @@
+<script
+  src="https://beaudar.lipk.org/client.js"
+  repo="{{ .Site.Params.comments.beaudar.repo }}"
+  issue-term="{{ .Site.Params.comments.beaudar.issueTerm }}"
+  {{ with .Site.Params.comments.beaudar.label }}
+  label="{{ . }}"
+  {{ end }}
+  theme="{{ .Site.Params.comments.beaudar.theme }}"
+  crossorigin="anonymous"
+  async
+></script>
+
+<style>
+  .beaudar {
+    max-width: unset;
+  }
+</style>
+
+<script>
+  let beaudarLoaded = false;
+
+  function setBeaudarTheme(theme) {
+    let beaudar = document.querySelector(".beaudar iframe");
+    if (beaudar) {
+      beaudar.contentWindow.postMessage(
+        {
+          type: "set-theme",
+          theme: `github-${theme}`,
+        },
+        "https://beaudar.lipk.org"
+      );
+    }
+  }
+
+  addEventListener("message", (event) => {
+    if (event.origin !== "https://beaudar.lipk.org") return;
+    /// Called when Beaudar is ready
+    beaudarLoaded = true;
+    setBeaudarTheme(document.documentElement.dataset.scheme);
+  });
+
+  window.addEventListener("onColorSchemeChange", (e) => {
+    if (!beaudarLoaded) return;
+    setBeaudarTheme(e.detail);
+  });
+</script>