diff --git a/themes/gruvbox-dark/v1/code-block.css b/themes/gruvbox-dark/v1/code-block.css
new file mode 100644
index 0000000..a1b724c
--- /dev/null
+++ b/themes/gruvbox-dark/v1/code-block.css
@@ -0,0 +1 @@
+pre[class*="language-"] {     --base: #282828;     --surface: #3c3836;     --overlay: #504945;     --muted: #928374;     --subtle: #928374;     --text: #ebdbb2;     --love: #fb4934;     --gold: #fabd2f;     --rose: #d3869b;     --pine: #b8bb26;     --foam: #8ec07c;     --iris: #83a598;     --highlight-low: #3c3836;     --highlight-med: #504945;     --highlight-high: #928374;     --code-block-bg: #32302f; }  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/gruvbox-dark/v1/theme.json b/themes/gruvbox-dark/v1/theme.json
new file mode 100644
index 0000000..daf4ce4
--- /dev/null
+++ b/themes/gruvbox-dark/v1/theme.json
@@ -0,0 +1,145 @@
+{
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
+  "name": "Gruvbox Dark",
+  "id": "gruvbox-dark",
+  "version": 1,
+  "license": "GPL-3.0-or-later",
+  "homepage": "https://notesnook.com",
+  "description": "Gruvbox Dark theme",
+  "colorScheme": "dark",
+  "compatibilityVersion": 1,
+  "authors": [
+    {
+      "name": "riiku",
+      "url": "https://tech.lgbt/@riiku"
+    }
+  ],
+  "scopes": {
+    "base": {
+      "primary": {
+        "accent": "#d65d0e",
+        "paragraph": "#ebdbb2",
+        "background": "#282828",
+        "border": "#282828",
+        "heading": "#ebdbb2",
+        "icon": "#d65d0e",
+        "separator": "#3c3836",
+        "placeholder": "#928374",
+        "hover": "#3c3836",
+        "accentForeground": "#282828",
+        "backdrop": "#28282899"
+      },
+      "secondary": {
+        "accent": "#d65d0e",
+        "paragraph": "#ebdbb2",
+        "background": "#3c3836",
+        "border": "#928374",
+        "heading": "#ebdbb2",
+        "icon": "#ebdbb2",
+        "separator": "#928374",
+        "placeholder": "#928374",
+        "hover": "#3c3836",
+        "accentForeground": "#282828",
+        "backdrop": "#28282899"
+      },
+      "disabled": {
+        "accent": "#d65d0e",
+        "paragraph": "#ebdbb2",
+        "background": "#928374",
+        "border": "#928374",
+        "heading": "#ebdbb2",
+        "icon": "#ebdbb2",
+        "separator": "#928374",
+        "placeholder": "#ebdbb2",
+        "hover": "#928374",
+        "accentForeground": "#282828",
+        "backdrop": "#28282899"
+      },
+      "selected": {
+        "accent": "#d65d0e",
+        "paragraph": "#ebdbb2",
+        "background": "#504945",
+        "border": "#d65d0e",
+        "heading": "#ebdbb2",
+        "icon": "#d65d0e",
+        "separator": "#928374",
+        "placeholder": "#928374",
+        "hover": "#3c3836",
+        "accentForeground": "#282828",
+        "backdrop": "#28282899"
+      },
+      "error": {
+        "accent": "#fb4934",
+        "paragraph": "#fb4934",
+        "background": "#3c3836",
+        "border": "#928374",
+        "heading": "#fb4934",
+        "icon": "#fb4934",
+        "separator": "#928374",
+        "placeholder": "#928374",
+        "hover": "#928374",
+        "accentForeground": "#282828",
+        "backdrop": "#28282899"
+      },
+      "success": {
+        "accent": "#b8bb26",
+        "paragraph": "#b8bb26",
+        "background": "#3c3836",
+        "border": "#928374",
+        "heading": "#b8bb26",
+        "icon": "#b8bb26",
+        "separator": "#928374",
+        "placeholder": "#928374",
+        "hover": "#928374",
+        "accentForeground": "#282828",
+        "backdrop": "#28282899"
+      }
+    },
+    "statusBar": {
+      "primary": {
+        "paragraph": "#ebdbb2",
+        "background": "#282828",
+        "separator": "#282828"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#ebdbb2",
+        "background": "#3c3836",
+        "hover": "#282828"
+      },
+      "secondary": {
+        "paragraph": "#ebdbb2"
+      }
+    },
+    "editor": {
+      "primary": {
+        "background": "#282828",
+        "border": "#928374"
+      },
+      "secondary": {
+        "paragraph": "#928374",
+        "border": "#282828"
+      }
+    },
+    "editorToolbar": {
+      "primary": {
+        "background": "#3c3836",
+        "hover": "#92837433"
+      },
+      "secondary": {
+        "background": "#92837433"
+      }
+    },
+    "navigationMenu": {
+      "primary": {
+        "background": "#282828"
+      }
+    },
+    "sheet": {
+      "selected": {
+        "paragraph": "#b8bb26"
+      }
+    }
+  }
+}
diff --git a/themes/gruvbox-light/v1/code-block.css b/themes/gruvbox-light/v1/code-block.css
new file mode 100644
index 0000000..2dbb5fd
--- /dev/null
+++ b/themes/gruvbox-light/v1/code-block.css
@@ -0,0 +1 @@
+pre[class*="language-"] {     --base: #fbf1c7;     --surface: #ebdbb2;     --overlay: #d5c4a1;     --muted: #a89984;     --subtle: #a89984;     --text: #3c3836;     --love: #cc241d;     --gold: #d79921;     --rose: #b16286;     --pine: #98971a;     --foam: #689d6a;     --iris: #458588;     --highlight-low: #ebdbb2;     --highlight-med: #d5c4a1;     --highlight-high: #a89984;     --code-block-bg: #f9f5d7; }  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/gruvbox-light/v1/theme.json b/themes/gruvbox-light/v1/theme.json
new file mode 100644
index 0000000..a97f20d
--- /dev/null
+++ b/themes/gruvbox-light/v1/theme.json
@@ -0,0 +1,145 @@
+{
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
+  "name": "Gruvbox Light",
+  "id": "gruvbox-light",
+  "version": 1,
+  "license": "GPL-3.0-or-later",
+  "homepage": "https://notesnook.com",
+  "description": "Gruvbox Light theme",
+  "colorScheme": "light",
+  "compatibilityVersion": 1,
+  "authors": [
+    {
+      "name": "riiku",
+      "url": "https://tech.lgbt/@riiku"
+    }
+  ],
+  "scopes": {
+    "base": {
+      "primary": {
+        "accent": "#d65d0e",
+        "paragraph": "#3c3836",
+        "background": "#fbf1c7",
+        "border": "#fbf1c7",
+        "heading": "#3c3836",
+        "icon": "#d65d0e",
+        "separator": "#ebdbb2",
+        "placeholder": "#a89984",
+        "hover": "#f2e5bc",
+        "accentForeground": "#fbf1c7",
+        "backdrop": "#fbf1c799"
+      },
+      "secondary": {
+        "accent": "#d65d0e",
+        "paragraph": "#3c3836",
+        "background": "#ebdbb2",
+        "border": "#a89984",
+        "heading": "#3c3836",
+        "icon": "#3c3836",
+        "separator": "#a89984",
+        "placeholder": "#a89984",
+        "hover": "#f2e5bc",
+        "accentForeground": "#fbf1c7",
+        "backdrop": "#fbf1c799"
+      },
+      "disabled": {
+        "accent": "#d65d0e",
+        "paragraph": "#3c3836",
+        "background": "#a89984",
+        "border": "#a89984",
+        "heading": "#3c3836",
+        "icon": "#3c3836",
+        "separator": "#a89984",
+        "placeholder": "#3c3836",
+        "hover": "#f2e5bc",
+        "accentForeground": "#fbf1c7",
+        "backdrop": "#fbf1c799"
+      },
+      "selected": {
+        "accent": "#d65d0e",
+        "paragraph": "#3c3836",
+        "background": "#d5c4a1",
+        "border": "#d65d0e",
+        "heading": "#3c3836",
+        "icon": "#d65d0e",
+        "separator": "#a89984",
+        "placeholder": "#a89984",
+        "hover": "#f2e5bc",
+        "accentForeground": "#fbf1c7",
+        "backdrop": "#fbf1c799"
+      },
+      "error": {
+        "accent": "#cc241d",
+        "paragraph": "#cc241d",
+        "background": "#ebdbb2",
+        "border": "#a89984",
+        "heading": "#cc241d",
+        "icon": "#cc241d",
+        "separator": "#a89984",
+        "placeholder": "#a89984",
+        "hover": "#f2e5bc",
+        "accentForeground": "#fbf1c7",
+        "backdrop": "#fbf1c799"
+      },
+      "success": {
+        "accent": "#98971a",
+        "paragraph": "#98971a",
+        "background": "#ebdbb2",
+        "border": "#a89984",
+        "heading": "#98971a",
+        "icon": "#98971a",
+        "separator": "#a89984",
+        "placeholder": "#a89984",
+        "hover": "#f2e5bc",
+        "accentForeground": "#fbf1c7",
+        "backdrop": "#fbf1c799"
+      }
+    },
+    "statusBar": {
+      "primary": {
+        "paragraph": "#3c3836",
+        "background": "#f2e5bc",
+        "separator": "#f2e5bc"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#3c3836",
+        "background": "#ebdbb2",
+        "hover": "#f2e5bc"
+      },
+      "secondary": {
+        "paragraph": "#3c3836"
+      }
+    },
+    "editor": {
+      "primary": {
+        "background": "#f2e5bc",
+        "border": "#a89984"
+      },
+      "secondary": {
+        "paragraph": "#a89984",
+        "border": "#fbf1c7"
+      }
+    },
+    "editorToolbar": {
+      "primary": {
+        "background": "#ebdbb2",
+        "hover": "#a8998433"
+      },
+      "secondary": {
+        "background": "#a8998433"
+      }
+    },
+    "navigationMenu": {
+      "primary": {
+        "background": "#fbf1c7"
+      }
+    },
+    "sheet": {
+      "selected": {
+        "paragraph": "#98971a"
+      }
+    }
+  }
+}