From 0cff7d34a7723b14a7fd1716c8cd487e88d5a57e Mon Sep 17 00:00:00 2001
From: Nathan Solis <66754842+coldenate@users.noreply.github.com>
Date: Fri, 3 Mar 2023 21:31:17 -0600
Subject: [PATCH 1/6] fixed floating toolbar

---
 mocha/theme.css | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/mocha/theme.css b/mocha/theme.css
index 8781d4c..ce69628 100644
--- a/mocha/theme.css
+++ b/mocha/theme.css
@@ -247,3 +247,20 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 .rn-queue {
 	background: var(--ctp-mocha-surface0);
 }
+
+@media (max-width: 479px) {
+	.rn-queue {
+		background: var(--ctp-mocha-base);
+	}
+}
+
+.rn-clr-shadow-menu {
+	background: var(--ctp-mocha-surface1) !important;
+}
+
+.rn-clr-shadow-menu .rn-clr-content-secondary {
+	color: var(--ctp-mocha-text);
+}
+.rn-clr-shadow-menu .rn-clr-content-primary {
+	color: var(--ctp-mocha-text);
+}

From c19d317d280e509352d724e3a04283f7cb5c145c Mon Sep 17 00:00:00 2001
From: Nathan Solis <66754842+coldenate@users.noreply.github.com>
Date: Sat, 11 Mar 2023 23:17:20 -0600
Subject: [PATCH 2/6] fix: pdf highlight issue

---
 frappe/theme.css    | 10 ++++++++++
 latte/theme.css     | 10 ++++++++++
 macchiato/theme.css | 10 ++++++++++
 mocha/theme.css     | 11 +++++++++++
 4 files changed, 41 insertions(+)

diff --git a/frappe/theme.css b/frappe/theme.css
index c17cb17..a3af7e3 100644
--- a/frappe/theme.css
+++ b/frappe/theme.css
@@ -247,3 +247,13 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 .rn-queue {
 	background: var(--ctp-frappe-surface0);
 }
+.dark .bg-gray-5[data-rem-tags="pdf-highlight"] {
+	background-color: var(--ctp-mocha-base);
+}
+
+.rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden.overflow-x-hidden {
+	background-color: var(--ctp-mocha-surface0);
+}
+.rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden {
+	background-color: var(--ctp-mocha-surface0) !important;
+}
diff --git a/latte/theme.css b/latte/theme.css
index 1225c61..a27c583 100644
--- a/latte/theme.css
+++ b/latte/theme.css
@@ -247,3 +247,13 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 .rn-queue {
 	background: var(--ctp-latte-surface0);
 }
+.light .bg-gray-5[data-rem-tags="pdf-highlight"] {
+	background-color: var(--ctp-mocha-base);
+}
+
+.rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden.overflow-x-hidden {
+	background-color: var(--ctp-mocha-surface0);
+}
+.rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden {
+	background-color: var(--ctp-mocha-surface0) !important;
+}
diff --git a/macchiato/theme.css b/macchiato/theme.css
index e2c9746..0fccb7d 100644
--- a/macchiato/theme.css
+++ b/macchiato/theme.css
@@ -247,3 +247,13 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 .rn-queue {
 	background: var(--ctp-macchiato-surface0);
 }
+.dark .bg-gray-5[data-rem-tags="pdf-highlight"] {
+	background-color: var(--ctp-mocha-base);
+}
+
+.rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden.overflow-x-hidden {
+	background-color: var(--ctp-mocha-surface0);
+}
+.rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden {
+	background-color: var(--ctp-mocha-surface0) !important;
+}
diff --git a/mocha/theme.css b/mocha/theme.css
index ce69628..0650fc5 100644
--- a/mocha/theme.css
+++ b/mocha/theme.css
@@ -264,3 +264,14 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 .rn-clr-shadow-menu .rn-clr-content-primary {
 	color: var(--ctp-mocha-text);
 }
+
+.dark .bg-gray-5[data-rem-tags="pdf-highlight"] {
+	background-color: var(--ctp-mocha-base);
+}
+
+.rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden.overflow-x-hidden {
+	background-color: var(--ctp-mocha-surface0);
+}
+.rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden {
+	background-color: var(--ctp-mocha-surface0) !important;
+}

From 87e2e68ea265c691d10a57bbbb6abefa4eaab5e5 Mon Sep 17 00:00:00 2001
From: Nathan Solis <66754842+coldenate@users.noreply.github.com>
Date: Sun, 12 Mar 2023 00:22:19 -0600
Subject: [PATCH 3/6] fix: correct pop-up bar matching

