diff --git a/templates/logseq.mustache b/templates/logseq.mustache
index 7cba6c1..5bc7a3f 100644
--- a/templates/logseq.mustache
+++ b/templates/logseq.mustache
@@ -17,10 +17,13 @@
   --base0D: #{{base0D-hex}};
   --base0E: #{{base0E-hex}};
   --base0F: #{{base0F-hex}};
+  --button-blue: var(--base0C);
+  --button-gray-1: var(--base05);
+  --button-gray-2: var(--base06);
+  --button-gray-3: var(--base07);
 }
 
 /** LogSeq **/
-
 .dark-theme {
     background-color: var(--base00);
     color: var(--base05);
@@ -42,7 +45,9 @@
     background-color: var(--base00);
 }
 
-.dark-theme .page-references h2, .dark-theme h1.title, .dark-theme .title {
+.dark-theme .page-references h2,
+.dark-theme h1.title,
+.dark-theme .title {
     color: var(--base05);
 }
 
@@ -59,11 +64,17 @@
     border-top: 1px solid var(--base01);
 }
 
-.dark-theme a, .dark-theme .content a, .dark-theme button.menu, .dark-theme #search-wrapper {
+.dark-theme a,
+.dark-theme .content a,
+.dark-theme button.menu,
+.dark-theme #search-wrapper {
     color: var(--base0A);
 }
 
-.dark-theme a.menu-link:hover, .dark-theme button.menu:focus, .dark-theme button.pull:hover, dark-theme #search-wrapper:focus-within {
+.dark-theme a.menu-link:hover,
+.dark-theme button.menu:focus,
+.dark-theme button.pull:hover,
+dark-theme #search-wrapper:focus-within {
     background-color: var(--base01);
 }
 
@@ -75,71 +86,140 @@
     border-bottom: 1px solid var(--base06);
 }
 
+.dark-theme .focus\:shadow-outline:focus {
+    box-shadow: 0 0 0 3px var(--base0A);
+}
+
+.dark-theme #search-wrapper:focus-within {
+    color: var(--base0A);
+}
+
 .dark-theme .bullet-container .bullet {
     background-color: var(--base0A);
 }
 
-.dark-theme blockquote {
+.dark-theme .bullet-closed {
+    background-color: var(--base02);
+}
+
+.dark-theme ::-webkit-scrollbar-thumb {
+    background-color: var(--base01);
+}
+
+.dark-theme ::-webkit-scrollbar-track-piece {
     background-color: var(--base00);
-    border-left: 3px solid var(--base01);
 }
 
-.dark-theme #right-sidebar .non-block-editor textarea, .dark-theme #right-sidebar pre, .dark-theme #right-sidebar pre.code {
-    background: var(--base01);
-}
-
-.dark-theme #right-sidebar pre.CodeMirror-line {
-    background: var(--base00);
-}
-
-.dark-theme :not(pre)>code {
-    background: var(--base01);
-}
-
-.dark-theme hr {
-  	color: var(--base01);
+.dark-theme #journals .journal {
+    border-top-color: var(--base01);
 }
 
 /** CodeMirror **/
+.cm-s-default .CodeMirror {
+    background: var(--base00);
+    color: var(--base05);
+}
+.cm-s-default div.CodeMirror-selected {
+    background: var(--base02);
+}
+.cm-s-default .CodeMirror-line::selection,
+.cm-s-default .CodeMirror-line > span::selection,
+.cm-s-default .CodeMirror-line > span > span::selection {
+    background: rgba(73, 72, 62, .99);
+}
+.cm-s-default .CodeMirror-line::-moz-selection,
+.cm-s-default .CodeMirror-line > span::-moz-selection,
+.cm-s-default .CodeMirror-line > span > span::-moz-selection {
+    background: rgba(73, 72, 62, .99);
+}
+.cm-s-default .CodeMirror-gutters {
+    background: var(--base00);
+    border-right: 0px;
+}
+.cm-s-default .CodeMirror-guttermarker {
+    color: white;
+}
+.cm-s-default .CodeMirror-guttermarker-subtle {
+    color: #d0d0d0;
+}
+.cm-s-default .CodeMirror-linenumber {
+    color: #d0d0d0;
+}
+.cm-s-default .CodeMirror-cursor {
+    border-left: 1px solid #f8f8f0;
+}
 
