Compile themes

dist/base16-3024.rstheme

@@ -1,8 +1,8 @@
-/* rs-theme-name: Sassy - base16 NA */
-/* rs-theme-is-dark: TRUE */
+/* rs-theme-name: Sassy - base16 3024 */
 /* 3024 by Jan T. Sott (http://github.com/idleberg) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #090300;
+  background: #130600;
   color: rgba(247, 247, 247, 0.5);
 }
 

dist/base16-apathy.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Apathy */
-/* rs-theme-is-dark: TRUE */
 /* Apathy by Jannik Siebert (https://github.com/janniks) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #031A16;
+  background: #04231e;
   color: rgba(210, 231, 228, 0.5);
 }
 

dist/base16-ashes.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Ashes */
-/* rs-theme-is-dark: TRUE */
 /* Ashes by Jannik Siebert (https://github.com/janniks) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #1C2023;
+  background: #212529;
   color: rgba(243, 244, 245, 0.5);
 }
 

dist/base16-atelier-cave.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Atelier Cave */
-/* rs-theme-is-dark: TRUE */
 /* Atelier Cave by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #19171c;
+  background: #1e1c22;
   color: rgba(239, 236, 244, 0.5);
 }
 

dist/base16-atelier-dune.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Atelier Dune */
-/* rs-theme-is-dark: TRUE */
 /* Atelier Dune by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #20201d;
+  background: #252522;
   color: rgba(254, 251, 236, 0.5);
 }
 

dist/base16-atelier-estuary.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Atelier Estuary */
-/* rs-theme-is-dark: TRUE */
 /* Atelier Estuary by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #22221b;
+  background: #282820;
   color: rgba(244, 243, 236, 0.5);
 }
 

dist/base16-atelier-forest.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Atelier Forest */
-/* rs-theme-is-dark: TRUE */
 /* Atelier Forest by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #1b1918;
+  background: #201e1d;
   color: rgba(241, 239, 238, 0.5);
 }
 

dist/base16-atelier-heath.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Atelier Heath */
-/* rs-theme-is-dark: TRUE */
 /* Atelier Heath by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #1b181b;
+  background: #201d20;
   color: rgba(247, 243, 247, 0.5);
 }
 

dist/base16-atelier-lakeside.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Atelier Lakeside */
-/* rs-theme-is-dark: TRUE */
 /* Atelier Lakeside by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #161b1d;
+  background: #1a2023;
   color: rgba(235, 248, 255, 0.5);
 }
 

dist/base16-atelier-plateau.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Atelier Plateau */
-/* rs-theme-is-dark: TRUE */
 /* Atelier Plateau by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #1b1818;
+  background: #201d1d;
   color: rgba(244, 236, 236, 0.5);
 }
 

dist/base16-atelier-savanna.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Atelier Savanna */
-/* rs-theme-is-dark: TRUE */
 /* Atelier Savanna by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #171c19;
+  background: #1c221e;
   color: rgba(236, 244, 238, 0.5);
 }
 

dist/base16-atelier-seaside.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Atelier Seaside */
-/* rs-theme-is-dark: TRUE */
 /* Atelier Seaside by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #131513;
+  background: #181a18;
   color: rgba(244, 251, 244, 0.5);
 }
 

dist/base16-atelier-sulphurpool.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Atelier Sulphurpool */
-/* rs-theme-is-dark: TRUE */
 /* Atelier Sulphurpool by Bram de Haan (http://atelierbramdehaan.nl) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #202746;
+  background: #232b4d;
   color: rgba(245, 247, 255, 0.5);
 }
 

dist/base16-bespin.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Bespin */
-/* rs-theme-is-dark: TRUE */
 /* Bespin by Jan T. Sott */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #28211c;
+  background: #2e2620;
   color: rgba(186, 174, 158, 0.5);
 }
 

dist/base16-brewer.rstheme

@@ -1,9 +1,9 @@
 @charset "UTF-8";
 /* rs-theme-name: Sassy - base16 Brewer */
-/* rs-theme-is-dark: TRUE */
 /* Brewer by Timothée Poisot (http://github.com/tpoisot) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #0c0d0e;
+  background: #111213;
   color: rgba(252, 253, 254, 0.5);
 }
 

dist/base16-bright.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Bright */
-/* rs-theme-is-dark: TRUE */
 /* Bright by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #000000;
+  background: #050505;
   color: rgba(255, 255, 255, 0.5);
 }
 

dist/base16-chalk.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Chalk */
-/* rs-theme-is-dark: TRUE */
 /* Chalk by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #151515;
+  background: #1a1a1a;
   color: rgba(245, 245, 245, 0.5);
 }
 

dist/base16-codeschool.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Codeschool */
-/* rs-theme-is-dark: TRUE */
 /* Codeschool by brettof86 */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #232c31;
+  background: #273137;
   color: rgba(181, 216, 246, 0.5);
 }
 

dist/base16-cupcake.rstheme

@@ -2,13 +2,13 @@
 /* Cupcake by Chris Kempson (http://chriskempson.com) */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #fbf1f2;
