7 files changed, 56 insertions, 28 deletions
diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css
index a1d52b5..9ec7664 100644
--- a/common/gtk-3.0/3.18/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-dark.css
@@ -4010,8 +4010,8 @@ NemoWindow.maximized .sidebar,
 MarlinViewWindow.maximized .sidebar {
   background-color: #353945; }
 
-NemoWindow .pane-separator,
-MarlinViewWindow .pane-separator {
+NemoWindow.background > GtkGrid > GtkPaned > .pane-separator,
+MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator {
   background-color: rgba(42, 45, 55, 0.95); }
 
 GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background {
@@ -4069,8 +4069,12 @@ GeditWindow.background.csd > .titlebar {
 
 GeditWindow.background.csd {
   background-color: transparent; }
-  GeditWindow.background.csd .pane-separator {
-    background-color: rgba(42, 45, 55, 0.95); }
+
+GeditWindow.background .gedit-side-panel-paned .pane-separator {
+  background-color: rgba(42, 45, 55, 0.95); }
+
+GeditWindow.background .gedit-bottom-panel-paned .pane-separator {
+  background-color: #2b2e39; }
 
 .gedit-bottom-panel-paned {
   background-color: #404552; }
diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css
index 2d6fa0b..61ebfcb 100644
--- a/common/gtk-3.0/3.18/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-darker.css
@@ -4003,8 +4003,8 @@ NemoWindow.maximized .sidebar,
 MarlinViewWindow.maximized .sidebar {
   background-color: #353945; }
 
-NemoWindow .pane-separator,
-MarlinViewWindow .pane-separator {
+NemoWindow.background > GtkGrid > GtkPaned > .pane-separator,
+MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator {
   background-color: rgba(53, 57, 69, 0.95); }
 
 GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background {
@@ -4062,8 +4062,12 @@ GeditWindow.background.csd > .titlebar {
 
 GeditWindow.background.csd {
   background-color: transparent; }
-  GeditWindow.background.csd .pane-separator {
-    background-color: rgba(53, 57, 69, 0.95); }
+
+GeditWindow.background .gedit-side-panel-paned .pane-separator {
+  background-color: rgba(53, 57, 69, 0.95); }
+
+GeditWindow.background .gedit-bottom-panel-paned .pane-separator {
+  background-color: #dbdfe3; }
 
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
index f8b8d25..a8b1260 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
@@ -4010,8 +4010,8 @@ NemoWindow.maximized .sidebar,
 MarlinViewWindow.maximized .sidebar {
   background-color: #353945; }
 
-NemoWindow .pane-separator,
-MarlinViewWindow .pane-separator {
+NemoWindow.background > GtkGrid > GtkPaned > .pane-separator,
+MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator {
   background-color: #2a2d37; }
 
 GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background {
@@ -4069,8 +4069,12 @@ GeditWindow.background.csd > .titlebar {
 
 GeditWindow.background.csd {
   background-color: transparent; }
-  GeditWindow.background.csd .pane-separator {
-    background-color: #2a2d37; }
+
+GeditWindow.background .gedit-side-panel-paned .pane-separator {
+  background-color: #2a2d37; }
+
+GeditWindow.background .gedit-bottom-panel-paned .pane-separator {
+  background-color: #2b2e39; }
 
 .gedit-bottom-panel-paned {
   background-color: #404552; }
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
index 6b0262a..c9808bd 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
@@ -4003,8 +4003,8 @@ NemoWindow.maximized .sidebar,
 MarlinViewWindow.maximized .sidebar {
   background-color: #353945; }
 
-NemoWindow .pane-separator,
-MarlinViewWindow .pane-separator {
+NemoWindow.background > GtkGrid > GtkPaned > .pane-separator,
+MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator {
   background-color: #353945; }
 
 GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background {
@@ -4062,8 +4062,12 @@ GeditWindow.background.csd > .titlebar {
 
 GeditWindow.background.csd {
   background-color: transparent; }
-  GeditWindow.background.csd .pane-separator {
-    background-color: #353945; }
+
+GeditWindow.background .gedit-side-panel-paned .pane-separator {
+  background-color: #353945; }
+
+GeditWindow.background .gedit-bottom-panel-paned .pane-separator {
+  background-color: #dbdfe3; }
 
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css
index 5c30bea..2dc02da 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -4007,8 +4007,8 @@ NemoWindow.maximized .sidebar,
 MarlinViewWindow.maximized .sidebar {
   background-color: #353945; }
 
-NemoWindow .pane-separator,
-MarlinViewWindow .pane-separator {
+NemoWindow.background > GtkGrid > GtkPaned > .pane-separator,
+MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator {
   background-color: #353945; }
 
 GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background {
@@ -4066,8 +4066,12 @@ GeditWindow.background.csd > .titlebar {
 
 GeditWindow.background.csd {
   background-color: transparent; }
-  GeditWindow.background.csd .pane-separator {
-    background-color: #353945; }
+
+GeditWindow.background .gedit-side-panel-paned .pane-separator {
+  background-color: #353945; }
+
+GeditWindow.background .gedit-bottom-panel-paned .pane-separator {
+  background-color: #dbdfe3; }
 
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css
index 23d9b18..3ad343c 100644
--- a/common/gtk-3.0/3.18/gtk-contained.css
+++ b/common/gtk-3.0/3.18/gtk-contained.css
@@ -4007,8 +4007,8 @@ NemoWindow.maximized .sidebar,
 MarlinViewWindow.maximized .sidebar {
   background-color: #353945; }
 
-NemoWindow .pane-separator,
-MarlinViewWindow .pane-separator {
+NemoWindow.background > GtkGrid > GtkPaned > .pane-separator,
+MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator {
   background-color: rgba(53, 57, 69, 0.95); }
 
 GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background {
@@ -4066,8 +4066,12 @@ GeditWindow.background.csd > .titlebar {
 
 GeditWindow.background.csd {
   background-color: transparent; }
-  GeditWindow.background.csd .pane-separator {
-    background-color: rgba(53, 57, 69, 0.95); }
+
+GeditWindow.background .gedit-side-panel-paned .pane-separator {
+  background-color: rgba(53, 57, 69, 0.95); }
+
+GeditWindow.background .gedit-bottom-panel-paned .pane-separator {
+  background-color: #dbdfe3; }
 
 .gedit-bottom-panel-paned {
   background-color: #ffffff; }
diff --git a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
index 6436dd4..c738981 100644
--- a/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.18/sass/_transparent_widgets.scss
@@ -96,9 +96,12 @@ MarlinViewWindow {
   }
   &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); }
 
-  .pane-separator { background-color: $dark_sidebar_border; }
 }
 
+NemoWindow.background > GtkGrid > GtkPaned > .pane-separator,
+MarlinViewWindow.background > GtkBox > GtkPaned > .pane-separator { background-color: $dark_sidebar_border }
+
+
 GtkFileChooserDialog {
 
   &.background.csd, &.background { background-color: $dark_sidebar_bg }
@@ -161,10 +164,11 @@ GeditWindow.background.csd > .titlebar {
 }
 
 // Gedit
-GeditWindow.background.csd {
-  background-color: transparent;
+GeditWindow.background {
+  &.csd { background-color: transparent; }
 
-  .pane-separator { background-color: $dark_sidebar_border; }
+  .gedit-side-panel-paned .pane-separator { background-color: $dark_sidebar_border; }
+  .gedit-bottom-panel-paned .pane-separator { background-color: $borders_color; }
 }
 
 .gedit-bottom-panel-paned { background-color: $base_color; }