-.CodeMirror { background: var(--base00); color:var(--base05); }
-.cm-s-default .CodeMirror { background: var(--base00); color:var(--base05); }
-.cm-s-default div.CodeMirror-selected { background:var(--base02); }
-.cm-s-default .CodeMirror-line::selection, .cm-s-default .CodeMirror-line > span::selection, .cm-s-default .CodeMirror-line > span > span::selection { background: rgba(73, 72, 62, .99); }
-.cm-s-default .CodeMirror-line::-moz-selection, .cm-s-default .CodeMirror-line > span::-moz-selection, .cm-s-default .CodeMirror-line > span > span::-moz-selection { background: rgba(73, 72, 62, .99); }
-.cm-s-default .CodeMirror-gutters { background: var(--base00); border-right: 0px; }
-.cm-s-default .CodeMirror-guttermarker { color: white; }
-.cm-s-default .CodeMirror-guttermarker-subtle { color: #d0d0d0; }
-.cm-s-default .CodeMirror-linenumber { color: var(--base03); }
-.cm-s-default .CodeMirror-cursor { border-left: 1px solid #f8f8f0; }
+.cm-s-default span.cm-comment {
+    color: var(--base03);
+}
+.cm-s-default span.cm-atom {
+    color: var(--base0E);
+}
+.cm-s-default span.cm-number {
+    color: var(--base0E);
+}
 
-.cm-s-default span.cm-comment { color: var(--base03); }
-.cm-s-default span.cm-atom { color: var(--base0E); }
-.cm-s-default span.cm-number { color: var(--base0E); }
-.cm-s-default span.cm-qualifier { color: var(--base08); }
+.cm-s-default span.cm-comment.cm-attribute {
+    color: #97b757;
+}
+.cm-s-default span.cm-comment.cm-def {
+    color: #bc9262;
+}
+.cm-s-default span.cm-comment.cm-tag {
+    color: #bc6283;
+}
+.cm-s-default span.cm-comment.cm-type {
+    color: #5998a6;
+}
 
-.cm-s-default span.cm-comment.cm-attribute { color: #97b757; }
-.cm-s-default span.cm-comment.cm-def { color: #bc9262; }
-.cm-s-default span.cm-comment.cm-tag { color: #bc6283; }
-.cm-s-default span.cm-comment.cm-type { color: #5998a6; }
+.cm-s-default span.cm-property,
+.cm-s-default span.cm-attribute {
+    color: var(--base0B);
+}
+.cm-s-default span.cm-keyword {
+    color: var(--base08);
+}
+.cm-s-default span.cm-builtin {
+    color: var(--base0D);
+}
+.cm-s-default span.cm-string {
+    color: #e6db74;
+}
 
-.cm-s-default span.cm-property, .cm-s-default span.cm-attribute { color: var(--base0B); }
-.cm-s-default span.cm-keyword { color: var(--base08); }
-.cm-s-default span.cm-builtin { color: var(--base0D); }
-.cm-s-default span.cm-string { color: #e6db74; }
+.cm-s-default span.cm-variable {
+    color: var(--base05);
+}
+.cm-s-default span.cm-variable-2 {
+    color: #9effff;
+}
+.cm-s-default span.cm-variable-3,
+.cm-s-default span.cm-type {
+    color: var(--base0D);
+}
+.cm-s-default span.cm-def {
+    color: var(--base09);
+}
+.cm-s-default span.cm-bracket {
+    color: var(--base05);
+}
+.cm-s-default span.cm-tag {
+    color: var(--base08);
+}
+.cm-s-default span.cm-header {
+    color: var(--base0E);
+}
+.cm-s-default span.cm-link {
+    color: var(--base0E);
+}
+.cm-s-default span.cm-error {
+    background: var(--base08);
+    color: #f8f8f0;
+}
 
-.cm-s-default span.cm-variable { color:var(--base05); }
-.cm-s-default span.cm-variable-2 { color: #9effff; }
-.cm-s-default span.cm-variable-3, .cm-s-default span.cm-type { color: var(--base0D); }
-.cm-s-default span.cm-def { color:var(--base09); }
-.cm-s-default span.cm-bracket { color:var(--base05); }
-.cm-s-default span.cm-tag { color: var(--base08); }
-.cm-s-default span.cm-header { color: var(--base0E); }
-.cm-s-default span.cm-link { color: var(--base0E); }
-.cm-s-default span.cm-error { background: var(--base08); color: #f8f8f0; }
-
-.cm-s-default .CodeMirror-activeline-background { background: #373831; }
+.cm-s-default .CodeMirror-activeline-background {
+    background: #373831;
+}
 .cm-s-default .CodeMirror-matchingbracket {
-  text-decoration: underline;
-  color: white !important;
+    text-decoration: underline;
+    color: white !important;
 }
\ No newline at end of file