Add full RStudio UI themeing, replace Oceanic with Oceanic Plus, general tweaks

nord-polar-night-aurora.scss

 /* rs-theme-name: Nord Polar Night Aurora (SCSS) */
 /* rs-theme-is-dark: TRUE */
 
-@import "_nord";
+@import "palettes/_nord";
 
 // primary UI colors
-// $ui-background           : $nord0;
-$ui-background           : #262a33;
+$ui-background           : $nord0;
+// $ui-background           : #262a33;
 $ui-foreground           : $nord4;
 $ui-code-chunk-background: $nord0;
 $ui-selection            : transparentize($nord3, 0.6);
 $ui-fold-arrows-background: $nord11;
 $ui-fold-arrows-color     : $ui-foreground;
 
+// rstudio
+$ui-rstudio-background    : darken($ui-background, 2%);
+$ui-rstudio-color         : $ui-foreground;
+$ui-rstudio-tabs-inactive : $nord1;
+$ui-rstudio-tabs-inactive-color : $nord4;
+$ui-rstudio-tabs-selected : $nord2;
+$ui-rstudio-tabs-selected-color: $nord8;
+$ui-rstudio-toolbar       : $ui-rstudio-tabs-selected;
+$ui-rstudio-search        : $ui-rstudio-toolbar;
+$ui-completions-background: $ui-background;
+$ui-completions-color     : $ui-foreground;
+$ui-completions-border    : $ui-bracket;
+
 // R language colors
 $rlang-comment  : transparentize($ui-foreground, 0.5);
 $rlang-string   : $nord14;
 
 $other-tag: $nord9;
 
-@import "_rstudio-dark", "_terminal";
+@import "rstudio/_rstudio-dark", "rstudio/_terminal";

oceanic-eighties.scss