---
 frappe/theme.css    | 21 ++++++++++++++++++---
 latte/theme.css     | 21 ++++++++++++++++++---
 macchiato/theme.css | 41 ++++++++++++++++++++++++++++++++++-------
 mocha/theme.css     |  8 +-------
 4 files changed, 71 insertions(+), 20 deletions(-)

diff --git a/frappe/theme.css b/frappe/theme.css
index a3af7e3..349b14a 100644
--- a/frappe/theme.css
+++ b/frappe/theme.css
@@ -247,13 +247,28 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 .rn-queue {
 	background: var(--ctp-frappe-surface0);
 }
+.rn-queue {
+	background: var(--ctp-frappe-surface0);
+}
+
+.rn-clr-shadow-menu {
+	background: var(--ctp-frappe-surface0) !important;
+}
+
+.rn-clr-shadow-menu .rn-clr-content-secondary {
+	color: var(--ctp-frappe-text);
+}
+.rn-clr-shadow-menu .rn-clr-content-primary {
+	color: var(--ctp-frappe-text);
+}
+
 .dark .bg-gray-5[data-rem-tags="pdf-highlight"] {
-	background-color: var(--ctp-mocha-base);
+	background-color: var(--ctp-frappe-base);
 }
 
 .rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden.overflow-x-hidden {
-	background-color: var(--ctp-mocha-surface0);
+	background-color: var(--ctp-frappe-surface0);
 }
 .rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden {
-	background-color: var(--ctp-mocha-surface0) !important;
+	background-color: var(--ctp-frappe-surface0) !important;
 }
diff --git a/latte/theme.css b/latte/theme.css
index a27c583..f9a7e05 100644
--- a/latte/theme.css
+++ b/latte/theme.css
@@ -247,13 +247,28 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 .rn-queue {
 	background: var(--ctp-latte-surface0);
 }
+.rn-queue {
+	background: var(--ctp-latte-surface0);
+}
+
+.rn-clr-shadow-menu {
+	background: var(--ctp-latte-surface0) !important;
+}
+
+.rn-clr-shadow-menu .rn-clr-content-secondary {
+	color: var(--ctp-latte-text);
+}
+.rn-clr-shadow-menu .rn-clr-content-primary {
+	color: var(--ctp-latte-text);
+}
+
 .light .bg-gray-5[data-rem-tags="pdf-highlight"] {
-	background-color: var(--ctp-mocha-base);
+	background-color: var(--ctp-latte-base);
 }
 
 .rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden.overflow-x-hidden {
-	background-color: var(--ctp-mocha-surface0);
+	background-color: var(--ctp-latte-surface0);
 }
 .rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden {
-	background-color: var(--ctp-mocha-surface0) !important;
+	background-color: var(--ctp-latte-surface0) !important;
 }
diff --git a/macchiato/theme.css b/macchiato/theme.css
index 0fccb7d..1228ea5 100644
--- a/macchiato/theme.css
+++ b/macchiato/theme.css
@@ -177,13 +177,19 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 	color: var(--ctp-macchiato-text);
 }
 .dark .highlight-color--orange {
-	background-color: rgba(var(--ctp-macchiato-peach-raw), var(--tw-bg-opacity));
+	background-color: rgba(
+		var(--ctp-macchiato-peach-raw),
+		var(--tw-bg-opacity)
+	);
 	color: var(--ctp-macchiato-text);
 	--tw-bg-opacity: 0.5;
 }
 
 .dark .highlight-color--yellow {
-	background-color: rgba(var(--ctp-macchiato-yellow-raw), var(--tw-bg-opacity));
+	background-color: rgba(
+		var(--ctp-macchiato-yellow-raw),
+		var(--tw-bg-opacity)
+	);
 	color: var(--ctp-macchiato-text);
 	--tw-bg-opacity: 0.5;
 }
@@ -195,13 +201,19 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 }
 
 .dark .highlight-color--purple {
-	background-color: rgba(var(--ctp-macchiato-mauve-raw), var(--tw-bg-opacity));
+	background-color: rgba(
+		var(--ctp-macchiato-mauve-raw),
+		var(--tw-bg-opacity)
+	);
 	color: var(--ctp-macchiato-text);
 	--tw-bg-opacity: 0.5;
 }
 
 .dark .highlight-color--green {
-	background-color: rgba(var(--ctp-macchiato-green-raw), var(--tw-bg-opacity));
+	background-color: rgba(
+		var(--ctp-macchiato-green-raw),
+		var(--tw-bg-opacity)
+	);
 	color: var(--ctp-macchiato-text);
 	--tw-bg-opacity: 0.5;
 }
