Fix #5 git popup window keeps normal theme

rsthemes/nord-polar-night-aurora.rstheme

@@ -269,14 +269,14 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #e5e9f0;
 }
 
-.rstheme_toolbarWrapper {
-  background: #434c5e !important;
-}
-
 .rstudio-themes-flat {
   /* search */
 }
 
+.rstudio-themes-flat .rstheme_toolbarWrapper {
+  background: #434c5e !important;
+}
+
 .rstudio-themes-flat .rstudio-themes-dark-grey {
   /* spliters */
 }

rsthemes/oceanic-plus.rstheme

@@ -270,14 +270,14 @@ table.rstheme_tabLayoutCenter .gwt-Label, .rstudio-themes-flat .rstudio-themes-d
   color: #D8DEE9;
 }
 
-.rstheme_toolbarWrapper {
-  background: #4F5B66 !important;
-}
-
 .rstudio-themes-flat {
   /* search */
 }
 
+.rstudio-themes-flat .rstheme_toolbarWrapper {
+  background: #4F5B66 !important;
+}
+
 .rstudio-themes-flat .rstudio-themes-dark-grey {
   /* spliters */
 }

rstudio/_rstudio-dark.scss

@@ -227,11 +227,11 @@ table.rstheme_tabLayoutCenter, .rstudio-themes-flat .rstudio-themes-dark-grey .g
 	}
 }
 
-.rstheme_toolbarWrapper {
-  background: $ui-rstudio-toolbar !important;
-}
 
 .rstudio-themes-flat {
+  .rstheme_toolbarWrapper {
+    background: $ui-rstudio-toolbar !important;
+  }
 	.rstudio-themes-dark-grey {
 		/* spliters */
     .gwt-SplitLayoutPanel-HDragger, .gwt-SplitLayoutPanel-VDragger {