diff --git a/quartz/bootstrap-cli.mjs b/quartz/bootstrap-cli.mjs
index 0bb078a..0094a4f 100755
--- a/quartz/bootstrap-cli.mjs
+++ b/quartz/bootstrap-cli.mjs
@@ -121,7 +121,7 @@ async function popContentFolder(contentFolder) {
 }
 
 function gitPull(origin, branch) {
-  const flags = ["-s", "recursive", "-X", "ours"]
+  const flags = ["-s", "recursive", "-X", "ours", "--no-edit"]
   spawnSync("git", ["pull", ...flags, origin, branch], { stdio: "inherit" })
 }
 
@@ -334,7 +334,6 @@ See the [documentation](https://quartz.jzhao.xyz) for how to get started.
                     sourcefile,
                   },
                   write: false,
-                  minify: true,
                   bundle: true,
                   platform: "browser",
                   format: "esm",
diff --git a/quartz/plugins/transformers/ofm.ts b/quartz/plugins/transformers/ofm.ts
index 70155e0..a9beda4 100644
--- a/quartz/plugins/transformers/ofm.ts
+++ b/quartz/plugins/transformers/ofm.ts
@@ -414,7 +414,13 @@ export const ObsidianFlavoredMarkdown: QuartzTransformerPlugin<Partial<Options>
         js.push({
           script: `
           import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid/dist/mermaid.esm.min.mjs';
-          mermaid.initialize({ startOnLoad: true });
+          document.addEventListener('nav', async () => {
+            const darkMode = document.documentElement.getAttribute('saved-theme') === 'dark'
+            mermaid.initialize({ 
+              securityLevel: 'loose',
+              theme: darkMode ? 'dark' : 'default'
+            });
+          });
           `,
           loadTime: "afterDOMReady",
           moduleType: "module",
diff --git a/quartz/styles/base.scss b/quartz/styles/base.scss
index 8253c5b..7291939 100644
--- a/quartz/styles/base.scss
+++ b/quartz/styles/base.scss
@@ -310,6 +310,7 @@ pre {
 
   &:has(> code.mermaid) {
     border: none;
+    position: relative;
   }
 
   & > code {