@@ -247,13 +259,28 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 .rn-queue {
 	background: var(--ctp-macchiato-surface0);
 }
+.rn-queue {
+	background: var(--ctp-macchiato-surface0);
+}
+
+.rn-clr-shadow-menu {
+	background: var(--ctp-macchiato-surface0) !important;
+}
+
+.rn-clr-shadow-menu .rn-clr-content-secondary {
+	color: var(--ctp-macchiato-text);
+}
+.rn-clr-shadow-menu .rn-clr-content-primary {
+	color: var(--ctp-macchiato-text);
+}
+
 .dark .bg-gray-5[data-rem-tags="pdf-highlight"] {
-	background-color: var(--ctp-mocha-base);
+	background-color: var(--ctp-macchiato-base);
 }
 
 .rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden.overflow-x-hidden {
-	background-color: var(--ctp-mocha-surface0);
+	background-color: var(--ctp-macchiato-surface0);
 }
 .rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden {
-	background-color: var(--ctp-mocha-surface0) !important;
+	background-color: var(--ctp-macchiato-surface0) !important;
 }
diff --git a/mocha/theme.css b/mocha/theme.css
index 0650fc5..713969c 100644
--- a/mocha/theme.css
+++ b/mocha/theme.css
@@ -248,14 +248,8 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 	background: var(--ctp-mocha-surface0);
 }
 
