diff --git a/notesnook.tera b/notesnook.tera
index f3291d8..5fb0a39 100644
--- a/notesnook.tera
+++ b/notesnook.tera
@@ -8,15 +8,11 @@ whiskers:
   hex_format: "#{{r}}{{g}}{{b}}{{z}}"
 ---
 {%- set accent = flavor.colors[accent] -%}{
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin {{ flavor.name }} {{ accent.name }}",
   "id": "catppuccin-{{ flavor.identifier }}-{{ accent.identifier }}",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "{{ if(cond=flavor.dark, t="dark", f="light") }}",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -24,6 +20,10 @@ whiskers:
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "{{ if(cond=flavor.dark, t="dark", f="light") }}",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -33,11 +33,11 @@ whiskers:
         "border": "{{ surface0.hex }}",
         "heading": "{{ text.hex }}",
         "icon": "{{ text.hex }}",
-        "separator": "{{ overlay0.hex }}",
+        "separator": "{{ surface0.hex }}",
         "placeholder": "{{ subtext0.hex }}",
         "hover": "{{ mantle.hex }}",
         "accentForeground": "{{ base.hex }}",
-        "backdrop": "#0000001a"
+        "backdrop": "{{ crust | mod(opacity=0.1) | hex }}"
       },
       "secondary": {
         "accent": "{{ accent.hex }}",
@@ -46,11 +46,11 @@ whiskers:
         "border": "{{ surface0.hex }}",
         "heading": "{{ subtext0.hex }}",
         "icon": "{{ overlay2.hex }}",
-        "separator": "{{ overlay0.hex }}",
+        "separator": "{{ surface0.hex }}",
         "placeholder": "{{ subtext0.hex }}",
         "hover": "{{ crust.hex }}",
         "accentForeground": "{{ base.hex }}",
-        "backdrop": "#0000001a"
+        "backdrop": "{{ crust | mod(opacity=0.1) | hex }}"
       },
       "disabled": {
         "accent": "{{ accent.hex }}",
@@ -59,11 +59,11 @@ whiskers:
         "border": "{{ surface0.hex }}",
         "heading": "{{ subtext0.hex }}",
         "icon": "{{ overlay1.hex }}",
-        "separator": "{{ overlay0.hex }}",
+        "separator": "{{ surface0.hex }}",
         "placeholder": "{{ subtext0.hex }}",
         "hover": "{{ surface0.hex }}",
         "accentForeground": "{{ base.hex }}",
-        "backdrop": "#0000001a"
+        "backdrop": "{{ crust | mod(opacity=0.1) | hex }}"
       },
       "selected": {
         "accent": "{{ accent.hex }}",
@@ -72,50 +72,78 @@ whiskers:
         "border": "{{ accent.hex }}",
         "heading": "{{ text.hex }}",
         "icon": "{{ text.hex }}",
-        "separator": "{{ overlay0.hex }}",
+        "separator": "{{ surface0.hex }}",
         "placeholder": "{{ subtext0.hex }}",
         "hover": "{{ mantle.hex }}",
         "accentForeground": "{{ base.hex }}",
-        "backdrop": "#0000001a"
+        "backdrop": "{{ crust | mod(opacity=0.1) | hex }}"
       },
       "error": {
         "accent": "{{ red.hex }}",
         "paragraph": "{{ red.hex }}",
-        "background": "{{ red | mod(darkness=80) | hex }}",
+        "background": "{{ base.hex }}",
         "border": "{{ surface0.hex }}",
         "heading": "{{ red.hex }}",
         "icon": "{{ red.hex }}",
-        "separator": "{{ overlay0.hex }}",
+        "separator": "{{ surface0.hex }}",
         "placeholder": "{{ subtext0.hex }}",
         "hover": "{{ surface0.hex }}",
         "accentForeground": "{{ base.hex }}",
-        "backdrop": "#0000001a"
+        "backdrop": "{{ crust | mod(opacity=0.1) | hex }}"
       },
       "success": {
         "accent": "{{ green.hex }}",
         "paragraph": "{{ green.hex }}",
-        "background": "{{ green | mod(darkness=80) | hex }}",
+        "background": "{{ base.hex }}",
         "border": "{{ surface0.hex }}",
         "heading": "{{ green.hex }}",
         "icon": "{{ green.hex }}",
-        "separator": "{{ overlay0.hex }}",
+        "separator": "{{ surface0.hex }}",
         "placeholder": "{{ subtext0.hex }}",
         "hover": "{{ surface0.hex }}",
         "accentForeground": "{{ base.hex }}",
-        "backdrop": "#0000001a"
+        "backdrop": "{{ crust | mod(opacity=0.1) | hex }}"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "{{ text.hex }}",
-        "background": "{{ mantle.hex }}"
+        "background": "{{ mantle.hex }}",
+        "separator": "{{ surface0.hex }}"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "{{ subtext0.hex }}",
+        "background": "{{ mantle.hex }}",
+        "hover": "{{ surface0.hex }}"
+      },
+      "secondary": {
+        "paragraph": "{{ text.hex }}"
       }
     },
     "editor": {
+      "primary": {
+        "background": "{{ base.hex }}",
+        "border": "{{ surface0.hex }}"
+      },
+      "secondary": {
+        "paragraph": "{{ subtext0.hex }}",
+        "border": "{{ crust.hex }}"
+      },
       "selected": {
         "background": "{{ overlay2.hex }}"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "{{ mantle.hex }}",
+        "hover": "{{ surface0.hex }}"
+      },
+      "secondary": {
+        "background": "{{ surface0.hex }}"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "{{ text.hex }}",
@@ -141,5 +169,6 @@ whiskers:
         "paragraph": "{{ accent.hex }}"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-blue.json b/themes/frappe/catppuccin-frappe-blue.json
index cfc4353..20eec02 100644
--- a/themes/frappe/catppuccin-frappe-blue.json
+++ b/themes/frappe/catppuccin-frappe-blue.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Blue",
   "id": "catppuccin-frappe-blue",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#8caaee",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#8caaee",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#8caaee",
@@ -63,50 +63,78 @@
         "border": "#8caaee",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#8caaee"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-flamingo.json b/themes/frappe/catppuccin-frappe-flamingo.json
index e55b421..8f91ad7 100644
--- a/themes/frappe/catppuccin-frappe-flamingo.json
+++ b/themes/frappe/catppuccin-frappe-flamingo.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Flamingo",
   "id": "catppuccin-frappe-flamingo",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#eebebe",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#eebebe",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#eebebe",
@@ -63,50 +63,78 @@
         "border": "#eebebe",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#eebebe"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-green.json b/themes/frappe/catppuccin-frappe-green.json
index 864cd0a..81689b9 100644
--- a/themes/frappe/catppuccin-frappe-green.json
+++ b/themes/frappe/catppuccin-frappe-green.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Green",
   "id": "catppuccin-frappe-green",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#a6d189",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#a6d189",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#a6d189",
@@ -63,50 +63,78 @@
         "border": "#a6d189",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#a6d189"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-lavender.json b/themes/frappe/catppuccin-frappe-lavender.json
index 81cf195..4d722b1 100644
--- a/themes/frappe/catppuccin-frappe-lavender.json
+++ b/themes/frappe/catppuccin-frappe-lavender.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Lavender",
   "id": "catppuccin-frappe-lavender",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#babbf1",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#babbf1",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#babbf1",
@@ -63,50 +63,78 @@
         "border": "#babbf1",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#babbf1"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-maroon.json b/themes/frappe/catppuccin-frappe-maroon.json
index 7eb1fbf..81b270a 100644
--- a/themes/frappe/catppuccin-frappe-maroon.json
+++ b/themes/frappe/catppuccin-frappe-maroon.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Maroon",
   "id": "catppuccin-frappe-maroon",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#ea999c",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#ea999c",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#ea999c",
@@ -63,50 +63,78 @@
         "border": "#ea999c",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#ea999c"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-mauve.json b/themes/frappe/catppuccin-frappe-mauve.json
index 82bf17d..74dc950 100644
--- a/themes/frappe/catppuccin-frappe-mauve.json
+++ b/themes/frappe/catppuccin-frappe-mauve.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Mauve",
   "id": "catppuccin-frappe-mauve",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#ca9ee6",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#ca9ee6",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#ca9ee6",
@@ -63,50 +63,78 @@
         "border": "#ca9ee6",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#ca9ee6"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-peach.json b/themes/frappe/catppuccin-frappe-peach.json
index 9af23e3..dd79b68 100644
--- a/themes/frappe/catppuccin-frappe-peach.json
+++ b/themes/frappe/catppuccin-frappe-peach.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Peach",
   "id": "catppuccin-frappe-peach",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#ef9f76",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#ef9f76",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#ef9f76",
@@ -63,50 +63,78 @@
         "border": "#ef9f76",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#ef9f76"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-pink.json b/themes/frappe/catppuccin-frappe-pink.json
index b03dad4..8050c6e 100644
--- a/themes/frappe/catppuccin-frappe-pink.json
+++ b/themes/frappe/catppuccin-frappe-pink.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Pink",
   "id": "catppuccin-frappe-pink",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#f4b8e4",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#f4b8e4",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#f4b8e4",
@@ -63,50 +63,78 @@
         "border": "#f4b8e4",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#f4b8e4"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-red.json b/themes/frappe/catppuccin-frappe-red.json
index 1464d3b..4374b73 100644
--- a/themes/frappe/catppuccin-frappe-red.json
+++ b/themes/frappe/catppuccin-frappe-red.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Red",
   "id": "catppuccin-frappe-red",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#e78284",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#e78284",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#e78284",
@@ -63,50 +63,78 @@
         "border": "#e78284",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#e78284"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-rosewater.json b/themes/frappe/catppuccin-frappe-rosewater.json
index b803647..e2b032d 100644
--- a/themes/frappe/catppuccin-frappe-rosewater.json
+++ b/themes/frappe/catppuccin-frappe-rosewater.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Rosewater",
   "id": "catppuccin-frappe-rosewater",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#f2d5cf",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#f2d5cf",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#f2d5cf",
@@ -63,50 +63,78 @@
         "border": "#f2d5cf",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#f2d5cf"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-sapphire.json b/themes/frappe/catppuccin-frappe-sapphire.json
index 40ba545..5d74228 100644
--- a/themes/frappe/catppuccin-frappe-sapphire.json
+++ b/themes/frappe/catppuccin-frappe-sapphire.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Sapphire",
   "id": "catppuccin-frappe-sapphire",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#85c1dc",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#85c1dc",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#85c1dc",
@@ -63,50 +63,78 @@
         "border": "#85c1dc",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#85c1dc"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-sky.json b/themes/frappe/catppuccin-frappe-sky.json
index 90121d1..4015516 100644
--- a/themes/frappe/catppuccin-frappe-sky.json
+++ b/themes/frappe/catppuccin-frappe-sky.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Sky",
   "id": "catppuccin-frappe-sky",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#99d1db",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#99d1db",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#99d1db",
@@ -63,50 +63,78 @@
         "border": "#99d1db",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#99d1db"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-teal.json b/themes/frappe/catppuccin-frappe-teal.json
index 2040b88..509d98b 100644
--- a/themes/frappe/catppuccin-frappe-teal.json
+++ b/themes/frappe/catppuccin-frappe-teal.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Teal",
   "id": "catppuccin-frappe-teal",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#81c8be",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#81c8be",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#81c8be",
@@ -63,50 +63,78 @@
         "border": "#81c8be",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#81c8be"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/frappe/catppuccin-frappe-yellow.json b/themes/frappe/catppuccin-frappe-yellow.json
index 4b3a2c1..1635f61 100644
--- a/themes/frappe/catppuccin-frappe-yellow.json
+++ b/themes/frappe/catppuccin-frappe-yellow.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Frappé Yellow",
   "id": "catppuccin-frappe-yellow",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#414559",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "secondary": {
         "accent": "#e5c890",
@@ -37,11 +37,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#949cbb",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#232634",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "disabled": {
         "accent": "#e5c890",
@@ -50,11 +50,11 @@
         "border": "#414559",
         "heading": "#a5adce",
         "icon": "#838ba7",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "selected": {
         "accent": "#e5c890",
@@ -63,50 +63,78 @@
         "border": "#e5c890",
         "heading": "#c6d0f5",
         "icon": "#c6d0f5",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#292c3c",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "error": {
         "accent": "#e78284",
         "paragraph": "#e78284",
-        "background": "#e78284",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#e78284",
         "icon": "#e78284",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       },
       "success": {
         "accent": "#a6d189",
         "paragraph": "#a6d189",
-        "background": "#a6d189",
+        "background": "#303446",
         "border": "#414559",
         "heading": "#a6d189",
         "icon": "#a6d189",
-        "separator": "#737994",
+        "separator": "#414559",
         "placeholder": "#a5adce",
         "hover": "#414559",
         "accentForeground": "#303446",
-        "backdrop": "#0000001a"
+        "backdrop": "#2326341a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#c6d0f5",
-        "background": "#292c3c"
+        "background": "#292c3c",
+        "separator": "#414559"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adce",
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#c6d0f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#303446",
+        "border": "#414559"
+      },
+      "secondary": {
+        "paragraph": "#a5adce",
+        "border": "#232634"
+      },
       "selected": {
         "background": "#949cbb"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#292c3c",
+        "hover": "#414559"
+      },
+      "secondary": {
+        "background": "#414559"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#c6d0f5",
@@ -132,5 +160,6 @@
         "paragraph": "#e5c890"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-blue.json b/themes/latte/catppuccin-latte-blue.json
index 0e7729b..5903c3a 100644
--- a/themes/latte/catppuccin-latte-blue.json
+++ b/themes/latte/catppuccin-latte-blue.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Blue",
   "id": "catppuccin-latte-blue",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#1e66f5",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#1e66f5",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#1e66f5",
@@ -63,50 +63,78 @@
         "border": "#1e66f5",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#1e66f5"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-flamingo.json b/themes/latte/catppuccin-latte-flamingo.json
index bef6365..67a6eab 100644
--- a/themes/latte/catppuccin-latte-flamingo.json
+++ b/themes/latte/catppuccin-latte-flamingo.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Flamingo",
   "id": "catppuccin-latte-flamingo",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#dd7878",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#dd7878",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#dd7878",
@@ -63,50 +63,78 @@
         "border": "#dd7878",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#dd7878"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-green.json b/themes/latte/catppuccin-latte-green.json
index 21ab055..0bae7a2 100644
--- a/themes/latte/catppuccin-latte-green.json
+++ b/themes/latte/catppuccin-latte-green.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Green",
   "id": "catppuccin-latte-green",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#40a02b",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#40a02b",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#40a02b",
@@ -63,50 +63,78 @@
         "border": "#40a02b",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#40a02b"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-lavender.json b/themes/latte/catppuccin-latte-lavender.json
index b95bb0a..fd4b0ae 100644
--- a/themes/latte/catppuccin-latte-lavender.json
+++ b/themes/latte/catppuccin-latte-lavender.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Lavender",
   "id": "catppuccin-latte-lavender",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#7287fd",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#7287fd",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#7287fd",
@@ -63,50 +63,78 @@
         "border": "#7287fd",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#7287fd"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-maroon.json b/themes/latte/catppuccin-latte-maroon.json
index a63fd8d..1d68cdb 100644
--- a/themes/latte/catppuccin-latte-maroon.json
+++ b/themes/latte/catppuccin-latte-maroon.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Maroon",
   "id": "catppuccin-latte-maroon",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#e64553",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#e64553",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#e64553",
@@ -63,50 +63,78 @@
         "border": "#e64553",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#e64553"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-mauve.json b/themes/latte/catppuccin-latte-mauve.json
index c572427..6ef78bf 100644
--- a/themes/latte/catppuccin-latte-mauve.json
+++ b/themes/latte/catppuccin-latte-mauve.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Mauve",
   "id": "catppuccin-latte-mauve",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#8839ef",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#8839ef",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#8839ef",
@@ -63,50 +63,78 @@
         "border": "#8839ef",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#8839ef"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-peach.json b/themes/latte/catppuccin-latte-peach.json
index 78d8a17..f4a2805 100644
--- a/themes/latte/catppuccin-latte-peach.json
+++ b/themes/latte/catppuccin-latte-peach.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Peach",
   "id": "catppuccin-latte-peach",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#fe640b",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#fe640b",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#fe640b",
@@ -63,50 +63,78 @@
         "border": "#fe640b",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#fe640b"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-pink.json b/themes/latte/catppuccin-latte-pink.json
index 53f273a..f5a16f7 100644
--- a/themes/latte/catppuccin-latte-pink.json
+++ b/themes/latte/catppuccin-latte-pink.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Pink",
   "id": "catppuccin-latte-pink",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#ea76cb",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#ea76cb",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#ea76cb",
@@ -63,50 +63,78 @@
         "border": "#ea76cb",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#ea76cb"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-red.json b/themes/latte/catppuccin-latte-red.json
index 7e55fa6..5862c24 100644
--- a/themes/latte/catppuccin-latte-red.json
+++ b/themes/latte/catppuccin-latte-red.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Red",
   "id": "catppuccin-latte-red",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#d20f39",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#d20f39",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#d20f39",
@@ -63,50 +63,78 @@
         "border": "#d20f39",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#d20f39"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-rosewater.json b/themes/latte/catppuccin-latte-rosewater.json
index a22a49d..20c4be9 100644
--- a/themes/latte/catppuccin-latte-rosewater.json
+++ b/themes/latte/catppuccin-latte-rosewater.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Rosewater",
   "id": "catppuccin-latte-rosewater",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#dc8a78",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#dc8a78",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#dc8a78",
@@ -63,50 +63,78 @@
         "border": "#dc8a78",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#dc8a78"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-sapphire.json b/themes/latte/catppuccin-latte-sapphire.json
index 1df44ea..115a35e 100644
--- a/themes/latte/catppuccin-latte-sapphire.json
+++ b/themes/latte/catppuccin-latte-sapphire.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Sapphire",
   "id": "catppuccin-latte-sapphire",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#209fb5",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#209fb5",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#209fb5",
@@ -63,50 +63,78 @@
         "border": "#209fb5",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#209fb5"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-sky.json b/themes/latte/catppuccin-latte-sky.json
index 9be4360..9c2e691 100644
--- a/themes/latte/catppuccin-latte-sky.json
+++ b/themes/latte/catppuccin-latte-sky.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Sky",
   "id": "catppuccin-latte-sky",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#04a5e5",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#04a5e5",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#04a5e5",
@@ -63,50 +63,78 @@
         "border": "#04a5e5",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#04a5e5"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-teal.json b/themes/latte/catppuccin-latte-teal.json
index 9d0c0db..9fe02ce 100644
--- a/themes/latte/catppuccin-latte-teal.json
+++ b/themes/latte/catppuccin-latte-teal.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Teal",
   "id": "catppuccin-latte-teal",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#179299",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#179299",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#179299",
@@ -63,50 +63,78 @@
         "border": "#179299",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#179299"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/latte/catppuccin-latte-yellow.json b/themes/latte/catppuccin-latte-yellow.json
index 12bee4f..3a2f4aa 100644
--- a/themes/latte/catppuccin-latte-yellow.json
+++ b/themes/latte/catppuccin-latte-yellow.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Latte Yellow",
   "id": "catppuccin-latte-yellow",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "light",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "light",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#ccd0da",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "secondary": {
         "accent": "#df8e1d",
@@ -37,11 +37,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#7c7f93",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#dce0e8",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "disabled": {
         "accent": "#df8e1d",
@@ -50,11 +50,11 @@
         "border": "#ccd0da",
         "heading": "#6c6f85",
         "icon": "#8c8fa1",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "selected": {
         "accent": "#df8e1d",
@@ -63,50 +63,78 @@
         "border": "#df8e1d",
         "heading": "#4c4f69",
         "icon": "#4c4f69",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#e6e9ef",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "error": {
         "accent": "#d20f39",
         "paragraph": "#d20f39",
-        "background": "#d20f39",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#d20f39",
         "icon": "#d20f39",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       },
       "success": {
         "accent": "#40a02b",
         "paragraph": "#40a02b",
-        "background": "#40a02b",
+        "background": "#eff1f5",
         "border": "#ccd0da",
         "heading": "#40a02b",
         "icon": "#40a02b",
-        "separator": "#9ca0b0",
+        "separator": "#ccd0da",
         "placeholder": "#6c6f85",
         "hover": "#ccd0da",
         "accentForeground": "#eff1f5",
-        "backdrop": "#0000001a"
+        "backdrop": "#dce0e81a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#4c4f69",
-        "background": "#e6e9ef"
+        "background": "#e6e9ef",
+        "separator": "#ccd0da"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#6c6f85",
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#4c4f69"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#eff1f5",
+        "border": "#ccd0da"
+      },
+      "secondary": {
+        "paragraph": "#6c6f85",
+        "border": "#dce0e8"
+      },
       "selected": {
         "background": "#7c7f93"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#e6e9ef",
+        "hover": "#ccd0da"
+      },
+      "secondary": {
+        "background": "#ccd0da"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#4c4f69",
@@ -132,5 +160,6 @@
         "paragraph": "#df8e1d"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-blue.json b/themes/macchiato/catppuccin-macchiato-blue.json
index e6778ad..5987ee6 100644
--- a/themes/macchiato/catppuccin-macchiato-blue.json
+++ b/themes/macchiato/catppuccin-macchiato-blue.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Blue",
   "id": "catppuccin-macchiato-blue",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#8aadf4",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#8aadf4",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#8aadf4",
@@ -63,50 +63,78 @@
         "border": "#8aadf4",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#8aadf4"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-flamingo.json b/themes/macchiato/catppuccin-macchiato-flamingo.json
index 8896728..221bd0a 100644
--- a/themes/macchiato/catppuccin-macchiato-flamingo.json
+++ b/themes/macchiato/catppuccin-macchiato-flamingo.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Flamingo",
   "id": "catppuccin-macchiato-flamingo",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#f0c6c6",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#f0c6c6",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#f0c6c6",
@@ -63,50 +63,78 @@
         "border": "#f0c6c6",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#f0c6c6"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-green.json b/themes/macchiato/catppuccin-macchiato-green.json
index 29b90b2..2d3f8ca 100644
--- a/themes/macchiato/catppuccin-macchiato-green.json
+++ b/themes/macchiato/catppuccin-macchiato-green.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Green",
   "id": "catppuccin-macchiato-green",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#a6da95",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#a6da95",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#a6da95",
@@ -63,50 +63,78 @@
         "border": "#a6da95",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#a6da95"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-lavender.json b/themes/macchiato/catppuccin-macchiato-lavender.json
index 36c0422..0fd9719 100644
--- a/themes/macchiato/catppuccin-macchiato-lavender.json
+++ b/themes/macchiato/catppuccin-macchiato-lavender.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Lavender",
   "id": "catppuccin-macchiato-lavender",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#b7bdf8",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#b7bdf8",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#b7bdf8",
@@ -63,50 +63,78 @@
         "border": "#b7bdf8",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#b7bdf8"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-maroon.json b/themes/macchiato/catppuccin-macchiato-maroon.json
index fbe450b..51679dd 100644
--- a/themes/macchiato/catppuccin-macchiato-maroon.json
+++ b/themes/macchiato/catppuccin-macchiato-maroon.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Maroon",
   "id": "catppuccin-macchiato-maroon",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#ee99a0",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#ee99a0",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#ee99a0",
@@ -63,50 +63,78 @@
         "border": "#ee99a0",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#ee99a0"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-mauve.json b/themes/macchiato/catppuccin-macchiato-mauve.json
index 48e9b8f..60ed54c 100644
--- a/themes/macchiato/catppuccin-macchiato-mauve.json
+++ b/themes/macchiato/catppuccin-macchiato-mauve.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Mauve",
   "id": "catppuccin-macchiato-mauve",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#c6a0f6",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#c6a0f6",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#c6a0f6",
@@ -63,50 +63,78 @@
         "border": "#c6a0f6",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#c6a0f6"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-peach.json b/themes/macchiato/catppuccin-macchiato-peach.json
index d6b546d..cdcc76b 100644
--- a/themes/macchiato/catppuccin-macchiato-peach.json
+++ b/themes/macchiato/catppuccin-macchiato-peach.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Peach",
   "id": "catppuccin-macchiato-peach",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#f5a97f",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#f5a97f",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#f5a97f",
@@ -63,50 +63,78 @@
         "border": "#f5a97f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#f5a97f"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-pink.json b/themes/macchiato/catppuccin-macchiato-pink.json
index b68e877..2a7ad57 100644
--- a/themes/macchiato/catppuccin-macchiato-pink.json
+++ b/themes/macchiato/catppuccin-macchiato-pink.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Pink",
   "id": "catppuccin-macchiato-pink",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#f5bde6",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#f5bde6",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#f5bde6",
@@ -63,50 +63,78 @@
         "border": "#f5bde6",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#f5bde6"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-red.json b/themes/macchiato/catppuccin-macchiato-red.json
index ecee8ed..bdfd1c4 100644
--- a/themes/macchiato/catppuccin-macchiato-red.json
+++ b/themes/macchiato/catppuccin-macchiato-red.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Red",
   "id": "catppuccin-macchiato-red",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#ed8796",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#ed8796",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#ed8796",
@@ -63,50 +63,78 @@
         "border": "#ed8796",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#ed8796"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-rosewater.json b/themes/macchiato/catppuccin-macchiato-rosewater.json
index 2c0fd64..edc567e 100644
--- a/themes/macchiato/catppuccin-macchiato-rosewater.json
+++ b/themes/macchiato/catppuccin-macchiato-rosewater.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Rosewater",
   "id": "catppuccin-macchiato-rosewater",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#f4dbd6",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#f4dbd6",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#f4dbd6",
@@ -63,50 +63,78 @@
         "border": "#f4dbd6",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#f4dbd6"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-sapphire.json b/themes/macchiato/catppuccin-macchiato-sapphire.json
index f1aa8e8..8f4bfc0 100644
--- a/themes/macchiato/catppuccin-macchiato-sapphire.json
+++ b/themes/macchiato/catppuccin-macchiato-sapphire.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Sapphire",
   "id": "catppuccin-macchiato-sapphire",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#7dc4e4",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#7dc4e4",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#7dc4e4",
@@ -63,50 +63,78 @@
         "border": "#7dc4e4",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#7dc4e4"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-sky.json b/themes/macchiato/catppuccin-macchiato-sky.json
index 84c1848..6fe03ff 100644
--- a/themes/macchiato/catppuccin-macchiato-sky.json
+++ b/themes/macchiato/catppuccin-macchiato-sky.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Sky",
   "id": "catppuccin-macchiato-sky",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#91d7e3",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#91d7e3",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#91d7e3",
@@ -63,50 +63,78 @@
         "border": "#91d7e3",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#91d7e3"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-teal.json b/themes/macchiato/catppuccin-macchiato-teal.json
index 53e2abd..d8d73f6 100644
--- a/themes/macchiato/catppuccin-macchiato-teal.json
+++ b/themes/macchiato/catppuccin-macchiato-teal.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Teal",
   "id": "catppuccin-macchiato-teal",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#8bd5ca",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#8bd5ca",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#8bd5ca",
@@ -63,50 +63,78 @@
         "border": "#8bd5ca",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#8bd5ca"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/macchiato/catppuccin-macchiato-yellow.json b/themes/macchiato/catppuccin-macchiato-yellow.json
index f0813ed..9512cc3 100644
--- a/themes/macchiato/catppuccin-macchiato-yellow.json
+++ b/themes/macchiato/catppuccin-macchiato-yellow.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Macchiato Yellow",
   "id": "catppuccin-macchiato-yellow",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#363a4f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "secondary": {
         "accent": "#eed49f",
@@ -37,11 +37,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#939ab7",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#181926",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "disabled": {
         "accent": "#eed49f",
@@ -50,11 +50,11 @@
         "border": "#363a4f",
         "heading": "#a5adcb",
         "icon": "#8087a2",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "selected": {
         "accent": "#eed49f",
@@ -63,50 +63,78 @@
         "border": "#eed49f",
         "heading": "#cad3f5",
         "icon": "#cad3f5",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#1e2030",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "error": {
         "accent": "#ed8796",
         "paragraph": "#ed8796",
-        "background": "#ed8796",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#ed8796",
         "icon": "#ed8796",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       },
       "success": {
         "accent": "#a6da95",
         "paragraph": "#a6da95",
-        "background": "#a6da95",
+        "background": "#24273a",
         "border": "#363a4f",
         "heading": "#a6da95",
         "icon": "#a6da95",
-        "separator": "#6e738d",
+        "separator": "#363a4f",
         "placeholder": "#a5adcb",
         "hover": "#363a4f",
         "accentForeground": "#24273a",
-        "backdrop": "#0000001a"
+        "backdrop": "#1819261a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cad3f5",
-        "background": "#1e2030"
+        "background": "#1e2030",
+        "separator": "#363a4f"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a5adcb",
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#cad3f5"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#24273a",
+        "border": "#363a4f"
+      },
+      "secondary": {
+        "paragraph": "#a5adcb",
+        "border": "#181926"
+      },
       "selected": {
         "background": "#939ab7"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#1e2030",
+        "hover": "#363a4f"
+      },
+      "secondary": {
+        "background": "#363a4f"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cad3f5",
@@ -132,5 +160,6 @@
         "paragraph": "#eed49f"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-blue.json b/themes/mocha/catppuccin-mocha-blue.json
index bd8afbd..524289e 100644
--- a/themes/mocha/catppuccin-mocha-blue.json
+++ b/themes/mocha/catppuccin-mocha-blue.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Blue",
   "id": "catppuccin-mocha-blue",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#89b4fa",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#89b4fa",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#89b4fa",
@@ -63,50 +63,78 @@
         "border": "#89b4fa",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#89b4fa"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-flamingo.json b/themes/mocha/catppuccin-mocha-flamingo.json
index 11df0c0..875132e 100644
--- a/themes/mocha/catppuccin-mocha-flamingo.json
+++ b/themes/mocha/catppuccin-mocha-flamingo.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Flamingo",
   "id": "catppuccin-mocha-flamingo",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#f2cdcd",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#f2cdcd",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#f2cdcd",
@@ -63,50 +63,78 @@
         "border": "#f2cdcd",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#f2cdcd"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-green.json b/themes/mocha/catppuccin-mocha-green.json
index 0d67397..9773b5e 100644
--- a/themes/mocha/catppuccin-mocha-green.json
+++ b/themes/mocha/catppuccin-mocha-green.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Green",
   "id": "catppuccin-mocha-green",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#a6e3a1",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#a6e3a1",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#a6e3a1",
@@ -63,50 +63,78 @@
         "border": "#a6e3a1",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#a6e3a1"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-lavender.json b/themes/mocha/catppuccin-mocha-lavender.json
index a0cc8fa..3c00c2f 100644
--- a/themes/mocha/catppuccin-mocha-lavender.json
+++ b/themes/mocha/catppuccin-mocha-lavender.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Lavender",
   "id": "catppuccin-mocha-lavender",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#b4befe",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#b4befe",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#b4befe",
@@ -63,50 +63,78 @@
         "border": "#b4befe",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#b4befe"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-maroon.json b/themes/mocha/catppuccin-mocha-maroon.json
index d46b5e4..52c7e43 100644
--- a/themes/mocha/catppuccin-mocha-maroon.json
+++ b/themes/mocha/catppuccin-mocha-maroon.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Maroon",
   "id": "catppuccin-mocha-maroon",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#eba0ac",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#eba0ac",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#eba0ac",
@@ -63,50 +63,78 @@
         "border": "#eba0ac",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#eba0ac"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-mauve.json b/themes/mocha/catppuccin-mocha-mauve.json
index 51e073f..137bcd3 100644
--- a/themes/mocha/catppuccin-mocha-mauve.json
+++ b/themes/mocha/catppuccin-mocha-mauve.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Mauve",
   "id": "catppuccin-mocha-mauve",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#cba6f7",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#cba6f7",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#cba6f7",
@@ -63,50 +63,78 @@
         "border": "#cba6f7",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#cba6f7"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-peach.json b/themes/mocha/catppuccin-mocha-peach.json
index a762fe2..d3a3610 100644
--- a/themes/mocha/catppuccin-mocha-peach.json
+++ b/themes/mocha/catppuccin-mocha-peach.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Peach",
   "id": "catppuccin-mocha-peach",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#fab387",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#fab387",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#fab387",
@@ -63,50 +63,78 @@
         "border": "#fab387",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#fab387"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-pink.json b/themes/mocha/catppuccin-mocha-pink.json
index d3cb4a2..063ac1f 100644
--- a/themes/mocha/catppuccin-mocha-pink.json
+++ b/themes/mocha/catppuccin-mocha-pink.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Pink",
   "id": "catppuccin-mocha-pink",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#f5c2e7",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#f5c2e7",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#f5c2e7",
@@ -63,50 +63,78 @@
         "border": "#f5c2e7",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#f5c2e7"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-red.json b/themes/mocha/catppuccin-mocha-red.json
index 53810fa..e664623 100644
--- a/themes/mocha/catppuccin-mocha-red.json
+++ b/themes/mocha/catppuccin-mocha-red.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Red",
   "id": "catppuccin-mocha-red",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#f38ba8",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#f38ba8",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#f38ba8",
@@ -63,50 +63,78 @@
         "border": "#f38ba8",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#f38ba8"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-rosewater.json b/themes/mocha/catppuccin-mocha-rosewater.json
index b87ad0a..99ae6e4 100644
--- a/themes/mocha/catppuccin-mocha-rosewater.json
+++ b/themes/mocha/catppuccin-mocha-rosewater.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Rosewater",
   "id": "catppuccin-mocha-rosewater",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#f5e0dc",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#f5e0dc",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#f5e0dc",
@@ -63,50 +63,78 @@
         "border": "#f5e0dc",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#f5e0dc"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-sapphire.json b/themes/mocha/catppuccin-mocha-sapphire.json
index 4cd66d4..3c5adb0 100644
--- a/themes/mocha/catppuccin-mocha-sapphire.json
+++ b/themes/mocha/catppuccin-mocha-sapphire.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Sapphire",
   "id": "catppuccin-mocha-sapphire",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#74c7ec",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#74c7ec",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#74c7ec",
@@ -63,50 +63,78 @@
         "border": "#74c7ec",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#74c7ec"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-sky.json b/themes/mocha/catppuccin-mocha-sky.json
index 439ccc5..5f26145 100644
--- a/themes/mocha/catppuccin-mocha-sky.json
+++ b/themes/mocha/catppuccin-mocha-sky.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Sky",
   "id": "catppuccin-mocha-sky",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#89dceb",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#89dceb",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#89dceb",
@@ -63,50 +63,78 @@
         "border": "#89dceb",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#89dceb"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-teal.json b/themes/mocha/catppuccin-mocha-teal.json
index e52839d..3c247a1 100644
--- a/themes/mocha/catppuccin-mocha-teal.json
+++ b/themes/mocha/catppuccin-mocha-teal.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Teal",
   "id": "catppuccin-mocha-teal",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#94e2d5",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#94e2d5",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#94e2d5",
@@ -63,50 +63,78 @@
         "border": "#94e2d5",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#94e2d5"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }
diff --git a/themes/mocha/catppuccin-mocha-yellow.json b/themes/mocha/catppuccin-mocha-yellow.json
index 70b297d..74df9f0 100644
--- a/themes/mocha/catppuccin-mocha-yellow.json
+++ b/themes/mocha/catppuccin-mocha-yellow.json
@@ -1,13 +1,9 @@
 {
-  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json",
   "name": "Catppuccin Mocha Yellow",
   "id": "catppuccin-mocha-yellow",
-  "version": 1,
-  "license": "MIT",
-  "homepage": "https://github.com/catppuccin/notesnook",
-  "description": "A soothing pastel theme for the high-spirited!",
-  "colorScheme": "dark",
+  "version": 1.1,
   "compatibilityVersion": 1,
+  "license": "MIT",
   "authors": [
     {
       "name": "Catppuccin Org",
@@ -15,6 +11,10 @@
       "url": "https://catppuccin.com"
     }
   ],
+  "homepage": "https://github.com/catppuccin/notesnook",
+  "description": "A soothing pastel theme for the high-spirited!",
+  "colorScheme": "dark",
+  "tags": ["catppuccin"],
   "scopes": {
     "base": {
       "primary": {
@@ -24,11 +24,11 @@
         "border": "#313244",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "secondary": {
         "accent": "#f9e2af",
@@ -37,11 +37,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#9399b2",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#11111b",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "disabled": {
         "accent": "#f9e2af",
@@ -50,11 +50,11 @@
         "border": "#313244",
         "heading": "#a6adc8",
         "icon": "#7f849c",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "selected": {
         "accent": "#f9e2af",
@@ -63,50 +63,78 @@
         "border": "#f9e2af",
         "heading": "#cdd6f4",
         "icon": "#cdd6f4",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#181825",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "error": {
         "accent": "#f38ba8",
         "paragraph": "#f38ba8",
-        "background": "#f38ba8",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#f38ba8",
         "icon": "#f38ba8",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       },
       "success": {
         "accent": "#a6e3a1",
         "paragraph": "#a6e3a1",
-        "background": "#a6e3a1",
+        "background": "#1e1e2e",
         "border": "#313244",
         "heading": "#a6e3a1",
         "icon": "#a6e3a1",
-        "separator": "#6c7086",
+        "separator": "#313244",
         "placeholder": "#a6adc8",
         "hover": "#313244",
         "accentForeground": "#1e1e2e",
-        "backdrop": "#0000001a"
+        "backdrop": "#11111b1a"
       }
     },
     "statusBar": {
       "primary": {
         "paragraph": "#cdd6f4",
-        "background": "#181825"
+        "background": "#181825",
+        "separator": "#313244"
+      }
+    },
+    "list": {
+      "primary": {
+        "paragraph": "#a6adc8",
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#cdd6f4"
       }
     },
     "editor": {
+      "primary": {
+        "background": "#1e1e2e",
+        "border": "#313244"
+      },
+      "secondary": {
+        "paragraph": "#a6adc8",
+        "border": "#11111b"
+      },
       "selected": {
         "background": "#9399b2"
       }
     },
+    "editorToolbar": {
+      "primary": {
+        "background": "#181825",
+        "hover": "#313244"
+      },
+      "secondary": {
+        "background": "#313244"
+      }
+    },
     "navigationMenu": {
       "primary": {
         "paragraph": "#cdd6f4",
@@ -132,5 +160,6 @@
         "paragraph": "#f9e2af"
       }
     }
-  }
+  },
+  "$schema": "https://raw.githubusercontent.com/streetwriters/notesnook-themes/main/schemas/v1.schema.json"
 }