diff --git a/www/css/themes/core.css b/www/css/themes/core.css
index f94f237..b01cbaa 100644
--- a/www/css/themes/core.css
+++ b/www/css/themes/core.css
@@ -1,3 +1,11 @@
+.theme-tty-base {
+    color: var(--theme-base);
+}
+
+.theme-tty-bg {
+    color: var(--theme-bg);
+}
+
 .theme-tty-prompt {
     color: var(--theme-tty-prompt);
 }
diff --git a/www/css/themes/maps/rose-pine.css b/www/css/themes/maps/rose-pine.css
index 0a207fc..58a809b 100644
--- a/www/css/themes/maps/rose-pine.css
+++ b/www/css/themes/maps/rose-pine.css
@@ -24,6 +24,6 @@ Variables:
     --theme-tty-prompt: var(--palette-rose-pine-foam);
     --theme-tty-command: var(--palette-rose-pine-iris);
     --theme-tty-warning: var(--palette-rose-pine-gold);
-    --theme-tty-errror: var(--palette-rose-pine-love);
+    --theme-tty-error: var(--palette-rose-pine-love);
     /* --theme-tty-: var(--palette-rose-pine-); */
 }
diff --git a/www/css/themes/themes/rose-pine-dawn.css b/www/css/themes/themes/rose-pine-dawn.css
index bf7fb91..ec7392d 100644
--- a/www/css/themes/themes/rose-pine-dawn.css
+++ b/www/css/themes/themes/rose-pine-dawn.css
@@ -1,5 +1,6 @@
 @import url('../palettes/rose-pine-dawn.css');
 @import url('../maps/rose-pine.css');
+@import url('../core.css');
 
 :root {
   --theme-name: "Rosé Pine Dawn";
diff --git a/www/css/themes/themes/rose-pine-moon.css b/www/css/themes/themes/rose-pine-moon.css
index 587a836..149740d 100644
--- a/www/css/themes/themes/rose-pine-moon.css
+++ b/www/css/themes/themes/rose-pine-moon.css
@@ -1,5 +1,6 @@
 @import url('../palettes/rose-pine.css');
 @import url('../maps/rose-pine.css');
+@import url('../core.css');
 
 :root {
   --theme-name: "Rosé Pine Moon";
diff --git a/www/css/themes/themes/rose-pine.css b/www/css/themes/themes/rose-pine.css
index eed073f..67e205a 100644
--- a/www/css/themes/themes/rose-pine.css
+++ b/www/css/themes/themes/rose-pine.css
@@ -1,5 +1,6 @@
 @import url('../palettes/rose-pine.css');
 @import url('../maps/rose-pine.css');
+@import url('../core.css');
 
 :root {
   --theme-name: "Rosé Pine";
diff --git a/www/index.html b/www/index.html
index e9abe03..27b7148 100644
--- a/www/index.html
+++ b/www/index.html
@@ -8,7 +8,6 @@
     <script src="js/main.js" type="module"></script>
 
     <!-- Theming -->
-    <link type="text/css" rel="stylesheet" href="css/themes/core.css" media="all">
     <link type="text/css" rel="stylesheet" href="css/themes/themes/rose-pine.css" media="all" id="theme_css">
 
     <!-- Styling -->