diff --git a/themes/solarized-dark/v1/code-block.css b/themes/solarized-dark/v1/code-block.css
new file mode 100644
index 0000000..79b034d
--- /dev/null
+++ b/themes/solarized-dark/v1/code-block.css
@@ -0,0 +1 @@
+pre[class*="language-"] {     --base: #002b36;     --surface: #073642;     --overlay: #586e75;     --muted: #586e75;     --subtle: #586e75;     --text: #839496;     --love: #dc322f;     --gold: #b58900;     --rose: #cb4b16;     --pine: #859900;     --foam: #2aa198;     --iris: #268bd2;     --highlight-low: #073642;     --highlight-med: #657b83;     --highlight-high: #586e75;     --code-block-bg: #073642; }  code[class*="language-"], pre[class*="language-"] {     background: var(--code-block-bg);     color: var(--text);     font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;     font-size: 1em;     direction: ltr;     text-align: left;     white-space: pre;     word-spacing: normal;     word-break: normal;     line-height: 1.5;     -moz-tab-size: 4;     -o-tab-size: 4;     tab-size: 4;     -webkit-hyphens: none;     -moz-hyphens: none;     -ms-hyphens: none;     hyphens: none; }  code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection, pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection, code[class*="language-"]::selection, code[class*="language-"] ::selection, pre[class*="language-"]::selection, pre[class*="language-"] ::selection {     background: var(--highlight-med); }  pre[class*="language-"] {     padding: 1em;     margin: 0.5em 0;     overflow: auto;     border-radius: unset; }  :not(pre) > code[class*="language-"] {     padding: 0.1em;     border-radius: unset;     white-space: normal; }  .token.comment, .token.prolog, .token.cdata, .token.doctype {     color: var(--muted); }  .token.punctuation {     color: var(--subtle); }  .token.entity {     color: var(--pine);  }  .token.boolean {     color: var(--rose); }  .token.attr-name {     color: var(--foam); }  .token.class-name {     color: var(--text); }  .token.constant {     color: var(--love);     font-style: italic; }  .token.number {     color: var(--foam); }  .token.atrule {     color: var(--love); }  .token.keyword {     color: var(--pine); }  .token.property {     color: var(--foam); }  .token.tag {     color: var(--foam); }  .token.symbol {     color: unset; }  .token.deleted {     color: var(--love); }  .token.important {     color: var(--love); }  .token.selector {     color: var(--rose); }  .token.string {     color: var(--gold); }  .token.char {     color: var(--gold); }  .token.builtin {     color: var(--love); }  .token.inserted {     color: var(--foam); }  .token.regex {     color: var(--gold); }  .token.attr-value {     color: var(--gold); }  .token.variable {     color: var(--text); }  .token.operator {     color: var(--subtle); }  .token.function {     color: var(--rose);     font-style: italic; }  .token.url {     color: var(--iris); }  .token.bold {     font-weight: bold; }  .token.italic {     font-style: italic; }  .token.entity {     cursor: help; }  .token.namespace {     opacity: 0.7; }
\ No newline at end of file
diff --git a/themes/solarized-dark/v1/theme.json b/themes/solarized-dark/v1/theme.json
new file mode 100644
index 0000000..6b2f44b
--- /dev/null
+++ b/themes/solarized-dark/v1/theme.json
@@ -0,0 +1,145 @@
+{
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
+  "name": "Solarized Dark",
+  "id": "solarized-dark",
+  "version": 1,
+  "license": "GPL-3.0-or-later",
+  "homepage": "https://notesnook.com",
+  "description": "Solarized Dark theme",
+  "colorScheme": "dark",
+  "compatibilityVersion": 1,
+  "authors": [
+    {
+      "name": "riiku",
+      "url": "https://tech.lgbt/@riiku"
+    }
+  ],
+  "scopes": {
+    "base": {
+      "primary": {
+        "accent": "#268bd2",
+        "paragraph": "#839496",
+        "background": "#002b36",
+        "border": "#002b36",
+        "heading": "#839496",
+        "icon": "#268bd2",
+        "separator": "#073642",
+        "placeholder": "#586e75",
+        "hover": "#073642",
+        "accentForeground": "#002b36",
+        "backdrop": "#002b3699"
+      },
+      "secondary": {
+        "accent": "#268bd2",
+        "paragraph": "#839496",
+        "background": "#073642",
+        "border": "#586e75",
+        "heading": "#839496",
+        "icon": "#839496",
+        "separator": "#586e75",
+        "placeholder": "#586e75",
+        "hover": "#073642",
+        "accentForeground": "#002b36",
+        "backdrop": "#002b3699"
+      },
+      "disabled": {
+        "accent": "#268bd2",
+        "paragraph": "#839496",
+        "background": "#586e75",
+        "border": "#586e75",
+        "heading": "#839496",
+        "icon": "#839496",
+        "separator": "#586e75",
+        "placeholder": "#839496",
+        "hover": "#586e75",
+        "accentForeground": "#002b36",
+        "backdrop": "#002b3699"
+      },
+      "selected": {
+        "accent": "#268bd2",
+        "paragraph": "#839496",
+        "background": "#073642",
+        "border": "#268bd2",
+        "heading": "#839496",
+        "icon": "#268bd2",
+        "separator": "#586e75",
+        "placeholder": "#586e75",
+        "hover": "#073642",
+        "accentForeground": "#002b36",
+        "backdrop": "#002b3699"
+      },
+      "error": {
+        "accent": "#dc322f",
+        "paragraph": "#dc322f",
+        "background": "#073642",
+        "border": "#586e75",
+        "heading": "#dc322f",
+        "icon": "#dc322f",
+        "separator": "#586e75",
+        "placeholder": "#586e75",
+        "hover": "#586e75",
+        "accentForeground": "#002b36",
+        "backdrop": "#002b3699"
+      },
+      "success": {
+        "accent": "#859900",
+        "paragraph": "#859900",
+        "background": "#073642",
+        "border": "#586e75",
+        "heading": "#859900",
+        "icon": "#859900",
+        "separator": "#586e75",
+        "placeholder": "#586e75",
+        "hover": "#586e75",
+        "accentForeground": "#002b36",
+        "backdrop": "#002b3699"
+      }
+    },
+    "statusBar": {
+      "primary": {
+        "paragraph": "#839496",
+        "background": "#002b36",
+        "separator": "#002b36"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#839496",
+        "background": "#073642",
+        "hover": "#002b36"
+      },
+      "secondary": {
+        "paragraph": "#839496"
+      }
+    },
+    "editor": {
+      "primary": {
+        "background": "#002b36",
+        "border": "#586e75"
+      },
+      "secondary": {
+        "paragraph": "#586e75",
+        "border": "#002b36"
+      }
+    },
+    "editorToolbar": {
+      "primary": {
+        "background": "#073642",
+        "hover": "#586e7533"
+      },
+      "secondary": {
+        "background": "#586e7533"
+      }
+    },
+    "navigationMenu": {
+      "primary": {
+        "background": "#002b36"
+      }
+    },
+    "sheet": {
+      "selected": {
+        "paragraph": "#859900"
+      }
+    }
+  }
+}
diff --git a/themes/solarized-light/v1/code-block.css b/themes/solarized-light/v1/code-block.css
new file mode 100644
index 0000000..52ed5b2
--- /dev/null
+++ b/themes/solarized-light/v1/code-block.css
@@ -0,0 +1 @@
+pre[class*="language-"] {--base: #fdf6e3;--surface: #eee8d5;--overlay: #93a1a1;--muted: #93a1a1;--subtle: #93a1a1;--text: #586e75;--love: #dc322f;--gold: #b58900;--rose: #cb4b16;--pine: #859900;--foam: #2aa198;--iris: #268bd2;--highlight-low: #eee8d5;--highlight-med: #93a1a1;--highlight-high: #93a1a1;--code-block-bg: #eee8d5;}code[class*="language-"], pre[class*="language-"] {background: var(--code-block-bg);color: var(--text);font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;font-size: 1em;direction: ltr;text-align: left;white-space: pre;word-spacing: normal;word-break: normal;line-height: 1.5;-moz-tab-size: 4;-o-tab-size: 4;tab-size: 4;-webkit-hyphens: none;-moz-hyphens: none;-ms-hyphens: none;hyphens: none;}code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection, pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection, code[class*="language-"]::selection, code[class*="language-"] ::selection, pre[class*="language-"]::selection, pre[class*="language-"] ::selection {background: var(--highlight-med);}pre[class*="language-"] {padding: 1em;margin: 0.5em 0;overflow: auto;border-radius: unset;}:not(pre) > code[class*="language-"] {padding: 0.1em;border-radius: unset;white-space: normal;}.token.comment, .token.prolog, .token.cdata, .token.doctype {color: var(--muted);}.token.punctuation {color: var(--subtle);}.token.entity {color: var(--pine);}.token.boolean {color: var(--rose);}.token.attr-name {color: var(--foam);}.token.class-name {color: var(--text);}.token.constant {color: var(--love);font-style: italic;}.token.number {color: var(--foam);}.token.atrule {color: var(--love);}.token.keyword {color: var(--pine);}.token.property {color: var(--foam);}.token.tag {color: var(--foam);}.token.symbol {color: unset;}.token.deleted {color: var(--love);}.token.important {color: var(--love);}.token.selector {color: var(--rose);}.token.string {color: var(--gold);}.token.char {color: var(--gold);}.token.builtin {color: var(--love);}.token.inserted {color: var(--foam);}.token.regex {color: var(--gold);}.token.attr-value {color: var(--gold);}.token.variable {color: var(--text);}.token.operator {color: var(--subtle);}.token.function {color: var(--rose);font-style: italic;}.token.url {color: var(--iris);}.token.bold {font-weight: bold;}.token.italic {font-style: italic;}.token.entity {cursor: help;}.token.namespace {opacity: 0.7;}
\ No newline at end of file
diff --git a/themes/solarized-light/v1/theme.json b/themes/solarized-light/v1/theme.json
new file mode 100644
index 0000000..13ad7eb
--- /dev/null
+++ b/themes/solarized-light/v1/theme.json
@@ -0,0 +1,145 @@
+{
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
+  "name": "Solarized Light",
+  "id": "solarized-light",
+  "version": 1,
+  "license": "GPL-3.0-or-later",
+  "homepage": "https://notesnook.com",
+  "description": "Solarized Light theme",
+  "colorScheme": "light",
+  "compatibilityVersion": 1,
+  "authors": [
+    {
+      "name": "riiku",
+      "url": "https://tech.lgbt/@riiku"
+    }
+  ],
+  "scopes": {
+    "base": {
+      "primary": {
+        "accent": "#b48800",
+        "paragraph": "#586e75",
+        "background": "#fdf6e3",
+        "border": "#fdf6e3",
+        "heading": "#586e75",
+        "icon": "#b48800",
+        "separator": "#eee8d5",
+        "placeholder": "#93a1a1",
+        "hover": "#eee8d5",
+        "accentForeground": "#fdf6e3",
+        "backdrop": "#fdf6e399"
+      },
+      "secondary": {
+        "accent": "#b48800",
+        "paragraph": "#586e75",
+        "background": "#eee8d5",
+        "border": "#93a1a1",
+        "heading": "#586e75",
+        "icon": "#586e75",
+        "separator": "#93a1a1",
+        "placeholder": "#93a1a1",
+        "hover": "#eee8d5",
+        "accentForeground": "#fdf6e3",
+        "backdrop": "#fdf6e399"
+      },
+      "disabled": {
+        "accent": "#b48800",
+        "paragraph": "#586e75",
+        "background": "#93a1a1",
+        "border": "#93a1a1",
+        "heading": "#586e75",
+        "icon": "#586e75",
+        "separator": "#93a1a1",
+        "placeholder": "#586e75",
+        "hover": "#eee8d5",
+        "accentForeground": "#fdf6e3",
+        "backdrop": "#fdf6e399"
+      },
+      "selected": {
+        "accent": "#b48800",
+        "paragraph": "#586e75",
+        "background": "#eee8d5",
+        "border": "#b48800",
+        "heading": "#586e75",
+        "icon": "#b48800",
+        "separator": "#93a1a1",
+        "placeholder": "#93a1a1",
+        "hover": "#eee8d5",
+        "accentForeground": "#fdf6e3",
+        "backdrop": "#fdf6e399"
+      },
+      "error": {
+        "accent": "#dc322f",
+        "paragraph": "#dc322f",
+        "background": "#eee8d5",
+        "border": "#93a1a1",
+        "heading": "#dc322f",
+        "icon": "#dc322f",
+        "separator": "#93a1a1",
+        "placeholder": "#93a1a1",
+        "hover": "#eee8d5",
+        "accentForeground": "#fdf6e3",
+        "backdrop": "#fdf6e399"
+      },
+      "success": {
+        "accent": "#859900",
+        "paragraph": "#859900",
+        "background": "#eee8d5",
+        "border": "#93a1a1",
+        "heading": "#859900",
+        "icon": "#859900",
+        "separator": "#93a1a1",
+        "placeholder": "#93a1a1",
+        "hover": "#eee8d5",
+        "accentForeground": "#fdf6e3",
+        "backdrop": "#fdf6e399"
+      }
+    },
+    "statusBar": {
+      "primary": {
+        "paragraph": "#586e75",
+        "background": "#fdf6e3",
+        "separator": "#fdf6e3"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#586e75",
+        "background": "#eee8d5",
+        "hover": "#fdf6e3"
+      },
+      "secondary": {
+        "paragraph": "#586e75"
+      }
+    },
+    "editor": {
+      "primary": {
+        "background": "#fdf6e3",
+        "border": "#93a1a1"
+      },
+      "secondary": {
+        "paragraph": "#93a1a1",
+        "border": "#fdf6e3"
+      }
+    },
+    "editorToolbar": {
+      "primary": {
+        "background": "#eee8d5",
+        "hover": "#93a1a133"
+      },
+      "secondary": {
+        "background": "#93a1a133"
+      }
+    },
+    "navigationMenu": {
+      "primary": {
+        "background": "#fdf6e3"
+      }
+    },
+    "sheet": {
+      "selected": {
+        "paragraph": "#859900"
+      }
+    }
+  }
+}
\ No newline at end of file