Store rstudio style in base16 palette for consistency

R/make_functions.R

@@ -51,7 +51,7 @@ base16_make_theme <- function(palette_file) {
   base16_info          <- base16_get_theme_info(palette_file)
   base16_attribution   <- base16_info$attribution
   base16_name          <- base16_info$name
-  if (base16_info$isDark) base16_rstudio_style <- base16_info$rstudio_style
+  base16_rstudio_style <- base16_info$rstudio_style
   
   base16_template <- if (base16_info$isDark) {
     "base16-dark_template.scss"
@@ -69,12 +69,16 @@ base16_make_theme <- function(palette_file) {
 }
 
 base16_get_theme_info <- function(palette_file) {
+  # First and second comment lines of the palette_file must be
+  # the base16 theme attribution (1) and the studio light/dark style (2)
+  
   info <- list()
-  base16_meta <- readLines(palette_file, n = 2)
+  base16_meta <- readLines(palette_file)
+  base16_meta <- base16_meta[grepl("^\\s*/\\*", base16_meta)]
   info$attribution <- base16_meta[1]
   info$rstudio_style <- base16_meta[2]
-  info$isDark <- FALSE
-  if (base16_meta[2] == "") {
+  info$isDark <- grepl("is-dark: TRUE", info$rstudio_style, fixed = TRUE)
+  if (info$rstudio_style == "") {
     info$isDark <- TRUE
     info$rstudio_style <- "/* rs-theme-is-dark: TRUE */"
   }

src/base16-3024.scss

@@ -1,5 +1,4 @@
-/* rs-theme-name: Sassy - base16 NA */
-/* rs-theme-is-dark: TRUE */
+/* rs-theme-name: Sassy - base16 3024 */
 
 @import "palettes/base16/_base16-3024.scss";
 

src/base16-apathy.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Apathy */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-apathy.scss";
 

src/base16-ashes.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Ashes */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-ashes.scss";
 

src/base16-atelier-cave.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Atelier Cave */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-atelier-cave.scss";
 

src/base16-atelier-dune.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Atelier Dune */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-atelier-dune.scss";
 

src/base16-atelier-estuary.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Atelier Estuary */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-atelier-estuary.scss";
 

src/base16-atelier-forest.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Atelier Forest */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-atelier-forest.scss";
 

src/base16-atelier-heath.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Atelier Heath */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-atelier-heath.scss";
 

src/base16-atelier-lakeside.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Atelier Lakeside */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-atelier-lakeside.scss";
 

src/base16-atelier-plateau.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Atelier Plateau */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-atelier-plateau.scss";
 

src/base16-atelier-savanna.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Atelier Savanna */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-atelier-savanna.scss";
 

src/base16-atelier-seaside.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Atelier Seaside */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-atelier-seaside.scss";
 

src/base16-atelier-sulphurpool.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Atelier Sulphurpool */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-atelier-sulphurpool.scss";
 

src/base16-bespin.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Bespin */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-bespin.scss";
 

src/base16-brewer.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Brewer */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-brewer.scss";
 

src/base16-bright.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Bright */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-bright.scss";
 

src/base16-chalk.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Chalk */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-chalk.scss";
 

src/base16-codeschool.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Codeschool */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-codeschool.scss";
 

src/base16-cupcake.scss

@@ -1,38 +1,37 @@
 /* rs-theme-name: Sassy - base16 Cupcake */
 
-
 @import "palettes/base16/_base16-cupcake.scss";
 
 // primary UI colors
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-darktooth.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Darktooth */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-darktooth.scss";
 

src/base16-default-dark.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Default Dark */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-default-dark.scss";
 

src/base16-default-light.scss

@@ -1,38 +1,37 @@
 /* rs-theme-name: Sassy - base16 Default Light */
 
-
 @import "palettes/base16/_base16-default-light.scss";
 
 // primary UI colors
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-dracula.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Dracula */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-dracula.scss";
 

src/base16-eighties.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Eighties */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-eighties.scss";
 

src/base16-embers.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Embers */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-embers.scss";
 

src/base16-flat.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Flat */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-flat.scss";
 

src/base16-github.scss

@@ -1,38 +1,37 @@
 /* rs-theme-name: Sassy - base16 Github */
 
-
 @import "palettes/base16/_base16-github.scss";
 
 // primary UI colors
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-google-dark.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Google Dark */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-google-dark.scss";
 

src/base16-google-light.scss

@@ -1,38 +1,37 @@
 /* rs-theme-name: Sassy - base16 Google Light */
 
-
 @import "palettes/base16/_base16-google-light.scss";
 
 // primary UI colors
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-grayscale-dark.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Grayscale Dark */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-grayscale-dark.scss";
 

src/base16-grayscale-light.scss

@@ -1,38 +1,37 @@
 /* rs-theme-name: Sassy - base16 Grayscale Light */
 
-
 @import "palettes/base16/_base16-grayscale-light.scss";
 
 // primary UI colors
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-green-screen.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Green Screen */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-green-screen.scss";
 

src/base16-gruvbox-dark-hard.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Gruvbox dark, hard */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-gruvbox-dark-hard.scss";
 

src/base16-gruvbox-dark-medium.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Gruvbox dark, medium */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-gruvbox-dark-medium.scss";
 

src/base16-gruvbox-dark-pale.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Gruvbox dark, pale */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-gruvbox-dark-pale.scss";
 

src/base16-gruvbox-dark-soft.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Gruvbox dark, soft */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-gruvbox-dark-soft.scss";
 

src/base16-gruvbox-light-hard.scss

@@ -1,38 +1,37 @@
 /* rs-theme-name: Sassy - base16 Gruvbox light, hard */
 
-
 @import "palettes/base16/_base16-gruvbox-light-hard.scss";
 
 // primary UI colors
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-gruvbox-light-medium.scss

@@ -1,38 +1,37 @@
 /* rs-theme-name: Sassy - base16 Gruvbox light, medium */
 
-
 @import "palettes/base16/_base16-gruvbox-light-medium.scss";
 
 // primary UI colors
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-gruvbox-light-soft.scss

@@ -1,38 +1,37 @@
 /* rs-theme-name: Sassy - base16 Gruvbox light, soft */
 
-
 @import "palettes/base16/_base16-gruvbox-light-soft.scss";
 
 // primary UI colors
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-harmonic16-dark.scss

@@ -1,5 +1,4 @@
-/* rs-theme-name: Sassy - base16 NA */
-/* rs-theme-is-dark: TRUE */
+/* rs-theme-name: Sassy - base16 Harmonic16 Dark */
 
 @import "palettes/base16/_base16-harmonic16-dark.scss";
 

src/base16-harmonic16-light.scss

@@ -1,5 +1,4 @@
-/* rs-theme-name: Sassy - base16 NA */
-
+/* rs-theme-name: Sassy - base16 Harmonic16 Light */
 
 @import "palettes/base16/_base16-harmonic16-light.scss";
 
@@ -7,32 +6,32 @@
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-hopscotch.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Hopscotch */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-hopscotch.scss";
 

src/base16-ir-black.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 IR Black */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-ir-black.scss";
 

src/base16-isotope.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Isotope */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-isotope.scss";
 

src/base16-london-tube.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 London Tube */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-london-tube.scss";
 

src/base16-macintosh.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Macintosh */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-macintosh.scss";
 

src/base16-marrakesh.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Marrakesh */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-marrakesh.scss";
 

src/base16-materia.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Materia */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-materia.scss";
 

src/base16-mexico-light.scss

@@ -1,38 +1,37 @@
 /* rs-theme-name: Sassy - base16 Mexico Light */
 
-
 @import "palettes/base16/_base16-mexico-light.scss";
 
 // primary UI colors
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-mocha.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Mocha */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-mocha.scss";
 

src/base16-monokai.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Monokai */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-monokai.scss";
 

src/base16-nord.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Nord */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-nord.scss";
 

src/base16-ocean.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Ocean */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-ocean.scss";
 

src/base16-oceanicnext.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 OceanicNext */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-oceanicnext.scss";
 

src/base16-onedark.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 OneDark */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-onedark.scss";
 

src/base16-paraiso.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Paraiso */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-paraiso.scss";
 

src/base16-phd.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 PhD */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-phd.scss";
 

src/base16-pico.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Pico */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-pico.scss";
 

src/base16-pop.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Pop */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-pop.scss";
 

src/base16-railscasts.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Railscasts */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-railscasts.scss";
 

src/base16-rebecca.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Rebecca */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-rebecca.scss";
 

src/base16-seti-ui.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Seti UI */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-seti-ui.scss";
 

src/base16-shapeshifter.scss

@@ -1,38 +1,37 @@
 /* rs-theme-name: Sassy - base16 Shapeshifter */
 
-
 @import "palettes/base16/_base16-shapeshifter.scss";
 
 // primary UI colors
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-solar-flare.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Solar Flare */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-solar-flare.scss";
 

src/base16-solarized-dark.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Solarized Dark */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-solarized-dark.scss";
 

src/base16-solarized-light.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Solarized Light */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-solarized-light.scss";
 
@@ -7,32 +6,32 @@
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-spacemacs.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Spacemacs */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-spacemacs.scss";
 

src/base16-summerfruit-dark.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Summerfruit Dark */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-summerfruit-dark.scss";
 

src/base16-summerfruit-light.scss

@@ -1,38 +1,37 @@
 /* rs-theme-name: Sassy - base16 Summerfruit Light */
 
-
 @import "palettes/base16/_base16-summerfruit-light.scss";
 
 // primary UI colors
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-tomorrow-night.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Tomorrow Night */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-tomorrow-night.scss";
 

src/base16-tomorrow.scss

@@ -1,38 +1,37 @@
 /* rs-theme-name: Sassy - base16 Tomorrow */
 
-
 @import "palettes/base16/_base16-tomorrow.scss";
 
 // primary UI colors
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-twilight.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Twilight */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-twilight.scss";
 

src/base16-unikitty-dark.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Unikitty Dark */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-unikitty-dark.scss";
 

src/base16-unikitty-light.scss

@@ -1,38 +1,37 @@
 /* rs-theme-name: Sassy - base16 Unikitty Light */
 
-
 @import "palettes/base16/_base16-unikitty-light.scss";
 
 // primary UI colors
 $ui-background           : $base00;
 $ui-foreground           : $base07;
 $ui-code-chunk-background: $base01;
-$ui-selection            : transparentize($base05, 0.6);
+$ui-selection            : transparentize($base02, 0.6);
 $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
-$ui-margin-line          : transparentize($ui-selection, 0.25);
+$ui-margin-line          : transparentize($ui-selection, 0.2);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : darken($ui-background, 2%);
 
 // less common UI colors
-$ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);
+$ui-line-active           : transparentize(darken($ui-background, 10%), 0.5);
 $ui-line-active-gutter    : $base01;
 $ui-line-active-selection : $base02;
 $ui-line-find             : $base01;
 $ui-bracket               : $base02;
 $ui-invisible             : $base03;
 $ui-indent-guide          : $base02;
-$ui-debug-background      : lighten($ui-background, 10%);
+$ui-debug-background      : darken($ui-background, 10%);
 $ui-fold-arrows-background: $base08;
 $ui-fold-arrows-color     : $ui-foreground;
 
 // rstudio
-$ui-rstudio-background          : $base01;
+$ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
-$ui-rstudio-tabs-inactive       : $base01;
-$ui-rstudio-tabs-inactive-color : $base04;
-$ui-rstudio-tabs-selected       : $base02;
-$ui-rstudio-tabs-selected-color : $base07;
+$ui-rstudio-tabs-inactive       : $base02;
+$ui-rstudio-tabs-inactive-color : $base03;
+$ui-rstudio-tabs-selected       : $base01;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;
@@ -57,4 +56,4 @@ $rlang-namespace-font-style: italic;
 
 $other-tag: $rlang-variable;
 
-@import "rstudio/_rstudio-dark", "rstudio/_terminal";
+@import "rstudio/_rstudio-light", "rstudio/_terminal";

src/base16-woodland.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 Woodland */
-/* rs-theme-is-dark: TRUE */
 
 @import "palettes/base16/_base16-woodland.scss";
 

src/base16/base16-dark_template.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 {{base16_name}} */
-{{#base16_rstudio_style}}{{base16_rstudio_style}}{{/base16_rstudio_style}}
 
 @import "palettes/base16/{{base16_palette}}";
 

src/base16/base16-light_template.scss

@@ -1,5 +1,4 @@
 /* rs-theme-name: Sassy - base16 {{base16_name}} */
-{{#base16_rstudio_style}}{{base16_rstudio_style}}{{/base16_rstudio_style}}
 
 @import "palettes/base16/{{base16_palette}}";
 
@@ -30,9 +29,9 @@ $ui-fold-arrows-color     : $ui-foreground;
 $ui-rstudio-background          : $base00;
 $ui-rstudio-color               : $ui-foreground;
 $ui-rstudio-tabs-inactive       : $base02;
-$ui-rstudio-tabs-inactive-color : $base04;
+$ui-rstudio-tabs-inactive-color : $base03;
 $ui-rstudio-tabs-selected       : $base01;
-$ui-rstudio-tabs-selected-color : $base06;
+$ui-rstudio-tabs-selected-color : $base05;
 $ui-rstudio-toolbar             : $ui-rstudio-tabs-selected;
 $ui-rstudio-toolbar-color       : $ui-foreground;
 $ui-rstudio-search              : $ui-rstudio-toolbar;

src/palettes/base16/_base16-3024.scss

@@ -1,4 +1,5 @@
 /* 3024 by Jan T. Sott (http://github.com/idleberg) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #090300;
 $base01: #3a3432;

src/palettes/base16/_base16-apathy.scss

@@ -1,4 +1,5 @@
 /* Apathy by Jannik Siebert (https://github.com/janniks) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #031A16;
 $base01: #0B342D;

src/palettes/base16/_base16-ashes.scss

@@ -1,4 +1,5 @@
 /* Ashes by Jannik Siebert (https://github.com/janniks) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #1C2023;
 $base01: #393F45;

src/palettes/base16/_base16-atelier-cave.scss

@@ -1,4 +1,5 @@
 /* Atelier Cave by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #19171c;
 $base01: #26232a;

src/palettes/base16/_base16-atelier-dune.scss

@@ -1,4 +1,5 @@
 /* Atelier Dune by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #20201d;
 $base01: #292824;

src/palettes/base16/_base16-atelier-estuary.scss

@@ -1,4 +1,5 @@
 /* Atelier Estuary by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #22221b;
 $base01: #302f27;

src/palettes/base16/_base16-atelier-forest.scss

@@ -1,4 +1,5 @@
 /* Atelier Forest by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #1b1918;
 $base01: #2c2421;

src/palettes/base16/_base16-atelier-heath.scss

@@ -1,4 +1,5 @@
 /* Atelier Heath by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #1b181b;
 $base01: #292329;

src/palettes/base16/_base16-atelier-lakeside.scss

@@ -1,4 +1,5 @@
 /* Atelier Lakeside by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #161b1d;
 $base01: #1f292e;

src/palettes/base16/_base16-atelier-plateau.scss

@@ -1,4 +1,5 @@
 /* Atelier Plateau by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #1b1818;
 $base01: #292424;

src/palettes/base16/_base16-atelier-savanna.scss

@@ -1,4 +1,5 @@
 /* Atelier Savanna by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #171c19;
 $base01: #232a25;

src/palettes/base16/_base16-atelier-seaside.scss

@@ -1,4 +1,5 @@
 /* Atelier Seaside by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #131513;
 $base01: #242924;

src/palettes/base16/_base16-atelier-sulphurpool.scss

@@ -1,4 +1,5 @@
 /* Atelier Sulphurpool by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #202746;
 $base01: #293256;

src/palettes/base16/_base16-bespin.scss

@@ -1,4 +1,5 @@
 /* Bespin by Jan T. Sott */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #28211c;
 $base01: #36312e;

src/palettes/base16/_base16-brewer.scss

@@ -1,4 +1,5 @@
 /* Brewer by Timothée Poisot (http://github.com/tpoisot) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #0c0d0e;
 $base01: #2e2f30;

src/palettes/base16/_base16-bright.scss

@@ -1,4 +1,5 @@
 /* Bright by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #000000;
 $base01: #303030;

src/palettes/base16/_base16-chalk.scss

@@ -1,4 +1,5 @@
 /* Chalk by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #151515;
 $base01: #202020;

src/palettes/base16/_base16-codeschool.scss

@@ -1,4 +1,5 @@
 /* Codeschool by brettof86 */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #232c31;
 $base01: #1c3657;

src/palettes/base16/_base16-darktooth.scss

@@ -1,4 +1,5 @@
 /* Darktooth by Jason Milkins (https://github.com/jasonm23) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #1D2021;
 $base01: #32302F;

src/palettes/base16/_base16-default-dark.scss

@@ -1,4 +1,5 @@
 /* Default Dark by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #181818;
 $base01: #282828;

src/palettes/base16/_base16-dracula.scss

@@ -1,4 +1,5 @@
 /* Dracula by Mike Barkmin (http://github.com/mikebarkmin) based on Dracula Theme (http://github.com/dracula) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #282936;
 $base01: #3a3c4e;

src/palettes/base16/_base16-eighties.scss

@@ -1,4 +1,5 @@
 /* Eighties by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 
 $base00: #2d2d2d;
 $base01: #393939;