diff --git a/app/globals.css b/app/globals.css
index 99a7b0c..7b1088b 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -59,11 +59,3 @@
   }
 }
 
-@layer base {
-  * {
-    @apply border-border;
-  }
-  body {
-    @apply bg-background text-foreground;
-  }
-}
\ No newline at end of file
diff --git a/src/constants/resetCSS.ts b/src/constants/resetCSS.ts
index c500113..b3daaa9 100644
--- a/src/constants/resetCSS.ts
+++ b/src/constants/resetCSS.ts
@@ -44,9 +44,13 @@ div[data-tippy-root] {
   box-sizing: border-box;
   border-width: 0;
   border-style: solid;
-  border-color: #e5e7eb;
+  border-color: hsl(var(--richtext-border));
 }
 
+background-color: hsl(var(--richtext-background));
+color: hsl(var(--richtext-foreground));
+
+
 html,
 :host {
   line-height: 1.5;
diff --git a/src/styles/global.scss b/src/styles/global.scss
index bd0abf9..68e8fe3 100644
--- a/src/styles/global.scss
+++ b/src/styles/global.scss
@@ -68,16 +68,6 @@
   }
 }
 
-@layer base {
-  * {
-    @apply richtext-border-border !important;
-  }
-  body {
-    @apply richtext-bg-background !important;
-    @apply richtext-text-foreground !important;
-  }
-}
-
 // https://github.com/radix-ui/primitives/issues/1496
 html body[data-scroll-locked] {
   --removed-body-scroll-bar-size: 0 !important;