Fixup terminal themes and include terminal from theme master

_rstudio-dark.scss

@@ -205,5 +205,3 @@
 .nocolor.ace_editor .ace_line span {
 	color: $rlang-reserved !important;
 }
-
-@import "_terminal";

_terminal.css → _terminal.scss

@@ -1,33 +1,44 @@
 .terminal {
-  background-color: #eceae8;
-  color: #b1a394;
+  background-color: $ui-background;
+  color: $ui-foreground;
   font-feature-settings: "liga" 0;
   position: relative;
   user-select: none;
   -ms-user-select: none;
   -webkit-user-select: none;
-} .terminal.xterm-cursor-style-block.focus:not(.xterm-cursor-blink-on) .terminal-cursor {
-  background-color: #333;
-  color: #CCC;
+  &.xterm-cursor-style-block.focus:not(.xterm-cursor-blink-on) .terminal-cursor {
+    background-color: $ui-cursor;
+    color: $ui-cursor;
+  }
+  &.focus {
+    &.xterm-cursor-style-bar:not(.xterm-cursor-blink-on) .terminal-cursor::before, &.xterm-cursor-style-underline:not(.xterm-cursor-blink-on) .terminal-cursor::before {
+      content: '';
+      position: absolute;
+      background-color: $ui-background;
+    }
+  }
+  &:not(.focus) .terminal-cursor {
+    outline: 1px solid $ui-foreground;
+    outline-offset: -1px;
+  }
+  .xterm-selection div {
+    position: absolute;
+    background-color: $ui-selection;
+  }
+  .xterm-viewport {
+    background-color: $ui-background;
+    overflow-y: scroll;
+  }
 }
-.terminal.focus.xterm-cursor-style-bar:not(.xterm-cursor-blink-on) .terminal-cursor::before,
-.terminal.focus.xterm-cursor-style-underline:not(.xterm-cursor-blink-on) .terminal-cursor::before {
-  content: '';
-  position: absolute;
-  background-color: #333;
+
+.xtermInvertColor {
+  color: $ui-foreground;
 }
-.terminal:not(.focus) .terminal-cursor {
-  outline: 1px solid #333;
-  outline-offset: -1px;
+
+.xtermInvertBgColor {
+  background-color: $ui-background;
 }
-.terminal .xterm-selection div {
-   position: absolute;
-   background-color: #333;
-} .terminal .xterm-viewport {
-  background-color: #eceae8;
-  overflow-y: scroll;
-} .xtermInvertColor { color: #eceae8; }
-.xtermInvertBgColor { background-color: #b1a394; }
+
 .xtermBold { font-weight: bold; }
 .xtermUnderline { text-decoration: underline; }
 .xtermBlink { text-decoration: blink; }

nord-polar-night-aurora.scss

@@ -29,12 +29,12 @@ $rlang-function : $nord8;
 $rlang-reserved : $nord15;
 $rlang-operator : $nord9;
 $rlang-bracket  : $rlang-function;
-$rlang-value    : $nord13;
-$rlang-namespace: $nord11;
+$rlang-value    : $nord11;
+$rlang-namespace: $nord13;
 $rlang-variable : $nord13;
 $rlang-message  : $nord12;
 $rlang-namespace-font-style: italic;
 
 $other-tag: $nord9;
 
-@import "_rstudio-dark";
+@import "_rstudio-dark", "_terminal";

oceanic-eighties.scss

@@ -34,4 +34,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "_rstudio-dark";
+@import "_rstudio-dark", "_terminal";