-@media (max-width: 479px) {
-	.rn-queue {
-		background: var(--ctp-mocha-base);
-	}
-}
-
 .rn-clr-shadow-menu {
-	background: var(--ctp-mocha-surface1) !important;
+	background: var(--ctp-mocha-surface0) !important;
 }
 
 .rn-clr-shadow-menu .rn-clr-content-secondary {

From 8c7271663b380f00a2f385d8da43cfed5874cd41 Mon Sep 17 00:00:00 2001
From: Nathan Solis <66754842+coldenate@users.noreply.github.com>
Date: Sun, 12 Mar 2023 23:41:38 -0500
Subject: [PATCH 4/6] fix: correct highlight selector

---
 frappe/theme.css    | 31 +++++++++++++++++++++++++++++++
 latte/theme.css     | 31 +++++++++++++++++++++++++++++++
 macchiato/theme.css | 32 ++++++++++++++++++++++++++++++++
 mocha/theme.css     | 32 ++++++++++++++++++++++++++++++++
 4 files changed, 126 insertions(+)

diff --git a/frappe/theme.css b/frappe/theme.css
index 349b14a..e3ebcc8 100644
--- a/frappe/theme.css
+++ b/frappe/theme.css
@@ -272,3 +272,34 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 .rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden {
 	background-color: var(--ctp-frappe-surface0) !important;
 }
+/* redefine highlight colors at level 20 */
+
+.dark .bg-red-20 {
+	background-color: var(--ctp-frappe-red) !important;
+	color: var(--ctp-frappe-red) !important;
+}
+
+.dark .bg-orange-20 {
+	background-color: var(--ctp-frappe-peach) !important;
+	color: var(--ctp-frappe-peach) !important;
+}
+
+.dark .bg-yellow-20 {
+	background-color: var(--ctp-frappe-yellow) !important;
+	color: var(--ctp-frappe-yellow) !important;
+}
+
+.dark .bg-cyan-20 {
+	background-color: var(--ctp-frappe-blue) !important;
+	color: var(--ctp-frappe-blue) !important;
+}
+
+.dark .bg-purple-20 {
+	background-color: var(--ctp-frappe-mauve) !important;
+	color: var(--ctp-frappe-mauve) !important;
+}
+
+.dark .bg-mint-20 {
+	background-color: var(--ctp-frappe-green) !important;
+	color: var(--ctp-frappe-green) !important;
+}
diff --git a/latte/theme.css b/latte/theme.css
index f9a7e05..43f1f2b 100644
--- a/latte/theme.css
+++ b/latte/theme.css
@@ -272,3 +272,34 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 .rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden {
 	background-color: var(--ctp-latte-surface0) !important;
 }
+/* redefine highlight colors at level 20 */
+
+.light .bg-red-20 {
+	background-color: var(--ctp-latte-red) !important;
+	color: var(--ctp-latte-red) !important;
+}
+
+.light .bg-orange-20 {
+	background-color: var(--ctp-latte-peach) !important;
+	color: var(--ctp-latte-peach) !important;
+}
+
+.light .bg-yellow-20 {
+	background-color: var(--ctp-latte-yellow) !important;
+	color: var(--ctp-latte-yellow) !important;
+}
+
+.light .bg-cyan-20 {
+	background-color: var(--ctp-latte-blue) !important;
+	color: var(--ctp-latte-blue) !important;
+}
+
+.light .bg-purple-20 {
+	background-color: var(--ctp-latte-mauve) !important;
+	color: var(--ctp-latte-mauve) !important;
+}
+
+.light .bg-mint-20 {
+	background-color: var(--ctp-latte-green) !important;
+	color: var(--ctp-latte-green) !important;
+}
diff --git a/macchiato/theme.css b/macchiato/theme.css
index 1228ea5..3a4f203 100644
--- a/macchiato/theme.css
+++ b/macchiato/theme.css
@@ -284,3 +284,35 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 .rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden {
 	background-color: var(--ctp-macchiato-surface0) !important;
 }
+
+/* redefine highlight colors at level 20 */
+
+.dark .bg-red-20 {
+	background-color: var(--ctp-macchiato-red) !important;
+	color: var(--ctp-macchiato-red) !important;
+}
+
+.dark .bg-orange-20 {
+	background-color: var(--ctp-macchiato-peach) !important;
+	color: var(--ctp-macchiato-peach) !important;
+}
+
+.dark .bg-yellow-20 {
+	background-color: var(--ctp-macchiato-yellow) !important;
+	color: var(--ctp-macchiato-yellow) !important;
+}
+
+.dark .bg-cyan-20 {
+	background-color: var(--ctp-macchiato-blue) !important;
+	color: var(--ctp-macchiato-blue) !important;
+}
+
+.dark .bg-purple-20 {
+	background-color: var(--ctp-macchiato-mauve) !important;
+	color: var(--ctp-macchiato-mauve) !important;
+}
+
+.dark .bg-mint-20 {
+	background-color: var(--ctp-macchiato-green) !important;
+	color: var(--ctp-macchiato-green) !important;
+}
diff --git a/mocha/theme.css b/mocha/theme.css
index 713969c..1ed4db2 100644
--- a/mocha/theme.css
+++ b/mocha/theme.css
@@ -269,3 +269,35 @@ Originally cloned from https://github.com/ethomasv/RemNoteTheme
 .rn-popup__content.relative.rn-clr-background-primary.overflow-y-hidden {
 	background-color: var(--ctp-mocha-surface0) !important;
 }
+
+/* redefine highlight colors at level 20 */
+
+.dark .bg-red-20 {
+	background-color: var(--ctp-mocha-red) !important;
+	color: var(--ctp-mocha-red) !important;
+}
+
+.dark .bg-orange-20 {
+	background-color: var(--ctp-mocha-peach) !important;
+	color: var(--ctp-mocha-peach) !important;
+}
+
+.dark .bg-yellow-20 {
+	background-color: var(--ctp-mocha-yellow) !important;
+	color: var(--ctp-mocha-yellow) !important;
+}
+
+.dark .bg-cyan-20 {
+	background-color: var(--ctp-mocha-blue) !important;
+	color: var(--ctp-mocha-blue) !important;
+}
+
+.dark .bg-purple-20 {
+	background-color: var(--ctp-mocha-mauve) !important;
+	color: var(--ctp-mocha-mauve) !important;
+}
+
+.dark .bg-mint-20 {
+	background-color: var(--ctp-mocha-green) !important;
+	color: var(--ctp-mocha-green) !important;
+}

From e47faa4903cd92bade5e2209eba44cd5882a83ce Mon Sep 17 00:00:00 2001
From: Nathan Solis <66754842+coldenate@users.noreply.github.com>
Date: Mon, 13 Mar 2023 04:10:10 -0500
Subject: [PATCH 5/6] chore: bump version | I always forget this smh

---
 assets/manifest.template.json | 2 +-
 frappe/manifest.json          | 2 +-
 latte/manifest.json           | 2 +-
 macchiato/manifest.json       | 2 +-
 mocha/manifest.json           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/manifest.template.json b/assets/manifest.template.json
index cd61f4a..4f968af 100644
--- a/assets/manifest.template.json
+++ b/assets/manifest.template.json
@@ -8,7 +8,7 @@
 	"version": {
 		"major": 0,
 		"minor": 3,
-		"patch": 2
+		"patch": 3
 	},
 	"theme": ["dark"],
 	"description": "Catppuccin <theme name> Theme for Remnote.",
diff --git a/frappe/manifest.json b/frappe/manifest.json
index c4327f1..b2e2101 100644
--- a/frappe/manifest.json
+++ b/frappe/manifest.json
@@ -8,7 +8,7 @@
 	"version": {
 		"major": 0,
 		"minor": 3,
-		"patch": 2
+		"patch": 3
 	},
 	"theme": ["dark"],
 	"description": "Catppuccin Frappé Theme for Remnote. Requires dark mode.",
diff --git a/latte/manifest.json b/latte/manifest.json
index f55afb8..34b43d3 100644
--- a/latte/manifest.json
+++ b/latte/manifest.json
@@ -8,7 +8,7 @@
 	"version": {
 		"major": 0,
 		"minor": 3,
-		"patch": 2
+		"patch": 3
 	},
 	"theme": ["light"],
 	"description": "Catppuccin Latte Theme for Remnote. Requires light mode.",
diff --git a/macchiato/manifest.json b/macchiato/manifest.json
index f0065cf..2cf582c 100644
--- a/macchiato/manifest.json
+++ b/macchiato/manifest.json
@@ -8,7 +8,7 @@
 	"version": {
 		"major": 0,
 		"minor": 3,
-		"patch": 2
+		"patch": 3
 	},
 	"theme": ["dark"],
 	"description": "Catppuccin Macchiato Theme for Remnote. Requires dark mode.",
diff --git a/mocha/manifest.json b/mocha/manifest.json
index 2841d88..9a865d4 100644
--- a/mocha/manifest.json
+++ b/mocha/manifest.json
@@ -8,7 +8,7 @@
 	"version": {
 		"major": 0,
 		"minor": 3,
-		"patch": 2
+		"patch": 3
 	},
 	"theme": ["dark"],
 	"description": "Catppuccin Mocha Theme for Remnote. Requires dark mode.",

From a5781b135b939f150288e1f323dfd7480d66e9e8 Mon Sep 17 00:00:00 2001
From: Nathan Solis <66754842+coldenate@users.noreply.github.com>
Date: Mon, 13 Mar 2023 04:25:03 -0500
Subject: [PATCH 6/6] add: reworked readme to conform to new plugins and themes
 store

---
 README.md | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 662111e..1444643 100644
--- a/README.md
+++ b/README.md
@@ -36,17 +36,21 @@
 
 ## Usage
 
+### RemNote Theme Links
+
+-   [🌻 Latte](https://remnote.com/plugins/catppuccin-latte)
+-   [🪴 Frappé](https://remnote.com/plugins/catppuccin-frappe)
+-   [🌺 Macchiato](https://remnote.com/plugins/catppuccin-macchiato)
+-   [🌿 Mocha](https://remnote.com/plugins/catppuccin-mocha)
+
+#### Manual Installation Instructions
+
 1. Open Remnote (either the Desktop-, Mobile App or Website)
-2. Search for a new Note with the name `Custom CSS`
-3. Click on `Add Blank CSS Block`
-4. Paste the code from your desired Flavour into the block
-    1. [🌻 Latte](https://github.com/catppuccin/remnote/raw/main/latte/theme.css)
-    2. [🪴 Frappé](https://github.com/catppuccin/remnote/raw/main/frapp%C3%A9/theme.css)
-    3. [🌺 Macchiato](https://github.com/catppuccin/remnote/raw/main/macchiato/theme.css)
-    4. [🌿 Mocha](https://github.com/catppuccin/remnote/raw/main/mocha/theme.css)
-5. ⚠ Make sure to set your interface theme Setting to `Light` if you use the Latte Theme and to `Dark` for the other themes
-
-> If custom CSS is preventing the loading of remnote, visit <http://www.remnote.com/notes?disableCustomCSS> ([From CSS Docs](https://plugins.remnote.com/custom-css))
+2. Navigate to `Plugins and Themes` and check the `Show Themes` box.
+3. Search for your desired theme. (`Catppuccin {Flavor} Theme`)
+4. Click the `Install` button.
+
+⚠ Make sure to set your interface theme Setting to `Light` if you use the Latte Theme and to `Dark` for the other themes
 
 ## 💝 Thanks to