diff --git a/apps/client/src/stylesheets/theme-dark.css b/apps/client/src/stylesheets/theme-dark.css
index 84fc30db6..5bff3262f 100644
--- a/apps/client/src/stylesheets/theme-dark.css
+++ b/apps/client/src/stylesheets/theme-dark.css
@@ -117,5 +117,5 @@ body .todo-list input[type="checkbox"]:not(:checked):before {
 }
 
 span.fancytree-active {
-    color: var(--custom-color, var(--active-item-text-color));
+    color: var(--dark-theme-custom-color, var(--active-item-text-color));
 }
diff --git a/apps/client/src/stylesheets/theme-light.css b/apps/client/src/stylesheets/theme-light.css
index 34c4e8b4b..f421827d4 100644
--- a/apps/client/src/stylesheets/theme-light.css
+++ b/apps/client/src/stylesheets/theme-light.css
@@ -99,10 +99,7 @@ html {
 .use-note-color {
     --custom-color: var(--light-theme-custom-color);
 }
-<<<<<<< HEAD
 
 span.fancytree-active {
-    color: var(--custom-color, var(--active-item-text-color));
+    color: var(--light-theme-custom-color, var(--active-item-text-color));
 }
-=======
->>>>>>> a47ea0d653757e0336f693072bc1cd7df6772f9f