-/* rs-theme-name: Oceanic Eighties SCSS */
-/* rs-theme-is-dark: TRUE */
-
-// primary UI colors
-$ui-background           : #11232d;
-$ui-foreground           : #ccc;
-$ui-code-chunk-background: #23333c;
-$ui-selection            : transparentize(#1b3541, 0.6);
-$ui-cursor               : #e19938;
-$ui-margin-line          : lighten($ui-selection, 30%);
-$ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
-
-// less common UI colors
-$ui-line-active           : darken($ui-background, 0.1);
-$ui-line-active-gutter    : #1b3541;
-$ui-line-find             : #36444c;
-$ui-bracket               : #6a6a6a;
-$ui-invisible             : #99999960;
-$ui-indent-guide          : $ui-invisible;
-$ui-debug-background      : lighten($ui-background, 10%);
-$ui-fold-arrows-background: #f2777a;
-$ui-fold-arrows-color     : $ui-foreground;
-
-// R language colors
-$rlang-comment  : #999;
-$rlang-string   : #9c9;
-$rlang-function : #69c;
-$rlang-reserved : #c9c;
-$rlang-operator : #6cc;
-$rlang-bracket  : $rlang-operator;
-$rlang-value    : #f99157;
-$rlang-namespace: #fc6;
-$rlang-variable : #f2777a;
-$rlang-message  : $rlang-value;
-$rlang-namespace-font-style: italic;
-
-$other-tag: $rlang-variable;
-
-@import "_rstudio-dark", "_terminal";

oceanic-plus.scss

+/* rs-theme-name: Oceanic Plus SCSS */
+/* rs-theme-is-dark: TRUE */
+
+@import "palettes/_oceanic-plus";
+
+// primary UI colors
+$ui-background           : $base00;
+$ui-foreground           : $base07;
+$ui-code-chunk-background: $base02;
+$ui-selection            : transparentize($base05, 0.6);
+$ui-cursor               : $base0A;
+$ui-margin-line          : lighten($ui-selection, 30%);
+$ui-gutter-color         : transparentize($ui-foreground, 0.5);
+$ui-gutter-background    : $ui-background;
+
+// less common UI colors
+$ui-line-active           : darken($ui-background, 2%);
+$ui-line-active-gutter    : $base02;
+$ui-line-find             : $base03;
+$ui-bracket               : $base03;
+$ui-invisible             : $base03;
+$ui-indent-guide          : $ui-invisible;
+$ui-debug-background      : lighten($ui-background, 10%);
+$ui-fold-arrows-background: $base08;
+$ui-fold-arrows-color     : $ui-foreground;
+
+// rstudio
+$ui-rstudio-background    : $base01;
+$ui-rstudio-color         : $ui-foreground;
+$ui-rstudio-tabs-inactive : $base01;
+$ui-rstudio-tabs-inactive-color: $base05;
+$ui-rstudio-tabs-selected : $base02;
+$ui-rstudio-tabs-selected-color: $base06;
+$ui-rstudio-toolbar       : $ui-rstudio-tabs-selected;
+$ui-rstudio-search        : $ui-rstudio-toolbar;
+$ui-completions-background: $ui-background;
+$ui-completions-color     : $ui-foreground;
+$ui-completions-border    : $ui-bracket;
+
+// R language colors
+$rlang-comment  : $base04;
+$rlang-string   : $base0B;
+$rlang-function : $base0D;
+$rlang-reserved : $base0E;
+$rlang-operator : $base0C;
+$rlang-bracket  : $rlang-operator;
+$rlang-value    : $base09;
+$rlang-namespace: $base0A;
+$rlang-variable : $base08;
+$rlang-message  : $base0F;
+$rlang-namespace-font-style: italic;
+
+$other-tag: $rlang-variable;
+
+@import "rstudio/_rstudio-dark", "rstudio/_terminal";

palettes/_oceanic-plus.scss

+/* https://github.com/marcoms/oceanic-plus */
+/* grayscale */
+$base00: #1B2B34;  /* editor base (bluish) */
+$base01: #343D46;
+$base02: #4F5B66;
+$base03: #65737E;
+$base04: #A7ADBA;
+$base05: #C0C5CE;
+$base06: #CDD3DE;
+$base07: #D8DEE9;
+
+/* COLORS */
+$base08: #EC5f67;  /* red */
+$base09: #F99157;  /* orange */
+$base0A: #FAC863;  /* yellow */
+$base0B: #99C794;  /* jasmine */
+$base0C: #5FB3B3;  /* teal */
+$base0D: #6699CC;  /* muted blue */
+$base0E: #C594C5;  /* fucshia */
+$base0F: #AB7967;  /* brown */

rsthemes/nord-polar-night-aurora.rstheme

 /* rs-theme-name: Nord Polar Night Aurora (SCSS) */
 /* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #262a33;
+  background: #2e3440;
   color: rgba(216, 222, 233, 0.25);
 }
 
 }
 
 .ace_editor {
-  background-color: #262a33;
+  background-color: #2e3440;
   color: #d8dee9;
 }
 
 .rstudio-themes-flat.ace_editor_theme {
-  background-color: #262a33;
+  background-color: #2e3440;
   color: #d8dee9;
 }
 
 .rstudio-themes-flat.ace_editor_theme .profvis-flamegraph {
-  background-color: #262a33;
+  background-color: #2e3440;
   color: #d8dee9;
 }
 
 .rstudio-themes-flat .ace_editor_theme {
-  background-color: #262a33;
+  background-color: #2e3440;
   color: #d8dee9;
 }
 
   color: #FFF !important;
 }
 
-.rstudio-themes-flat.rstudio-themes-dark-menus .ace_editor.ace_autocomplete {
-  background: #2f3941;
-  border: solid 1px #4e5c68 !important;
-  color: #f0f0f0;
-}
-
-.rstudio-themes-flat.rstudio-themes-dark-menus .ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {
-  background: rgba(216, 222, 233, 0.25);
-  border: none;
-}
-
-.rstudio-themes-flat.rstudio-themes-dark-menus .ace_editor.ace_autocomplete .ace_marker-layer .ace_line-hover {
-  background: rgba(216, 222, 233, 0.25);
-  border: none;
-}
-
 .ace_cursor {
   color: #81a1c1;
 }
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: #3c4250;
+  background-color: #434c5e;
 }
 
 .ace_marker-layer .ace_find_line {
 }
 
 .ace_gutter-active-line {
-  background-color: #262a33;
+  background-color: #2e3440;
 }
 
 .ace_fold {
 }
 
 .ace_selection.ace_start {
-  box-shadow: 0 0 3px 0 #262a33;
+  box-shadow: 0 0 3px 0 #2e3440;
   border-radius: 2px;
 }
 
   color: #b48ead !important;
 }
 
+/* ---- RStudio Theme ---- */
+/* background */
+.rstudio-themes-flat .rstudio-themes-dark-grey {
+  background: #2a2f3a !important;
+  color: #d8dee9 !important;
+}
+
+.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
+  background: #2a2f3a !important;
+}
+
+/* inactive tabs */
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #3b4252 !important;
+}
+
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #d8dee9;
+}
+
+/* toolbar and selected tab */
+.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_center, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #434c5e !important;
+}
+
+.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #88c0d0;
+}
+
+.rstheme_toolbarWrapper {
+  background: #434c5e !important;
+}
+
+.rstudio-themes-flat {
+  /* search */
+}
+
+.rstudio-themes-flat .rstudio-themes-dark-grey {
+  /* spliters */
+}
+
+.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+  background: transparent !important;
+}
+
+.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
+  background: #434c5e !important;
+}
+
+/* pane toolbars */
+.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
+  background: #434c5e !important;
+}
+
+/* menu background */
+.popupMiddleCenter, .menuPopupMiddleCenter, .suggestPopupMiddleCenter {
+  background: #2e3440 !important;
+  color: #d8dee9 !important;
+}
+
+.themedPopupPanel {
+  border: solid 1px #46597c;
+}
+
+.themedPopupPanel ~ div.popupContent div:nth-child(1) {
+  border: solid 1px #46597c;
+}
+
+.popupContent {
+  background: #2e3440;
+  color: #d8dee9;
+}
+
+.popupContent div div:nth-child(2) {
+  background: #2e3440 !important;
+  border: solid 1px #46597c;
+}
+
 .terminal {
-  background-color: #262a33;
+  background-color: #2e3440;
   color: #d8dee9;
   font-feature-settings: "liga" 0;
   position: relative;
 .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: #262a33;
+  background-color: #2e3440;
 }
 
 .terminal:not(.focus) .terminal-cursor {
 }
 
 .terminal .xterm-viewport {
-  background-color: #262a33;
+  background-color: #2e3440;
   overflow-y: scroll;
 }
 
 }
 
 .xtermInvertBgColor {
-  background-color: #262a33;
+  background-color: #2e3440;
 }
 
 .xtermBold {

rsthemes/oceanic-eighties.rstheme → rsthemes/oceanic-plus.rstheme

-/* rs-theme-name: Oceanic Eighties SCSS */
+/* rs-theme-name: Oceanic Plus SCSS */
 /* rs-theme-is-dark: TRUE */
+/* https://github.com/marcoms/oceanic-plus */
+/* grayscale */
+/* editor base (bluish) */
+/* COLORS */
+/* red */
+/* orange */
+/* yellow */
+/* jasmine */
+/* teal */
+/* muted blue */
+/* fucshia */
+/* brown */
 .ace_gutter {
-  background: #11232d;
-  color: rgba(204, 204, 204, 0.5);
+  background: #1B2B34;
+  color: rgba(216, 222, 233, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(72, 141, 173, 0.4);
+  background: rgba(255, 255, 255, 0.4);
 }
 
 .ace_editor {
-  background-color: #11232d;
-  color: #ccc;
+  background-color: #1B2B34;
+  color: #D8DEE9;
 }
 
 .rstudio-themes-flat.ace_editor_theme {
-  background-color: #11232d;
-  color: #ccc;
+  background-color: #1B2B34;
+  color: #D8DEE9;
 }
 
 .rstudio-themes-flat.ace_editor_theme .profvis-flamegraph {
-  background-color: #11232d;
-  color: #ccc;
+  background-color: #1B2B34;
+  color: #D8DEE9;
 }
 
 .rstudio-themes-flat .ace_editor_theme {
-  background-color: #11232d;
-  color: #ccc;
+  background-color: #1B2B34;
+  color: #D8DEE9;
 }
 
 .rstudio-themes-flat.editor_dark.ace_editor_theme a {
   color: #FFF !important;
 }
 
-.rstudio-themes-flat.rstudio-themes-dark-menus .ace_editor.ace_autocomplete {
-  background: #2f3941;
-  border: solid 1px #4e5c68 !important;
-  color: #f0f0f0;
-}
-
-.rstudio-themes-flat.rstudio-themes-dark-menus .ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {
-  background: rgba(204, 204, 204, 0.25);
-  border: none;
-}
-
-.rstudio-themes-flat.rstudio-themes-dark-menus .ace_editor.ace_autocomplete .ace_marker-layer .ace_line-hover {
-  background: rgba(204, 204, 204, 0.25);
-  border: none;
-}
-
 .ace_cursor {
-  color: #e19938;
+  color: #FAC863;
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(27, 53, 65, 0.4);
+  background: rgba(192, 197, 206, 0.4);
 }
 
 .ace_marker-layer .ace_step {
-  background: #bbddbb;
+  background: #b9d9b5;
 }
 
 .ace_marker-layer .ace_bracket {
   margin: -1px 0 0 -1px;
-  border: 1px solid #6a6a6a;
+  border: 1px solid #65737E;
 }
 
 .ace_marker-layer .ace_active-line {
-  background: #11232d;
+  background: #18252d;
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(27, 53, 65, 0.4);
+  border: 1px solid rgba(192, 197, 206, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
   position: absolute;
   z-index: -1;
-  background-color: #23333c;
+  background-color: #4F5B66;
 }
 
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: #1f4052;
+  background-color: #2c4756;
 }
 
 .ace_marker-layer .ace_find_line {
   position: absolute;
   z-index: -1;
-  background-color: #36444c;
+  background-color: #65737E;
 }
 
 .ace_gutter-active-line {
-  background-color: #1b3541;
+  background-color: #4F5B66;
 }
 
 .ace_fold {
-  background-color: #f2777a;
-  border-color: #ccc;
+  background-color: #EC5f67;
+  border-color: #D8DEE9;
 }
 
 .ace_indent-guide {
-  border-right: 1px solid #99999960;
+  border-right: 1px solid #65737E;
 }
 
 .ace_active-line ~ .ace_selection.ace_start {
-  background-color: #11232d;
+  background-color: #18252d;
 }
 
 .ace_keyword {
   font-style: italic;
-  color: #c9c;
+  color: #C594C5;
 }
 
 .ace_keyword.ace_operator {
   font-style: normal;
-  color: #6cc;
+  color: #5FB3B3;
 }
 
 .ace_keyword.ace_other.ace_unit {
   font-style: normal;
-  color: #f99157;
+  color: #F99157;
 }
 
 .ace_constant.ace_language {
-  color: #f99157;
+  color: #AB7967;
 }
 
 .ace_constant.ace_numeric {
-  color: #f99157;
+  color: #F99157;
 }
 
 .ace_constant.ace_character {
-  color: #f99157;
+  color: #F99157;
 }
 
 .ace_constant.ace_other {
-  color: #ccc;
+  color: #D8DEE9;
 }
 
 .ace_support.ace_function {
-  color: #69c;
+  color: #6699CC;
 }
 
 .ace_support.ace_constant {
-  color: #f99157;
+  color: #F99157;
 }
 
 .ace_support.ace_class {
   font-style: italic;
-  color: #fc6;
+  color: #FAC863;
 }
 
 .ace_support.ace_type {
-  color: #fc6;
+  color: #FAC863;
 }
 
 .ace_paren.ace_keyword.ace_operator {
-  color: #6cc;
+  color: #5FB3B3;
 }
 
 .ace_storage {
-  color: #c9c;
+  color: #C594C5;
 }
 
 .ace_storage.ace_type {
-  color: #c9c;
+  color: #C594C5;
 }
 
 .ace_invalid {
-  background-color: rgba(242, 119, 122, 0.5);
+  background-color: rgba(236, 95, 103, 0.5);
 }
 
 .ace_invalid.ace_deprecated {
-  background-color: rgba(204, 153, 204, 0.5);
+  background-color: rgba(197, 148, 197, 0.5);
 }
 
 .ace_string {
-  color: #9c9;
+  color: #99C794;
 }
 
 .ace_comment {
-  color: #999;
+  color: #A7ADBA;
 }
 
 .ace_invisible {
-  color: #99999960;
+  color: #65737E;
 }
 
 .ace_variable {
-  color: #f2777a;
+  color: #EC5f67;
 }
 
 .ace_variable.ace_parameter {
-  color: #f99157;
+  color: #F99157;
 }
 
 .ace_entity.ace_name.ace_function {
-  color: #69c;
+  color: #6699CC;
 }
 
 .ace_entity.ace_name.ace_tag {
-  color: #f2777a;
+  color: #EC5f67;
 }
 
 .ace_entity.ace_other.ace_attribute-name {
-  color: #c9c;
+  color: #C594C5;
 }
 
 .ace_bracket {
   margin: 0 !important;
   border: 0 !important;
-  background-color: #6a6a6a;
+  background-color: #65737E;
 }
 
 .ace_console_error {
-  background-color: #36444c;
+  background-color: #65737E;
 }
 
 .ace_layer {
 }
 
 .ace_selection.ace_start {
-  box-shadow: 0 0 3px 0 #11232d;
+  box-shadow: 0 0 3px 0 #1B2B34;
   border-radius: 2px;
 }
 
 .ace_meta.ace_tag {
-  color: #6cc;
+  color: #5FB3B3;
 }
 
 .ace_markup.ace_heading {
   font-weight: 600;
-  color: #9c9;
+  color: #99C794;
 }
 
 .nocolor.ace_editor .ace_line span {
-  color: #c9c !important;
+  color: #C594C5 !important;
+}
+
+/* ---- RStudio Theme ---- */
+/* background */
+.rstudio-themes-flat .rstudio-themes-dark-grey {
+  background: #343D46 !important;
+  color: #D8DEE9 !important;
+}
+
+.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
+  background: #343D46 !important;
+}
+
+/* inactive tabs */
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #343D46 !important;
+}
+
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #C0C5CE;
+}
+
+/* toolbar and selected tab */
+.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_center, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #4F5B66 !important;
+}
+
+.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #CDD3DE;
+}
+
+.rstheme_toolbarWrapper {
+  background: #4F5B66 !important;
+}
+
+.rstudio-themes-flat {
+  /* search */
+}
+
+.rstudio-themes-flat .rstudio-themes-dark-grey {
+  /* spliters */
+}
+
+.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+  background: transparent !important;
+}
+
+.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
+  background: #4F5B66 !important;
+}
+
+/* pane toolbars */
+.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
+  background: #4F5B66 !important;
+}
+
+/* menu background */
+.popupMiddleCenter, .menuPopupMiddleCenter, .suggestPopupMiddleCenter {
+  background: #1B2B34 !important;
+  color: #D8DEE9 !important;
+}
+
+.themedPopupPanel {
+  border: solid 1px #65737E;
+}
+
+.themedPopupPanel ~ div.popupContent div:nth-child(1) {
+  border: solid 1px #65737E;
+}
+
+.popupContent {
+  background: #1B2B34;
+  color: #D8DEE9;
+}
+
+.popupContent div div:nth-child(2) {
+  background: #1B2B34 !important;
+  border: solid 1px #65737E;
 }
 
 .terminal {
-  background-color: #11232d;
-  color: #ccc;
+  background-color: #1B2B34;
+  color: #D8DEE9;
   font-feature-settings: "liga" 0;
   position: relative;
   user-select: none;
 }
 
 .terminal.xterm-cursor-style-block.focus:not(.xterm-cursor-blink-on) .terminal-cursor {
-  background-color: #e19938;
-  color: #e19938;
+  background-color: #FAC863;
+  color: #FAC863;
 }
 
 .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: #11232d;