+  background: #f9e9eb;
   color: rgba(88, 80, 98, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(139, 129, 152, 0.15);
+  background: rgba(216, 213, 221, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #585062;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #585062 !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(139, 129, 152, 0.4);
+  background: rgba(216, 213, 221, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(245, 221, 224, 0.5);
+  background: rgba(240, 201, 205, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(139, 129, 152, 0.4);
+  border: 1px solid rgba(216, 213, 221, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: white;
+  background-color: #f0c9cd;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #f2f1f4 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #fbf1f2 !important;
   color: #585062 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #f2f1f4 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #fbf1f2 !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #f2f1f4 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #d8d5dd !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #a59daf;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #bfb9c6;
 }
 
 /* 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: #d8d5dd !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #f2f1f4 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #585062;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #8b8198;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #d8d5dd !important;
+  background: #f2f1f4 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #585062 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #d8d5dd !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #f2f1f4 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #d8d5dd !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #f2f1f4 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #585062 !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #fbf1f2 !important;
   background: #585062 !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #fbf1f2;
-  padding: 2px;
+  background: inherit;
+  color: #585062;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #f2f1f4 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #d8d5dd !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #cbc7d2 !important;
-  color: #585062 !important;
+  background: #f2f1f4 !important;
+  color: #8b8198 !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #cbc7d2 !important;
-  color: #585062 !important;
+  background: #f2f1f4 !important;
+  color: #8b8198 !important;
 }
 
 .dataTables_info {
-  background: #cbc7d2 !important;
-  color: #585062 !important;
+  background: #f2f1f4 !important;
+  color: #8b8198 !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #fbf1f2;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #f2f1f4;
   border: 4px solid #fbf1f2;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(139, 129, 152, 0.4);
+  background-color: rgba(216, 213, 221, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-darktooth.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Darktooth */
-/* rs-theme-is-dark: TRUE */
 /* Darktooth by Jason Milkins (https://github.com/jasonm23) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #1D2021;
+  background: #222526;
   color: rgba(253, 244, 193, 0.5);
 }
 

dist/base16-default-dark.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Default Dark */
-/* rs-theme-is-dark: TRUE */
 /* Default Dark by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #181818;
+  background: #1d1d1d;
   color: rgba(248, 248, 248, 0.5);
 }
 

dist/base16-default-light.rstheme

@@ -2,13 +2,13 @@
 /* Default Light by Chris Kempson (http://chriskempson.com) */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #f8f8f8;
+  background: #f3f3f3;
   color: rgba(24, 24, 24, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(56, 56, 56, 0.15);
+  background: rgba(216, 216, 216, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #181818;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #181818 !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(56, 56, 56, 0.4);
+  background: rgba(216, 216, 216, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(235, 235, 235, 0.5);
+  background: rgba(223, 223, 223, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(56, 56, 56, 0.4);
+  border: 1px solid rgba(216, 216, 216, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: white;
+  background-color: #dfdfdf;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #e8e8e8 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #f8f8f8 !important;
   color: #181818 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #e8e8e8 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #f8f8f8 !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #e8e8e8 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #d8d8d8 !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #585858;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #b8b8b8;
 }
 
 /* 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: #d8d8d8 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #e8e8e8 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #181818;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #383838;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #d8d8d8 !important;
+  background: #e8e8e8 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #181818 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #d8d8d8 !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #e8e8e8 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #d8d8d8 !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #e8e8e8 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #181818 !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #f8f8f8 !important;
   background: #181818 !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #f8f8f8;
-  padding: 2px;
+  background: inherit;
+  color: #181818;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #e8e8e8 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #d8d8d8 !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #cbcbcb !important;
-  color: #181818 !important;
+  background: #e8e8e8 !important;
+  color: #383838 !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #cbcbcb !important;
-  color: #181818 !important;
+  background: #e8e8e8 !important;
+  color: #383838 !important;
 }
 
 .dataTables_info {
-  background: #cbcbcb !important;
-  color: #181818 !important;
+  background: #e8e8e8 !important;
+  color: #383838 !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #f8f8f8;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #e8e8e8;
   border: 4px solid #f8f8f8;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(56, 56, 56, 0.4);
+  background-color: rgba(216, 216, 216, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-dracula.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Dracula */
-/* rs-theme-is-dark: TRUE */
 /* Dracula by Mike Barkmin (http://github.com/mikebarkmin) based on Dracula Theme (http://github.com/dracula) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #282936;
+  background: #2c2d3c;
   color: rgba(247, 247, 251, 0.5);
 }
 

dist/base16-eighties.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Eighties */
-/* rs-theme-is-dark: TRUE */
 /* Eighties by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #2d2d2d;
+  background: #323232;
   color: rgba(242, 240, 236, 0.5);
 }
 

dist/base16-embers.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Embers */
-/* rs-theme-is-dark: TRUE */
 /* Embers by Jannik Siebert (https://github.com/janniks) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #16130F;
+  background: #1c1813;
   color: rgba(219, 214, 209, 0.5);
 }
 

dist/base16-flat.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Flat */
-/* rs-theme-is-dark: TRUE */
 /* Flat by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #2C3E50;
+  background: #304357;
   color: rgba(236, 240, 241, 0.5);
 }
 

dist/base16-github.rstheme

@@ -1,219 +1,220 @@
 /* rs-theme-name: Sassy - base16 Github */
-/* Github by Defman21 */
+/* Github by Github, gadenbuie */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #ffffff;
-  color: rgba(255, 255, 255, 0.5);
+  background: #f4f6f8;
+  color: rgba(36, 41, 46, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(51, 51, 51, 0.15);
+  background: rgba(211, 218, 227, 0.2);
 }
 
 .ace_editor {
-  background-color: #ffffff;
-  color: #ffffff;
+  background-color: #fafbfc;
+  color: #24292e;
 }
 
 .rstudio-themes-flat.ace_editor_theme {
-  background-color: #ffffff;
-  color: #ffffff;
+  background-color: #fafbfc;
+  color: #24292e;
 }
 
 .rstudio-themes-flat.ace_editor_theme .profvis-flamegraph {
-  background-color: #ffffff;
-  color: #ffffff;
+  background-color: #fafbfc;
+  color: #24292e;
 }
 
 .rstudio-themes-flat .ace_editor_theme {
-  background-color: #ffffff;
-  color: #ffffff;
+  background-color: #fafbfc;
+  color: #24292e;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #24292e !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
-  color: #ffffff;
+  color: #24292e;
 }
 
 .ace_cursor {
-  color: #795da3;
+  color: #6f42c1;
 }
 
 .normal-mode .ace_cursor {
   border: 0 !important;
-  background-color: #795da3;
+  background-color: #6f42c1;
   opacity: 0.5;
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(51, 51, 51, 0.4);
+  background: rgba(211, 218, 227, 0.4);
 }
 
 .ace_marker-layer .ace_step {
-  background: #1f46bd;
+  background: #2caf4c;
 }
 
 .ace_marker-layer .ace_bracket {
   margin: -1px 0 0 -1px;
-  border: 1px solid #c8c8fa;
+  border: 1px solid #D3DAE3;
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(242, 242, 242, 0.5);
+  background: rgba(218, 226, 233, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(51, 51, 51, 0.4);
+  border: 1px solid rgba(211, 218, 227, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
   position: absolute;
   z-index: -1;
-  background-color: #f5f5f5;
+  background-color: #f6f8fa;
 }
 
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: white;
+  background-color: #dae2e9;
 }
 
 .ace_marker-layer .ace_find_line {
   position: absolute;
   z-index: -1;
-  background-color: #f5f5f5;
+  background-color: #f6f8fa;
 }
 
 .ace_gutter-active-line {
-  background-color: #f5f5f5;
+  background-color: #f6f8fa;
 }
 
 .ace_fold {
-  background-color: #ed6a43;
-  border: 1px solid #ffffff !important;
+  background-color: #b31d28;
+  border: 1px solid #24292e !important;
 }
 
 .ace_indent-guide {
-  border-right: 1px solid #c8c8fa;
+  border-right: 1px solid #D3DAE3;
   margin-right: -1px;
 }
 
 .ace_active-line ~ .ace_selection.ace_start {
-  background-color: #c8c8fa;
+  background-color: #D3DAE3;
 }
 
 .ace_keyword {
   font-style: normal;
-  color: #a71d5d;
+  color: #032f62;
 }
 
 .ace_keyword.ace_operator {
   font-style: normal;
-  color: #183691;
+  color: #d73a49;
 }
 
 .ace_keyword.ace_other.ace_unit {
   font-style: normal;
-  color: #0086b3;
+  color: #735c0f;
 }
 
 .ace_constant.ace_language {
-  color: #333333;
+  color: #005cc5;
 }
 
 .ace_constant.ace_numeric {
-  color: #0086b3;
+  color: #735c0f;
 }
 
 .ace_constant.ace_character {
-  color: #0086b3;
+  color: #735c0f;
 }
 
 .ace_constant.ace_other {
-  color: #ffffff;
+  color: #24292e;
 }
 
 .ace_support.ace_function {
-  color: #795da3;
+  color: #e36209;
 }
 
 .ace_support.ace_constant {
-  color: #0086b3;
+  color: #735c0f;
 }
 
 .ace_support.ace_class {
   font-style: italic;
-  color: #795da3;
+  color: #6f42c1;
 }
 
 .ace_support.ace_type {
-  color: #795da3;
+  color: #6f42c1;
 }
 
 .ace_paren.ace_keyword.ace_operator {
-  color: #183691;
+  color: #d73a49;
 }
 
 .ace_storage {
-  color: #a71d5d;
+  color: #032f62;
 }
 
 .ace_storage.ace_type {
-  color: #a71d5d;
+  color: #032f62;
 }
 
 .ace_invalid {
-  background-color: rgba(237, 106, 67, 0.5);
+  background-color: rgba(179, 29, 40, 0.5);
 }
 
 .ace_invalid.ace_deprecated {
-  background-color: rgba(167, 29, 93, 0.5);
+  background-color: rgba(3, 47, 98, 0.5);
 }
 
 .ace_string {
-  color: #183691;
+  color: #22863a;
 }
 
 .ace_comment {
-  color: #e8e8e8;
+  color: #6a737d;
 }
 
 .ace_invisible {
-  color: #969896;
+  color: #959da5;
 }
 
 .ace_variable {
-  color: #ed6a43;
+  color: #b31d28;
 }
 
 .ace_variable.ace_parameter {
-  color: #0086b3;
+  color: #735c0f;
 }
 
 .ace_entity.ace_name.ace_function {
-  color: #795da3;
+  color: #e36209;
 }
 
 .ace_entity.ace_name.ace_tag {
-  color: #ed6a43;
+  color: #b31d28;
 }
 
 .ace_entity.ace_other.ace_attribute-name {
-  color: #a71d5d;
+  color: #032f62;
 }
 
 .ace_bracket {
   margin: 0 !important;
   border: 0 !important;
-  background-color: #c8c8fa;
+  background-color: #D3DAE3;
 }
 
 .ace_console_error {
-  background-color: #f5f5f5;
+  background-color: #f6f8fa;
 }
 
 .ace_layer {
@@ -229,59 +230,59 @@
 }
 
 .ace_selection.ace_start {
-  box-shadow: 0 0 3px 0 #ffffff;
+  box-shadow: 0 0 3px 0 #fafbfc;
   border-radius: 2px;
 }
 
 .ace_meta.ace_tag {
-  color: #183691;
+  color: #d73a49;
 }
 
 .ace_markup.ace_heading,
 .ace_markup.ace_heading ~ .ace_heading {
   font-weight: 600;
-  color: #183691;
+  color: #22863a;
 }
 
 .ace_support.ace_function.ace_codebegin, .ace_support.ace_function.ace_codeend {
-  color: #795da3;
+  color: #e36209;
 }
 
 .ace_markup.ace_href {
-  color: #a71d5d;
+  color: #032f62;
 }
 
 .nocolor.ace_editor .ace_line span {
-  color: #a71d5d !important;
+  color: #032f62 !important;
 }
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #f5f5f5 !important;
-  color: #ffffff !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #fafbfc !important;
+  color: #24292e !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #f5f5f5 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #fafbfc !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #f5f5f5 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #D3DAE3 !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #e8e8e8;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #959da5;
 }
 
 /* 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: #c8c8fa !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #f6f8fa !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #ffffff;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #0366D6;
 }
 
 .rstudio-themes-flat {
@@ -289,116 +290,116 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #c8c8fa !important;
+  background: #f6f8fa !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
-  color: #ffffff !important;
+  color: #24292e !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #c8c8fa !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #f6f8fa !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #c8c8fa !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #f6f8fa !important;
 }
 
 /* menu background */
 .rstudio-themes-flat .popupMiddleCenter, .rstudio-themes-flat .menuPopupMiddleCenter, .rstudio-themes-flat .suggestPopupMiddleCenter {
-  background: #ffffff !important;
-  color: #ffffff !important;
+  background: #fafbfc !important;
+  color: #24292e !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
-  color: #ffffff !important;
-  background: #ffffff !important;
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
+  color: #fafbfc !important;
+  background: #24292e !important;
 }
 
 .rstudio-themes-flat .themedPopupPanel {
-  border: solid 1px #c8c8fa;
+  border: solid 1px #D3DAE3;
 }
 
 .rstudio-themes-flat .themedPopupPanel ~ div.popupContent div:nth-child(1) {
-  border: solid 1px #c8c8fa;
+  border: solid 1px #D3DAE3;
 }
 
 .rstudio-themes-flat .popupContent {
-  background: #ffffff;
-  color: #ffffff;
+  background: #fafbfc;
+  color: #24292e;
 }
 
 .rstudio-themes-flat .popupContent:not(.popupMiddleCenterInner) div div:nth-child(2) {
-  background: #ffffff !important;
-  border: solid 1px #c8c8fa;
+  background: #fafbfc !important;
+  border: solid 1px #D3DAE3;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #ffffff;
-  padding: 2px;
+  background: inherit;
+  color: #24292e;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
-  background: #ffffff;
+  background: #24292e;
   border: 0;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table .gwt-Label {
-  color: #ffffff;
+  color: #fafbfc;
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #f5f5f5 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #D3DAE3 !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #b1b1f8 !important;
-  color: #ffffff !important;
+  background: #f6f8fa !important;
+  color: #0366D6 !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #b1b1f8 !important;
-  color: #ffffff !important;
+  background: #f6f8fa !important;
+  color: #0366D6 !important;
 }
 
 .dataTables_info {
-  background: #b1b1f8 !important;
-  color: #ffffff !important;
+  background: #f6f8fa !important;
+  color: #0366D6 !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
-  background: #ffffff;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+  background: #fafbfc;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
-  background: #f5f5f5;
-  border: 4px solid #ffffff;
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+  background: #f6f8fa;
+  border: 4px solid #fafbfc;
 }
 
 .terminal {
-  background-color: #ffffff;
-  color: #ffffff;
+  background-color: #fafbfc;
+  color: #24292e;
   font-feature-settings: "liga" 0;
   position: relative;
   user-select: none;
@@ -407,37 +408,37 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .terminal.xterm-cursor-style-block.focus:not(.xterm-cursor-blink-on) .terminal-cursor {
-  background-color: #795da3;
-  color: #795da3;
+  background-color: #6f42c1;
+  color: #6f42c1;
 }
 
 .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: #ffffff;
+  background-color: #fafbfc;
 }
 
 .terminal:not(.focus) .terminal-cursor {
-  outline: 1px solid #ffffff;
+  outline: 1px solid #24292e;
   outline-offset: -1px;
 }
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(51, 51, 51, 0.4);
+  background-color: rgba(211, 218, 227, 0.4);
 }
 
 .terminal .xterm-viewport {
-  background-color: #ffffff;
+  background-color: #fafbfc;
   overflow-y: scroll;
 }
 
 .xtermInvertColor {
-  color: #ffffff;
+  color: #24292e;
 }
 
 .xtermInvertBgColor {
-  background-color: #ffffff;
+  background-color: #fafbfc;
 }
 
 .xtermBold {

dist/base16-google-dark.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Google Dark */
-/* rs-theme-is-dark: TRUE */
 /* Google Dark by Seth Wright (http://sethawright.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #1d1f21;
+  background: #222426;
   color: rgba(255, 255, 255, 0.5);
 }
 

dist/base16-google-light.rstheme

@@ -2,13 +2,13 @@
 /* Google Light by Seth Wright (http://sethawright.com) */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #ffffff;
+  background: #fafafa;
   color: rgba(29, 31, 33, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(55, 59, 65, 0.15);
+  background: rgba(197, 200, 198, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #1d1f21;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #1d1f21 !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(55, 59, 65, 0.4);
+  background: rgba(197, 200, 198, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(242, 242, 242, 0.5);
+  background: rgba(230, 230, 230, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(55, 59, 65, 0.4);
+  border: 1px solid rgba(197, 200, 198, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: white;
+  background-color: #e6e6e6;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #e0e0e0 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #ffffff !important;
   color: #1d1f21 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #e0e0e0 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #ffffff !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #e0e0e0 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #c5c8c6 !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #969896;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #b4b7b4;
 }
 
 /* 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: #c5c8c6 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #e0e0e0 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #1d1f21;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #373b41;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #c5c8c6 !important;
+  background: #e0e0e0 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #1d1f21 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #c5c8c6 !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #e0e0e0 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #c5c8c6 !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #e0e0e0 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #1d1f21 !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #ffffff !important;
   background: #1d1f21 !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #ffffff;
-  padding: 2px;
+  background: inherit;
+  color: #1d1f21;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #e0e0e0 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #c5c8c6 !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #b8bcb9 !important;
-  color: #1d1f21 !important;
+  background: #e0e0e0 !important;
+  color: #373b41 !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #b8bcb9 !important;
-  color: #1d1f21 !important;
+  background: #e0e0e0 !important;
+  color: #373b41 !important;
 }
 
 .dataTables_info {
-  background: #b8bcb9 !important;
-  color: #1d1f21 !important;
+  background: #e0e0e0 !important;
+  color: #373b41 !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #ffffff;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #e0e0e0;
   border: 4px solid #ffffff;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(55, 59, 65, 0.4);
+  background-color: rgba(197, 200, 198, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-grayscale-dark.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Grayscale Dark */
-/* rs-theme-is-dark: TRUE */
 /* Grayscale Dark by Alexandre Gavioli (https://github.com/Alexx2/) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #101010;
+  background: #151515;
   color: rgba(247, 247, 247, 0.5);
 }
 

dist/base16-grayscale-light.rstheme

@@ -2,13 +2,13 @@
 /* Grayscale Light by Alexandre Gavioli (https://github.com/Alexx2/) */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #f7f7f7;
+  background: #f2f2f2;
   color: rgba(16, 16, 16, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(70, 70, 70, 0.15);
+  background: rgba(185, 185, 185, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #101010;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #101010 !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(70, 70, 70, 0.4);
+  background: rgba(185, 185, 185, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(234, 234, 234, 0.5);
+  background: rgba(222, 222, 222, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(70, 70, 70, 0.4);
+  border: 1px solid rgba(185, 185, 185, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: white;
+  background-color: #dedede;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #e3e3e3 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #f7f7f7 !important;
   color: #101010 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #e3e3e3 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #f7f7f7 !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #e3e3e3 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #b9b9b9 !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #525252;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #ababab;
 }
 
 /* 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: #b9b9b9 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #e3e3e3 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #101010;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #464646;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #b9b9b9 !important;
+  background: #e3e3e3 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #101010 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #b9b9b9 !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #e3e3e3 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #b9b9b9 !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #e3e3e3 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #101010 !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #f7f7f7 !important;
   background: #101010 !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #f7f7f7;
-  padding: 2px;
+  background: inherit;
+  color: #101010;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #e3e3e3 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #b9b9b9 !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #acacac !important;
-  color: #101010 !important;
+  background: #e3e3e3 !important;
+  color: #464646 !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #acacac !important;
-  color: #101010 !important;
+  background: #e3e3e3 !important;
+  color: #464646 !important;
 }
 
 .dataTables_info {
-  background: #acacac !important;
-  color: #101010 !important;
+  background: #e3e3e3 !important;
+  color: #464646 !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #f7f7f7;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #e3e3e3;
   border: 4px solid #f7f7f7;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(70, 70, 70, 0.4);
+  background-color: rgba(185, 185, 185, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-green-screen.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Green Screen */
-/* rs-theme-is-dark: TRUE */
 /* Green Screen by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #001100;
+  background: #001b00;
   color: rgba(0, 255, 0, 0.5);
 }
 

dist/base16-gruvbox-dark-hard.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Gruvbox dark, hard */
-/* rs-theme-is-dark: TRUE */
 /* Gruvbox dark, hard by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #1d2021;
+  background: #222526;
   color: rgba(251, 241, 199, 0.5);
 }
 

dist/base16-gruvbox-dark-medium.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Gruvbox dark, medium */
-/* rs-theme-is-dark: TRUE */
 /* Gruvbox dark, medium by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #282828;
+  background: #2d2d2d;
   color: rgba(251, 241, 199, 0.5);
 }
 

dist/base16-gruvbox-dark-pale.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Gruvbox dark, pale */
-/* rs-theme-is-dark: TRUE */
 /* Gruvbox dark, pale by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #262626;
+  background: #2b2b2b;
   color: rgba(235, 219, 178, 0.5);
 }
 

dist/base16-gruvbox-dark-soft.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Gruvbox dark, soft */
-/* rs-theme-is-dark: TRUE */
 /* Gruvbox dark, soft by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #32302f;
+  background: #373534;
   color: rgba(251, 241, 199, 0.5);
 }
 

dist/base16-gruvbox-light-hard.rstheme

@@ -2,13 +2,13 @@
 /* Gruvbox light, hard by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #f9f5d7;
+  background: #f8f3ce;
   color: rgba(40, 40, 40, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(80, 73, 69, 0.15);
+  background: rgba(213, 196, 161, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #282828;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #282828 !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(80, 73, 69, 0.4);
+  background: rgba(213, 196, 161, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(246, 239, 193, 0.5);
+  background: rgba(242, 234, 171, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(80, 73, 69, 0.4);
+  border: 1px solid rgba(213, 196, 161, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: white;
+  background-color: #f2eaab;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #ebdbb2 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #f9f5d7 !important;
   color: #282828 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #ebdbb2 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #f9f5d7 !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #ebdbb2 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #d5c4a1 !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #665c54;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #bdae93;
 }
 
 /* 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: #d5c4a1 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #ebdbb2 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #282828;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #504945;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #d5c4a1 !important;
+  background: #ebdbb2 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #282828 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #d5c4a1 !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #ebdbb2 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #d5c4a1 !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #ebdbb2 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #282828 !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #f9f5d7 !important;
   background: #282828 !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #f9f5d7;
-  padding: 2px;
+  background: inherit;
+  color: #282828;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #ebdbb2 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #d5c4a1 !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #cdb98f !important;
-  color: #282828 !important;
+  background: #ebdbb2 !important;
+  color: #504945 !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #cdb98f !important;
-  color: #282828 !important;
+  background: #ebdbb2 !important;
+  color: #504945 !important;
 }
 
 .dataTables_info {
-  background: #cdb98f !important;
-  color: #282828 !important;
+  background: #ebdbb2 !important;
+  color: #504945 !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #f9f5d7;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #ebdbb2;
   border: 4px solid #f9f5d7;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(80, 73, 69, 0.4);
+  background-color: rgba(213, 196, 161, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-gruvbox-light-medium.rstheme

@@ -2,13 +2,13 @@
 /* Gruvbox light, medium by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #fbf1c7;
+  background: #faefbd;
   color: rgba(40, 40, 40, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(80, 73, 69, 0.15);
+  background: rgba(213, 196, 161, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #282828;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #282828 !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(80, 73, 69, 0.4);
+  background: rgba(213, 196, 161, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(249, 235, 175, 0.5);
+  background: rgba(248, 229, 151, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(80, 73, 69, 0.4);
+  border: 1px solid rgba(213, 196, 161, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: #fefdf7;
+  background-color: #f8e597;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #ebdbb2 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #fbf1c7 !important;
   color: #282828 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #ebdbb2 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #fbf1c7 !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #ebdbb2 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #d5c4a1 !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #665c54;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #bdae93;
 }
 
 /* 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: #d5c4a1 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #ebdbb2 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #282828;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #504945;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #d5c4a1 !important;
+  background: #ebdbb2 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #282828 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #d5c4a1 !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #ebdbb2 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #d5c4a1 !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #ebdbb2 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #282828 !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #fbf1c7 !important;
   background: #282828 !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #fbf1c7;
-  padding: 2px;
+  background: inherit;
+  color: #282828;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #ebdbb2 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #d5c4a1 !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #cdb98f !important;
-  color: #282828 !important;
+  background: #ebdbb2 !important;
+  color: #504945 !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #cdb98f !important;
-  color: #282828 !important;
+  background: #ebdbb2 !important;
+  color: #504945 !important;
 }
 
 .dataTables_info {
-  background: #cdb98f !important;
-  color: #282828 !important;
+  background: #ebdbb2 !important;
+  color: #504945 !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #fbf1c7;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #ebdbb2;
   border: 4px solid #fbf1c7;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(80, 73, 69, 0.4);
+  background-color: rgba(213, 196, 161, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-gruvbox-light-soft.rstheme

@@ -2,13 +2,13 @@
 /* Gruvbox light, soft by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox) */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #f2e5bc;
+  background: #f0e2b3;
   color: rgba(40, 40, 40, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(80, 73, 69, 0.15);
+  background: rgba(213, 196, 161, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #282828;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #282828 !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(80, 73, 69, 0.4);
+  background: rgba(213, 196, 161, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(238, 221, 167, 0.5);
+  background: rgba(234, 212, 145, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(80, 73, 69, 0.4);
+  border: 1px solid rgba(213, 196, 161, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: #faf6e7;
+  background-color: #ead491;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #ebdbb2 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #f2e5bc !important;
   color: #282828 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #ebdbb2 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #f2e5bc !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #ebdbb2 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #d5c4a1 !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #665c54;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #bdae93;
 }
 
 /* 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: #d5c4a1 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #ebdbb2 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #282828;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #504945;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #d5c4a1 !important;
+  background: #ebdbb2 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #282828 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #d5c4a1 !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #ebdbb2 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #d5c4a1 !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #ebdbb2 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #282828 !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #f2e5bc !important;
   background: #282828 !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #f2e5bc;
-  padding: 2px;
+  background: inherit;
+  color: #282828;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #ebdbb2 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #d5c4a1 !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #cdb98f !important;
-  color: #282828 !important;
+  background: #ebdbb2 !important;
+  color: #504945 !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #cdb98f !important;
-  color: #282828 !important;
+  background: #ebdbb2 !important;
+  color: #504945 !important;
 }
 
 .dataTables_info {
-  background: #cdb98f !important;
-  color: #282828 !important;
+  background: #ebdbb2 !important;
+  color: #504945 !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #f2e5bc;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #ebdbb2;
   border: 4px solid #f2e5bc;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(80, 73, 69, 0.4);
+  background-color: rgba(213, 196, 161, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-harmonic16-dark.rstheme

@@ -1,8 +1,8 @@
-/* rs-theme-name: Sassy - base16 NA */
-/* rs-theme-is-dark: TRUE */
+/* rs-theme-name: Sassy - base16 Harmonic16 Dark */
 /* Harmonic16 Dark by Jannik Siebert (https://github.com/janniks) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #0b1c2c;
+  background: #0d2134;
   color: rgba(247, 249, 251, 0.5);
 }
 

dist/base16-harmonic16-light.rstheme

@@ -1,14 +1,14 @@
-/* rs-theme-name: Sassy - base16 NA */
+/* rs-theme-name: Sassy - base16 Harmonic16 Light */
 /* Harmonic16 Light by Jannik Siebert (https://github.com/janniks) */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #f7f9fb;
+  background: #f0f4f8;
   color: rgba(11, 28, 44, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(64, 92, 121, 0.15);
+  background: rgba(203, 214, 226, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #0b1c2c;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #0b1c2c !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(64, 92, 121, 0.4);
+  background: rgba(203, 214, 226, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(230, 236, 243, 0.5);
+  background: rgba(213, 224, 234, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(64, 92, 121, 0.4);
+  border: 1px solid rgba(203, 214, 226, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: white;
+  background-color: #d5e0ea;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #e5ebf1 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #f7f9fb !important;
   color: #0b1c2c !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #e5ebf1 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #f7f9fb !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #e5ebf1 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #cbd6e2 !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #627e99;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #aabcce;
 }
 
 /* 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: #cbd6e2 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #e5ebf1 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #0b1c2c;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #405c79;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #cbd6e2 !important;
+  background: #e5ebf1 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #0b1c2c !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #cbd6e2 !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #e5ebf1 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #cbd6e2 !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #e5ebf1 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #0b1c2c !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #f7f9fb !important;
   background: #0b1c2c !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #f7f9fb;
-  padding: 2px;
+  background: inherit;
+  color: #0b1c2c;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #e5ebf1 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #cbd6e2 !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #bbc9d9 !important;
-  color: #0b1c2c !important;
+  background: #e5ebf1 !important;
+  color: #405c79 !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #bbc9d9 !important;
-  color: #0b1c2c !important;
+  background: #e5ebf1 !important;
+  color: #405c79 !important;
 }
 
 .dataTables_info {
-  background: #bbc9d9 !important;
-  color: #0b1c2c !important;
+  background: #e5ebf1 !important;
+  color: #405c79 !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #f7f9fb;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #e5ebf1;
   border: 4px solid #f7f9fb;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(64, 92, 121, 0.4);
+  background-color: rgba(203, 214, 226, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-hopscotch.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Hopscotch */
-/* rs-theme-is-dark: TRUE */
 /* Hopscotch by Jan T. Sott */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #322931;
+  background: #382e36;
   color: rgba(255, 255, 255, 0.5);
 }
 

dist/base16-ir-black.rstheme

@@ -1,9 +1,9 @@
 @charset "UTF-8";
 /* rs-theme-name: Sassy - base16 IR Black */
-/* rs-theme-is-dark: TRUE */
 /* IR Black by Timothée Poisot (http://timotheepoisot.fr) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #000000;
+  background: #050505;
   color: rgba(253, 251, 238, 0.5);
 }
 

dist/base16-isotope.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Isotope */
-/* rs-theme-is-dark: TRUE */
 /* Isotope by Jan T. Sott */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #000000;
+  background: #050505;
   color: rgba(255, 255, 255, 0.5);
 }
 

dist/base16-london-tube.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 London Tube */
-/* rs-theme-is-dark: TRUE */
 /* London Tube by Jan T. Sott */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #231f20;
+  background: #282425;
   color: rgba(255, 255, 255, 0.5);
 }
 

dist/base16-macintosh.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Macintosh */
-/* rs-theme-is-dark: TRUE */
 /* Macintosh by Rebecca Bettencourt (http://www.kreativekorp.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #000000;
+  background: #050505;
   color: rgba(255, 255, 255, 0.5);
 }
 

dist/base16-marrakesh.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Marrakesh */
-/* rs-theme-is-dark: TRUE */
 /* Marrakesh by Alexandre Gavioli (http://github.com/Alexx2/) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #201602;
+  background: #2a1d03;
   color: rgba(250, 240, 165, 0.5);
 }
 

dist/base16-materia.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Materia */
-/* rs-theme-is-dark: TRUE */
 /* Materia by Defman21 */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #263238;
+  background: #2a373e;
   color: rgba(255, 255, 255, 0.5);
 }
 

dist/base16-mexico-light.rstheme

@@ -2,13 +2,13 @@
 /* Mexico Light by Sheldon Johnson */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #f8f8f8;
+  background: #f3f3f3;
   color: rgba(24, 24, 24, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(56, 56, 56, 0.15);
+  background: rgba(216, 216, 216, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #181818;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #181818 !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(56, 56, 56, 0.4);
+  background: rgba(216, 216, 216, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(235, 235, 235, 0.5);
+  background: rgba(223, 223, 223, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(56, 56, 56, 0.4);
+  border: 1px solid rgba(216, 216, 216, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: white;
+  background-color: #dfdfdf;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #e8e8e8 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #f8f8f8 !important;
   color: #181818 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #e8e8e8 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #f8f8f8 !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #e8e8e8 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #d8d8d8 !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #585858;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #b8b8b8;
 }
 
 /* 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: #d8d8d8 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #e8e8e8 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #181818;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #383838;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #d8d8d8 !important;
+  background: #e8e8e8 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #181818 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #d8d8d8 !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #e8e8e8 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #d8d8d8 !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #e8e8e8 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #181818 !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #f8f8f8 !important;
   background: #181818 !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #f8f8f8;
-  padding: 2px;
+  background: inherit;
+  color: #181818;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #e8e8e8 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #d8d8d8 !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #cbcbcb !important;
-  color: #181818 !important;
+  background: #e8e8e8 !important;
+  color: #383838 !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #cbcbcb !important;
-  color: #181818 !important;
+  background: #e8e8e8 !important;
+  color: #383838 !important;
 }
 
 .dataTables_info {
-  background: #cbcbcb !important;
-  color: #181818 !important;
+  background: #e8e8e8 !important;
+  color: #383838 !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #f8f8f8;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #e8e8e8;
   border: 4px solid #f8f8f8;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(56, 56, 56, 0.4);
+  background-color: rgba(216, 216, 216, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-mocha.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Mocha */
-/* rs-theme-is-dark: TRUE */
 /* Mocha by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #3B3228;
+  background: #41372c;
   color: rgba(245, 238, 235, 0.5);
 }
 

dist/base16-monokai.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Monokai */
-/* rs-theme-is-dark: TRUE */
 /* Monokai by Wimer Hazenberg (http://www.monokai.nl) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #272822;
+  background: #2c2e27;
   color: rgba(249, 248, 245, 0.5);
 }
 

dist/base16-nord.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Nord */
-/* rs-theme-is-dark: TRUE */
 /* Nord by arcticicestudio */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #2E3440;
+  background: #323946;
   color: rgba(143, 188, 187, 0.5);
 }
 

dist/base16-ocean.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Ocean */
-/* rs-theme-is-dark: TRUE */
 /* Ocean by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #2b303b;
+  background: #2f3541;
   color: rgba(239, 241, 245, 0.5);
 }
 

dist/base16-oceanicnext.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 OceanicNext */
-/* rs-theme-is-dark: TRUE */
 /* OceanicNext by https://github.com/voronianski/oceanic-next-color-scheme */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #1B2B34;
+  background: #1e313b;
   color: rgba(216, 222, 233, 0.5);
 }
 

dist/base16-onedark.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 OneDark */
-/* rs-theme-is-dark: TRUE */
 /* OneDark by Lalit Magant (http://github.com/tilal6991) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #282c34;
+  background: #2c313a;
   color: rgba(200, 204, 212, 0.5);
 }
 

dist/base16-paraiso.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Paraiso */
-/* rs-theme-is-dark: TRUE */
 /* Paraiso by Jan T. Sott */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #2f1e2e;
+  background: #352234;
   color: rgba(231, 233, 219, 0.5);
 }
 

dist/base16-phd.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 PhD */
-/* rs-theme-is-dark: TRUE */
 /* PhD by Hennig Hasemann (http://leetless.de/vim.html) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #061229;
+  background: #071632;
   color: rgba(255, 255, 255, 0.5);
 }
 

dist/base16-pico.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Pico */
-/* rs-theme-is-dark: TRUE */
 /* Pico by PICO-8 (http://www.lexaloffle.com/pico-8.php) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #000000;
+  background: #050505;
   color: rgba(255, 241, 232, 0.5);
 }
 

dist/base16-pop.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Pop */
-/* rs-theme-is-dark: TRUE */
 /* Pop by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #000000;
+  background: #050505;
   color: rgba(255, 255, 255, 0.5);
 }
 

dist/base16-railscasts.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Railscasts */
-/* rs-theme-is-dark: TRUE */
 /* Railscasts by Ryan Bates (http://railscasts.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #2b2b2b;
+  background: #303030;
   color: rgba(249, 247, 243, 0.5);
 }
 

dist/base16-rebecca.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Rebecca */
-/* rs-theme-is-dark: TRUE */
 /* Rebecca by Victor Borja (http://github.com/vic) based on Rebecca Theme (http://github.com/vic/rebecca-theme) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #292a44;
+  background: #2d2e4a;
   color: rgba(83, 73, 93, 0.5);
 }
 

dist/base16-seti-ui.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Seti UI */
-/* rs-theme-is-dark: TRUE */
 /* Seti UI by  */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #151718;
+  background: #1a1c1d;
   color: rgba(255, 255, 255, 0.5);
 }
 

dist/base16-shapeshifter.rstheme

@@ -2,13 +2,13 @@
 /* Shapeshifter by Tyler Benziger (http://tybenz.com) */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #f9f9f9;
+  background: #f4f4f4;
   color: rgba(0, 0, 0, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(16, 32, 21, 0.15);
+  background: rgba(171, 171, 171, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #000000;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #000000 !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(16, 32, 21, 0.4);
+  background: rgba(171, 171, 171, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(236, 236, 236, 0.5);
+  background: rgba(224, 224, 224, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(16, 32, 21, 0.4);
+  border: 1px solid rgba(171, 171, 171, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: white;
+  background-color: #e0e0e0;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #e0e0e0 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #f9f9f9 !important;
   color: #000000 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #e0e0e0 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #f9f9f9 !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #e0e0e0 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #ababab !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #343434;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #555555;
 }
 
 /* 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: #ababab !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #e0e0e0 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #000000;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #102015;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #ababab !important;
+  background: #e0e0e0 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #000000 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #ababab !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #e0e0e0 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #ababab !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #e0e0e0 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #000000 !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #f9f9f9 !important;
   background: #000000 !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #f9f9f9;
-  padding: 2px;
+  background: inherit;
+  color: #000000;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #e0e0e0 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #ababab !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #9e9e9e !important;
-  color: #000000 !important;
+  background: #e0e0e0 !important;
+  color: #102015 !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #9e9e9e !important;
-  color: #000000 !important;
+  background: #e0e0e0 !important;
+  color: #102015 !important;
 }
 
 .dataTables_info {
-  background: #9e9e9e !important;
-  color: #000000 !important;
+  background: #e0e0e0 !important;
+  color: #102015 !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #f9f9f9;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #e0e0e0;
   border: 4px solid #f9f9f9;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(16, 32, 21, 0.4);
+  background-color: rgba(171, 171, 171, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-solar-flare.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Solar Flare */
-/* rs-theme-is-dark: TRUE */
 /* Solar Flare by Chuck Harmston (https://chuck.harmston.ch) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #18262F;
+  background: #1b2b36;
   color: rgba(245, 247, 250, 0.5);
 }
 

dist/base16-solarized-dark.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Solarized Dark */
-/* rs-theme-is-dark: TRUE */
 /* Solarized Dark by Ethan Schoonover (http://ethanschoonover.com/solarized) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #002b36;
+  background: #003340;
   color: rgba(253, 246, 227, 0.5);
 }
 

dist/base16-solarized-light.rstheme

@@ -1,14 +1,14 @@
 /* rs-theme-name: Sassy - base16 Solarized Light */
-/* rs-theme-is-dark: TRUE */
 /* Solarized Light by Ethan Schoonover (http://ethanschoonover.com/solarized) */
+/* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #fdf6e3;
+  background: #fcf3d9;
   color: rgba(0, 43, 54, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(88, 110, 117, 0.15);
+  background: rgba(147, 161, 161, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #002b36;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #002b36 !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(88, 110, 117, 0.4);
+  background: rgba(147, 161, 161, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(251, 238, 203, 0.5);
+  background: rgba(250, 231, 179, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(88, 110, 117, 0.4);
+  border: 1px solid rgba(147, 161, 161, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: white;
+  background-color: #fae7b3;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #eee8d5 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #fdf6e3 !important;
   color: #002b36 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #eee8d5 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #fdf6e3 !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #eee8d5 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #93a1a1 !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #657b83;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #839496;
 }
 
 /* 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: #93a1a1 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #eee8d5 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #002b36;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #586e75;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #93a1a1 !important;
+  background: #eee8d5 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #002b36 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #93a1a1 !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #eee8d5 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #93a1a1 !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #eee8d5 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #002b36 !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #fdf6e3 !important;
   background: #002b36 !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #fdf6e3;
-  padding: 2px;
+  background: inherit;
+  color: #002b36;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #eee8d5 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #93a1a1 !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #859595 !important;
-  color: #002b36 !important;
+  background: #eee8d5 !important;
+  color: #586e75 !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #859595 !important;
-  color: #002b36 !important;
+  background: #eee8d5 !important;
+  color: #586e75 !important;
 }
 
 .dataTables_info {
-  background: #859595 !important;
-  color: #002b36 !important;
+  background: #eee8d5 !important;
+  color: #586e75 !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #fdf6e3;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #eee8d5;
   border: 4px solid #fdf6e3;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(88, 110, 117, 0.4);
+  background-color: rgba(147, 161, 161, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-spacemacs.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Spacemacs */
-/* rs-theme-is-dark: TRUE */
 /* Spacemacs by Nasser Alshammari (https://github.com/nashamri/spacemacs-theme) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #1f2022;
+  background: #242527;
   color: rgba(248, 248, 248, 0.5);
 }
 

dist/base16-summerfruit-dark.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Summerfruit Dark */
-/* rs-theme-is-dark: TRUE */
 /* Summerfruit Dark by Christopher Corley (http://christop.club/) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #151515;
+  background: #1a1a1a;
   color: rgba(255, 255, 255, 0.5);
 }
 

dist/base16-summerfruit-light.rstheme

@@ -2,13 +2,13 @@
 /* Summerfruit Light by Christopher Corley (http://christop.club/) */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #FFFFFF;
+  background: #fafafa;
   color: rgba(32, 32, 32, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(16, 16, 16, 0.15);
+  background: rgba(208, 208, 208, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #202020;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #202020 !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(16, 16, 16, 0.4);
+  background: rgba(208, 208, 208, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(242, 242, 242, 0.5);
+  background: rgba(230, 230, 230, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(16, 16, 16, 0.4);
+  border: 1px solid rgba(208, 208, 208, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: white;
+  background-color: #e6e6e6;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #E0E0E0 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #FFFFFF !important;
   color: #202020 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #E0E0E0 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #FFFFFF !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #E0E0E0 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #D0D0D0 !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #000000;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #B0B0B0;
 }
 
 /* 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: #D0D0D0 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #E0E0E0 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #202020;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #101010;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #D0D0D0 !important;
+  background: #E0E0E0 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #202020 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #D0D0D0 !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #E0E0E0 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #D0D0D0 !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #E0E0E0 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #202020 !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #FFFFFF !important;
   background: #202020 !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #FFFFFF;
-  padding: 2px;
+  background: inherit;
+  color: #202020;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #E0E0E0 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #D0D0D0 !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #c3c3c3 !important;
-  color: #202020 !important;
+  background: #E0E0E0 !important;
+  color: #101010 !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #c3c3c3 !important;
-  color: #202020 !important;
+  background: #E0E0E0 !important;
+  color: #101010 !important;
 }
 
 .dataTables_info {
-  background: #c3c3c3 !important;
-  color: #202020 !important;
+  background: #E0E0E0 !important;
+  color: #101010 !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #FFFFFF;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #E0E0E0;
   border: 4px solid #FFFFFF;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(16, 16, 16, 0.4);
+  background-color: rgba(208, 208, 208, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-tomorrow-night.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Tomorrow Night */
-/* rs-theme-is-dark: TRUE */
 /* Tomorrow Night by Chris Kempson (http://chriskempson.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #1d1f21;
+  background: #222426;
   color: rgba(255, 255, 255, 0.5);
 }
 

dist/base16-tomorrow.rstheme

@@ -2,13 +2,13 @@
 /* Tomorrow by Chris Kempson (http://chriskempson.com) */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #ffffff;
+  background: #fafafa;
   color: rgba(29, 31, 33, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(77, 77, 76, 0.15);
+  background: rgba(214, 214, 214, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #1d1f21;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #1d1f21 !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(77, 77, 76, 0.4);
+  background: rgba(214, 214, 214, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(242, 242, 242, 0.5);
+  background: rgba(230, 230, 230, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(77, 77, 76, 0.4);
+  border: 1px solid rgba(214, 214, 214, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: white;
+  background-color: #e6e6e6;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #e0e0e0 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #ffffff !important;
   color: #1d1f21 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #e0e0e0 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #ffffff !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #e0e0e0 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #d6d6d6 !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #969896;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #8e908c;
 }
 
 /* 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: #d6d6d6 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #e0e0e0 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #1d1f21;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #4d4d4c;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #d6d6d6 !important;
+  background: #e0e0e0 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #1d1f21 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #d6d6d6 !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #e0e0e0 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #d6d6d6 !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #e0e0e0 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #1d1f21 !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #ffffff !important;
   background: #1d1f21 !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #ffffff;
-  padding: 2px;
+  background: inherit;
+  color: #1d1f21;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #e0e0e0 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #d6d6d6 !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #c9c9c9 !important;
-  color: #1d1f21 !important;
+  background: #e0e0e0 !important;
+  color: #4d4d4c !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #c9c9c9 !important;
-  color: #1d1f21 !important;
+  background: #e0e0e0 !important;
+  color: #4d4d4c !important;
 }
 
 .dataTables_info {
-  background: #c9c9c9 !important;
-  color: #1d1f21 !important;
+  background: #e0e0e0 !important;
+  color: #4d4d4c !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #ffffff;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #e0e0e0;
   border: 4px solid #ffffff;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(77, 77, 76, 0.4);
+  background-color: rgba(214, 214, 214, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-twilight.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Twilight */
-/* rs-theme-is-dark: TRUE */
 /* Twilight by David Hart (https://github.com/hartbit) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #1e1e1e;
+  background: #232323;
   color: rgba(255, 255, 255, 0.5);
 }
 

dist/base16-unikitty-dark.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Unikitty Dark */
-/* rs-theme-is-dark: TRUE */
 /* Unikitty Dark by Josh W Lewis (@joshwlewis) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #2e2a31;
+  background: #332f36;
   color: rgba(245, 244, 247, 0.5);
 }
 

dist/base16-unikitty-light.rstheme

@@ -2,13 +2,13 @@
 /* Unikitty Light by Josh W Lewis (@joshwlewis) */
 /* rs-theme-is-dark: FALSE */
 .ace_gutter {
-  background: #ffffff;
+  background: #fafafa;
   color: rgba(50, 45, 52, 0.5);
 }
 
 .ace_print-margin {
   width: 2px;
-  background: rgba(108, 105, 110, 0.15);
+  background: rgba(196, 195, 197, 0.2);
 }
 
 .ace_editor {
@@ -31,8 +31,9 @@
   color: #322d34;
 }
 
-.rstudio-themes-flat.editor_dark.ace_editor_theme a {
-  color: #FFF !important;
+.rstudio-themes-flat.ace_editor_theme a {
+  color: #322d34 !important;
+  font-weight: bold;
 }
 
 .rstudio-themes-flat .gwt-Label {
@@ -50,7 +51,7 @@
 }
 
 .ace_marker-layer .ace_selection {
-  background: rgba(108, 105, 110, 0.4);
+  background: rgba(196, 195, 197, 0.4);
 }
 
 .ace_marker-layer .ace_step {
@@ -63,11 +64,11 @@
 }
 
 .ace_marker-layer .ace_active-line {
-  background: rgba(242, 242, 242, 0.5);
+  background: rgba(230, 230, 230, 0.5);
 }
 
 .ace_marker-layer .ace_selected-word {
-  border: 1px solid rgba(108, 105, 110, 0.4);
+  border: 1px solid rgba(196, 195, 197, 0.4);
 }
 
 .ace_marker-layer .ace_foreign_line {
@@ -79,7 +80,7 @@
 .ace_marker-layer .ace_active_debug_line {
   position: absolute;
   z-index: -1;
-  background-color: white;
+  background-color: #e6e6e6;
 }
 
 .ace_marker-layer .ace_find_line {
@@ -257,31 +258,31 @@
 
 /* ---- RStudio Theme ---- */
 /* background */
-.rstudio-themes-flat .rstudio-themes-dark-grey {
-  background: #e1e1e2 !important;
+.rstudio-themes-flat .rstudio-themes-default {
+  background: #ffffff !important;
   color: #322d34 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstudio-themes-background {
-  background: #e1e1e2 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstudio-themes-background {
+  background: #ffffff !important;
 }
 
 /* inactive tabs */
-table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
-  background: #e1e1e2 !important;
+table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs, .rstheme_multiPodUtilityTabArea {
+  background: #c4c3c5 !important;
 }
 
-table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
-  color: #89878b;
+table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-Label, .rstheme_multiPodUtilityTabArea .gwt-Label {
+  color: #a7a5a8;
 }
 
 /* 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: #c4c3c5 !important;
+.rstudio-themes-flat .rstudio-themes-default .rstheme_center, .rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs .gwt-TabLayoutPanelTab-selected table.rstheme_tabLayoutCenter {
+  background: #e1e1e2 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTab-selected .gwt-Label {
-  color: #322d34;
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTab-selected .gwt-Label {
+  color: #6c696e;
 }
 
 .rstudio-themes-flat {
@@ -289,28 +290,28 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper {
-  background: #c4c3c5 !important;
+  background: #e1e1e2 !important;
 }
 
 .rstudio-themes-flat .rstheme_toolbarWrapper button, .rstudio-themes-flat .rstheme_toolbarWrapper a, .rstudio-themes-flat .rstheme_toolbarWrapper div {
   color: #322d34 !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey {
+.rstudio-themes-flat .rstudio-themes-default {
   /* spliters */
 }
 
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-dark-grey .gwt-SplitLayoutPanel-VDragger {
+.rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-HDragger, .rstudio-themes-flat .rstudio-themes-default .gwt-SplitLayoutPanel-VDragger {
   background: transparent !important;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark .search, .rstudio-themes-flat.rstudio-themes-dark-menus .search {
-  background: #c4c3c5 !important;
+.rstudio-themes-flat .search, .rstudio-themes-flat.rstudio-themes-default-menus .search {
+  background: #e1e1e2 !important;
 }
 
 /* pane toolbars */
-.rstheme_secondaryToolbar, .rstudio-themes-flat .rstudio-themes-dark-grey .dataGridHeader {
-  background: #c4c3c5 !important;
+.rstheme_secondaryToolbar, .rstudio-themes-flat .dataGridHeader {
+  background: #e1e1e2 !important;
 }
 
 /* menu background */
@@ -319,7 +320,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #322d34 !important;
 }
 
-.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected {
+.rstudio-themes-flat .popupMiddleCenter .item.item-selected, .rstudio-themes-flat .popupMiddleCenter .item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .menuPopupMiddleCenter .item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item.item-selected, .rstudio-themes-flat .suggestPopupMiddleCenter .item-selected {
   color: #ffffff !important;
   background: #322d34 !important;
 }
@@ -343,8 +344,8 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent {
-  background: #ffffff;
-  padding: 2px;
+  background: inherit;
+  color: #322d34;
 }
 
 .rstudio-themes-flat .gwt-PopupPanel .popupContent table {
@@ -357,41 +358,41 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 }
 
 /* hacky toolbars section */
-.rstudio-themes-flat .rstudio-themes-dark-grey div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
-  background: #e1e1e2 !important;
+.rstudio-themes-flat .rstudio-themes-default div.windowframe > div:last-child > div > div > div > div > div:not(.gwt-TabLayoutPanelTabs) {
+  background: #c4c3c5 !important;
 }
 
 /* Data Frame Preview */
 .dataTables_wrapper thead th {
-  background: #b7b6b8 !important;
-  color: #322d34 !important;
+  background: #e1e1e2 !important;
+  color: #6c696e !important;
 }
 
 .dataTables_scrollBody table tbody td:first-child {
-  background: #b7b6b8 !important;
-  color: #322d34 !important;
+  background: #e1e1e2 !important;
+  color: #6c696e !important;
 }
 
 .dataTables_info {
-  background: #b7b6b8 !important;
-  color: #322d34 !important;
+  background: #e1e1e2 !important;
+  color: #6c696e !important;
 }
 
 /* scrollbars */
-.rstudio-themes-flat .rstudio-themes-dark-grey .gwt-TabLayoutPanelTabs,
-.rstudio-themes-flat .rstudio-themes-dark-grey .rstheme_minimizedWindowObject .rstheme_center,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-track,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
+.rstudio-themes-flat .rstudio-themes-default .gwt-TabLayoutPanelTabs,
+.rstudio-themes-flat .rstudio-themes-default .rstheme_minimizedWindowObject .rstheme_center,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-corner,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-track,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-corner,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-track,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-corner {
   background: #ffffff;
 }
 
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
-.rstudio-themes-flat .rstudio-themes-dark.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
-.rstudio-themes-flat.rstudio-themes-dark-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars ::-webkit-scrollbar-thumb,
+.rstudio-themes-flat .rstudio-themes-default.rstudio-themes-scrollbars::-webkit-scrollbar-thumb,
+.rstudio-themes-flat.rstudio-themes-default-menus .rstudio-themes-scrollbars ::-webkit-scrollbar-thumb {
   background: #e1e1e2;
   border: 4px solid #ffffff;
 }
@@ -424,7 +425,7 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
 
 .terminal .xterm-selection div {
   position: absolute;
-  background-color: rgba(108, 105, 110, 0.4);
+  background-color: rgba(196, 195, 197, 0.4);
 }
 
 .terminal .xterm-viewport {

dist/base16-woodland.rstheme

@@ -1,8 +1,8 @@
 /* rs-theme-name: Sassy - base16 Woodland */
-/* rs-theme-is-dark: TRUE */
 /* Woodland by Jay Cornwall (https://jcornwall.com) */
+/* rs-theme-is-dark: TRUE */
 .ace_gutter {
-  background: #231e18;
+  background: #29231c;
   color: rgba(228, 212, 200, 0.5);
 }
 

dist/nord-snow-storm.rstheme

@@ -73,7 +73,7 @@
 .ace_marker-layer .ace_foreign_line {
   position: absolute;
   z-index: -1;
-  background-color: #eceff4;
+  background-color: rgba(236, 239, 244, 0.5);
 }
 
 .ace_marker-layer .ace_active_debug_line {

src/base16-3024.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-apathy.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-ashes.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-atelier-cave.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-atelier-dune.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-atelier-estuary.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-atelier-forest.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-atelier-heath.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-atelier-lakeside.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-atelier-plateau.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-atelier-savanna.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-atelier-seaside.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-atelier-sulphurpool.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-bespin.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-brewer.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-bright.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-chalk.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-codeschool.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-darktooth.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-default-dark.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-dracula.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-eighties.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-embers.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);

src/base16-flat.scss

@@ -11,7 +11,7 @@ $ui-cursor               : $base0A;
 $ui-cursor-normal-mode   : $ui-cursor;
 $ui-margin-line          : transparentize($ui-selection, 0.25);
 $ui-gutter-color         : transparentize($ui-foreground, 0.5);
-$ui-gutter-background    : $ui-background;
+$ui-gutter-background    : lighten($ui-background, 2%);
 
 // less common UI colors
 $ui-line-active           : transparentize(darken($ui-background, 5%), 0.5);