+  background-color: #1B2B34;
 }
 
 .terminal:not(.focus) .terminal-cursor {
-  outline: 1px solid #ccc;
+  outline: 1px solid #D8DEE9;
   outline-offset: -1px;
 }
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(27, 53, 65, 0.4);
+  background-color: rgba(192, 197, 206, 0.4);
 }
 
 .terminal .xterm-viewport {
-  background-color: #11232d;
+  background-color: #1B2B34;
   overflow-y: scroll;
 }
 
 .xtermInvertColor {
-  color: #ccc;
+  color: #D8DEE9;
 }
 
 .xtermInvertBgColor {
-  background-color: #11232d;
+  background-color: #1B2B34;
 }
 
 .xtermBold {

rstudio/_rstudio-dark.scss

+.ace_gutter {
+	background: $ui-gutter-background;
+	color: $ui-gutter-color;
+}
+.ace_print-margin {
+	width: 2px;
+	background: $ui-margin-line;
+}
+.ace_editor {
+	background-color: $ui-background;
+	color: $ui-foreground;
+}
+.rstudio-themes-flat {
+	&.ace_editor_theme {
+		background-color: $ui-background;
+		color: $ui-foreground;
+		.profvis-flamegraph {
+			background-color: $ui-background;
+			color: $ui-foreground;
+		}
+	}
+	.ace_editor_theme {
+		background-color: $ui-background;
+		color: $ui-foreground;
+	}
+	&.editor_dark.ace_editor_theme a {
+		color: #FFF !important;
+	}
+}
+.ace_cursor {
+	color: $ui-cursor;
+}
+.ace_marker-layer {
+	.ace_selection {
+		background: $ui-selection;
+	}
+	.ace_step {
+		background: lighten($rlang-string, 10%);
+	}
+	.ace_bracket {
+		margin: -1px 0 0 -1px;
+		border: 1px solid $ui-bracket;
+	}
+	.ace_active-line {
+		background: $ui-line-active;
+	}
+	.ace_selected-word {
+		border: 1px solid $ui-selection;
+	}
+	.ace_foreign_line {
+		position: absolute;
+		z-index: -1;
+		background-color: $ui-code-chunk-background;
+	}
+	.ace_active_debug_line {
+		position: absolute;
+		z-index: -1;
+		background-color: $ui-debug-background;
+	}
+	.ace_find_line {
+		position: absolute;
+		z-index: -1;
+		background-color: $ui-line-find;
+	}
+}
+.ace_gutter-active-line {
+	background-color: $ui-line-active-gutter;
+}
+.ace_fold {
+	background-color: $ui-fold-arrows-background;
+	border-color: $ui-fold-arrows-color;
+}
+.ace_indent-guide{
+	border-right: 1px solid $ui-indent_guide;
+}
+.ace_active-line ~ .ace_selection.ace_start {
+	background-color: opacify($ui-line-active, 1);
+}
+.ace_keyword {
+	font-style: italic;
+	color: $rlang-reserved;
+	&.ace_operator {
+		font-style: normal;
+		color: $rlang-operator;
+	}
+	&.ace_other.ace_unit {
+		font-style: normal;
+		color: $rlang-value;
+	}
+}
+.ace_constant {
+	&.ace_language {
+		color: $rlang-message;
+	}
+	&.ace_numeric {
+		color: $rlang-value;
+	}
+	&.ace_character {
+		color: $rlang-value;
+	}
+	&.ace_other {
+		color: $ui-foreground;
+	}
+}
+.ace_support {
+	&.ace_function {
+		color: $rlang-function;
+	}
+	&.ace_constant {
+		color: $rlang-value;
+	}
+	&.ace_class {
+		font-style: $rlang-namespace-font-style;
+		color: $rlang-namespace;
+	}
+	&.ace_type {
+		color: $rlang-namespace;
+	}
+}
+.ace_paren {
+	&.ace_keyword.ace_operator {
+		color: $rlang-bracket;
+	}
+}
+.ace_storage {
+	color: $rlang-reserved;
+	&.ace_type {
+		color: $rlang-reserved;
+	}
+}
+.ace_invalid {
+	background-color: transparentize($rlang-variable, 0.5);
+	&.ace_deprecated {
+		background-color: transparentize($rlang-reserved, 0.5);
+	}
+}
+.ace_string {
+	color: $rlang-string;
+}
+.ace_comment {
+	color: $rlang-comment;
+}
+.ace_invisible {
+	color: $ui-invisible;
+}
+.ace_variable {
+	color: $rlang-variable;
+	&.ace_parameter {
+		color: $rlang-value;
+	}
+}
+.ace_entity {
+	&.ace_name {
+		&.ace_function {
+			color: $rlang-function;
+		}
+		&.ace_tag {
+			color: $other-tag;
+		}
+	}
+	&.ace_other.ace_attribute-name {
+		color: $rlang-reserved;
+	}
+}
+.ace_bracket {
+	margin: 0 !important;
+	border: 0 !important;
+	background-color: $ui-bracket;
+}
+.ace_console_error {
+	background-color: $ui-line-find;
+}
+.ace_layer {
+	z-index: 3;
+	&.ace_print-margin-layer {
+		z-index: 2;
+	}
+	&.ace_marker-layer {
+		z-index: 1;
+	}
+}
+.ace_selection.ace_start {
+	box-shadow: 0 0 3px 0 $ui-background;
+	border-radius: 2px;
+}
+.ace_meta.ace_tag {
+	color: $rlang-operator;
+}
+.ace_markup.ace_heading {
+	font-weight: 600;
+	color: $rlang-string;
+}
+.nocolor.ace_editor .ace_line span {
+	color: $rlang-reserved !important;
+}
+
+/* ---- RStudio Theme ---- */
+/* background */
+.rstudio-themes-flat .rstudio-themes-dark-grey {
+	background: $ui-rstudio-background !important;
+	color: $ui-rstudio-color !important;
+  .rstudio-themes-background {
+    background: $ui-rstudio-background !important;
+  }
+}
+
+/* inactive tabs */
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+	background: $ui-rstudio-tabs-inactive !important;
+	.gwt-Label {
+		color: $ui-rstudio-tabs-inactive-color;
+	}
+}
+
+/* toolbar and selected tab */
+.rstudio-themes-flat .rstudio-themes-dark-grey {
+  .rstheme_center, .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+		background: $ui-rstudio-tabs-selected !important;
+  }
+	.gwt-TabLayoutPanelTab-selected .gwt-Label {
+		color: $ui-rstudio-tabs-selected-color;
+	}
+}
+
+.rstheme_toolbarWrapper {
+  background: $ui-rstudio-toolbar !important;
+}
+
+.rstudio-themes-flat {
+	.rstudio-themes-dark-grey {
+		/* spliters */
+    .gwt-SplitLayoutPanel-HDragger, .gwt-SplitLayoutPanel-VDragger {
+      background: transparent !important;
+    }
+  }
+	/* search */
+  .rstudio-themes-dark .search, &.rstudio-themes-dark-menus .search {
+    background: $ui-rstudio-search !important;
+  }
+}
+
+/* pane toolbars */
+.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
+     background: $ui-rstudio-toolbar !important;
+}
+/* menu background */
+.popupMiddleCenter, .menuPopupMiddleCenter, .suggestPopupMiddleCenter {
+		 background: $ui-completions-background !important;
+		 color: $ui-completions-color !important;
+}
+.themedPopupPanel {
+	border: solid 1px $ui-completions-border;
+	& ~ div.popupContent div:nth-child(1) {
+	  border: solid 1px $ui-completions-border;
+	}
+}
+.popupContent {
+  background: $ui-completions-background;
+	color: $ui-completions-color;
+	& div div:nth-child(2) {
+  	background: $ui-completions-background !important;
+  	border: solid 1px $ui-completions-border;
+  }
+}

_rstudio-dark.scss → rstudio/_rstudio-light.scss

 	background-color: $ui-line-active-gutter;
 }
 .ace_fold {
-	background-color: $ui-fold-arrows-background;
-	border-color: $ui-fold-arrows-color;
-}
-.ace_indent-guide{
-	border-right: 1px solid $ui-indent_guide;
+	background-color: $rlang-function;
+	border-color: $ui-foreground;
 }
 .ace_active-line ~ .ace_selection.ace_start {
 	background-color: opacify($ui-line-active, 1);
 .nocolor.ace_editor .ace_line span {
 	color: $rlang-reserved !important;
 }
+
+@import "_terminal";