diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 8a908f0..c7d01a4 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -2754,7 +2754,7 @@ label selection,
 label selection:focus,
 label selection:hover, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, entry.gb-command-bar-entry.flat:selected, entry.gb-command-bar-entry.flat:selected:focus, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
+modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
   background-image: none;
   background-color: #5294E2;
   color: #ffffff;
@@ -2784,12 +2784,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   border-color: transparent;
   box-shadow: inset 0 -1px #2b2e39; }
 
+.nautilus-window notebook,
 .nautilus-window notebook > stack:not(:only-child) searchbar {
   background-color: #404552; }
 
-.nautilus-window notebook {
-  background-color: #404552; }
-
 button.nautilus-circular-button.image-button {
   border-radius: 50%;
   -gtk-outline-radius: 50%;
@@ -2863,11 +2861,9 @@ button.nautilus-circular-button.image-button {
   background-color: #22242d;
   color: #D3DAE3; }
 
-.gedit-search-entry-occurrences-tag {
-  color: rgba(211, 218, 227, 0.6);
-  border: none;
-  margin: 2px;
-  padding: 2px; }
+.gedit-side-panel-paned statusbar {
+  border-top: 1px solid #2b2e39;
+  background-color: #383C4A; }
 
 .gedit-search-slider {
   background-color: #3c4150;
@@ -2877,121 +2873,11 @@ button.nautilus-circular-button.image-button {
   border-width: 0 1px 1px 1px;
   border-style: solid; }
 
-GbWorkbench .floating-bar {
-  color: #D3DAE3; }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr),
-GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) {
-  padding: 0 10px;
-  color: rgba(207, 218, 231, 0.8);
-  border-color: rgba(21, 23, 28, 0.37);
-  background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37));
-  background-color: transparent; }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr) image, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr) image:hover,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) image,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) image:hover {
-    color: inherit; }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):hover {
-    color: #ffffff;
-    border-color: transparent;
-    background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):active,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):checked {
-    color: #ffffff;
-    border-color: transparent;
-    background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):disabled,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):disabled {
-    color: rgba(207, 218, 231, 0.35);
-    background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr),
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked {
-  border-left-style: none;
-  border-radius: 0 3px 3px 0;
-  -gtk-outline-radius: 0 1px 1px 0; }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl),
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):hover,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):active,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):checked {
-  border-right-style: none;
-  border-radius: 3px 0 0 3px;
-  -gtk-outline-radius: 1px 0 0 1px; }
-
-GbPreferencesPageLanguage entry {
-  border-radius: 3px 3px 0 0; }
-
-GbPreferencesPageLanguage .frame {
-  border-top-width: 0; }
-
-GbEditorTweakWidget .linked.vertical > entry {
-  border-bottom-style: solid; }
-
-GbEditorTweakWidget scrolledwindow, GbEditorTweakWidget placessidebar {
-  border-top: none; }
-
-GbViewStack box.header.notebook {
-  border-bottom: 1px solid #2b2e39; }
-
-GbViewStack.focused box.header.notebook,
-#project_sidebar_header.focused {
-  background-color: #404552; }
-
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid #2b2e39; }
-
-GbNewProjectDialog button.file.linked-on-right button {
-  border-radius: 3px 0 0 3px; }
-
-GbWorkspacePane box.header.notebook {
-  border-bottom: 1px solid #2b2e39; }
-
-GbWorkspacePane:not(.focused) box.header.notebook {
-  background-color: #383C4A; }
-
-DhSidebar entry.search,
-SymbolTree entry.search {
-  border-left: none;
-  border-right: none;
-  border-top: none;
-  border-radius: 0px; }
-
-entry.gb-command-bar-entry.flat,
-entry.gb-command-bar-entry.flat:focus {
-  font-family: Monospace;
-  color: #BAC3CF;
-  background-image: none;
-  background-color: #353945;
-  padding: 6px 6px 6px 6px;
-  border: none; }
-
-GbTerminalView {
-  background-color: #404552;
-  color: #D3DAE3; }
-
-GbSourceStyleSchemeWidget GtkSourceView {
-  font-family: Monospace; }
-
-scrolledwindow.gb-linked-scroller, placessidebar.gb-linked-scroller {
-  border-top: none; }
-
-GbSearchDisplayGroup list row
-GbDocumentStack button {
-  transition: none; }
-
-GbViewStack box.header.notebook,
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid #2b2e39; }
-
-GbViewStack.focused box.header.notebook {
-  background-color: #404552; }
-  GbViewStack.focused box.header.notebook button.dim-label, GbViewStack.focused box.header.notebook headerbar button.subtitle, headerbar GbViewStack.focused box.header.notebook button.subtitle {
-    opacity: 1; }
+.gedit-search-entry-occurrences-tag {
+  color: rgba(211, 218, 227, 0.6);
+  border: none;
+  margin: 2px;
+  padding: 2px; }
 
 button.documents-load-more {
   border-width: 1px 0 0;
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 35b3ade..a8cd2fb 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -2753,7 +2753,7 @@ label selection,
 label selection:focus,
 label selection:hover, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, entry.gb-command-bar-entry.flat:selected, entry.gb-command-bar-entry.flat:selected:focus, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
+modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
   background-image: none;
   background-color: #5294E2;
   color: #ffffff;
@@ -2783,12 +2783,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   border-color: transparent;
   box-shadow: inset 0 -1px #dcdfe3; }
 
+.nautilus-window notebook,
 .nautilus-window notebook > stack:not(:only-child) searchbar {
   background-color: #ffffff; }
 
-.nautilus-window notebook {
-  background-color: #ffffff; }
-
 button.nautilus-circular-button.image-button {
   border-radius: 50%;
   -gtk-outline-radius: 50%;
@@ -2862,11 +2860,9 @@ button.nautilus-circular-button.image-button {
   background-color: #d9dde0;
   color: #5c616c; }
 
-.gedit-search-entry-occurrences-tag {
-  color: rgba(92, 97, 108, 0.6);
-  border: none;
-  margin: 2px;
-  padding: 2px; }
+.gedit-side-panel-paned statusbar {
+  border-top: 1px solid #dcdfe3;
+  background-color: #F5F6F7; }
 
 .gedit-search-slider {
   background-color: #fbfbfc;
@@ -2876,121 +2872,11 @@ button.nautilus-circular-button.image-button {
   border-width: 0 1px 1px 1px;
   border-style: solid; }
 
-GbWorkbench .floating-bar {
-  color: #5c616c; }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr),
-GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) {
-  padding: 0 10px;
-  color: rgba(207, 218, 231, 0.8);
-  border-color: rgba(21, 23, 28, 0.37);
-  background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.37));
-  background-color: transparent; }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr) image, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr) image:hover,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) image,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) image:hover {
-    color: inherit; }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):hover {
-    color: #ffffff;
-    border-color: transparent;
-    background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):active,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):checked {
-    color: #ffffff;
-    border-color: transparent;
-    background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):disabled,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):disabled {
-    color: rgba(207, 218, 231, 0.35);
-    background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.22)); }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr),
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked {
-  border-left-style: none;
-  border-radius: 0 3px 3px 0;
-  -gtk-outline-radius: 0 1px 1px 0; }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl),
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):hover,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):active,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):checked {
-  border-right-style: none;
-  border-radius: 3px 0 0 3px;
-  -gtk-outline-radius: 1px 0 0 1px; }
-
-GbPreferencesPageLanguage entry {
-  border-radius: 3px 3px 0 0; }
-
-GbPreferencesPageLanguage .frame {
-  border-top-width: 0; }
-
-GbEditorTweakWidget .linked.vertical > entry {
-  border-bottom-style: solid; }
-
-GbEditorTweakWidget scrolledwindow, GbEditorTweakWidget placessidebar {
-  border-top: none; }
-
-GbViewStack box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbViewStack.focused box.header.notebook,
-#project_sidebar_header.focused {
-  background-color: #ffffff; }
-
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbNewProjectDialog button.file.linked-on-right button {
-  border-radius: 3px 0 0 3px; }
-
-GbWorkspacePane box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbWorkspacePane:not(.focused) box.header.notebook {
-  background-color: #F5F6F7; }
-
-DhSidebar entry.search,
-SymbolTree entry.search {
-  border-left: none;
-  border-right: none;
-  border-top: none;
-  border-radius: 0px; }
-
-entry.gb-command-bar-entry.flat,
-entry.gb-command-bar-entry.flat:focus {
-  font-family: Monospace;
-  color: #BAC3CF;
-  background-image: none;
-  background-color: #353945;
-  padding: 6px 6px 6px 6px;
-  border: none; }
-
-GbTerminalView {
-  background-color: #ffffff;
-  color: #5c616c; }
-
-GbSourceStyleSchemeWidget GtkSourceView {
-  font-family: Monospace; }
-
-scrolledwindow.gb-linked-scroller, placessidebar.gb-linked-scroller {
-  border-top: none; }
-
-GbSearchDisplayGroup list row
-GbDocumentStack button {
-  transition: none; }
-
-GbViewStack box.header.notebook,
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbViewStack.focused box.header.notebook {
-  background-color: #ffffff; }
-  GbViewStack.focused box.header.notebook button.dim-label, GbViewStack.focused box.header.notebook headerbar button.subtitle, headerbar GbViewStack.focused box.header.notebook button.subtitle {
-    opacity: 1; }
+.gedit-search-entry-occurrences-tag {
+  color: rgba(92, 97, 108, 0.6);
+  border: none;
+  margin: 2px;
+  padding: 2px; }
 
 button.documents-load-more {
   border-width: 1px 0 0;
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 7c43343..a1d6b6c 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -2754,7 +2754,7 @@ label selection,
 label selection:focus,
 label selection:hover, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, entry.gb-command-bar-entry.flat:selected, entry.gb-command-bar-entry.flat:selected:focus, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
+modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
   background-image: none;
   background-color: #5294E2;
   color: #ffffff;
@@ -2784,12 +2784,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   border-color: transparent;
   box-shadow: inset 0 -1px #2b2e39; }
 
+.nautilus-window notebook,
 .nautilus-window notebook > stack:not(:only-child) searchbar {
   background-color: #404552; }
 
-.nautilus-window notebook {
-  background-color: #404552; }
-
 button.nautilus-circular-button.image-button {
   border-radius: 50%;
   -gtk-outline-radius: 50%;
@@ -2863,11 +2861,9 @@ button.nautilus-circular-button.image-button {
   background-color: #22242d;
   color: #D3DAE3; }
 
-.gedit-search-entry-occurrences-tag {
-  color: rgba(211, 218, 227, 0.6);
-  border: none;
-  margin: 2px;
-  padding: 2px; }
+.gedit-side-panel-paned statusbar {
+  border-top: 1px solid #2b2e39;
+  background-color: #383C4A; }
 
 .gedit-search-slider {
   background-color: #3c4150;
@@ -2877,121 +2873,11 @@ button.nautilus-circular-button.image-button {
   border-width: 0 1px 1px 1px;
   border-style: solid; }
 
-GbWorkbench .floating-bar {
-  color: #D3DAE3; }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr),
-GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) {
-  padding: 0 10px;
-  color: rgba(207, 218, 231, 0.8);
-  border-color: rgba(21, 23, 28, 0.4);
-  background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4));
-  background-color: transparent; }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr) image, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr) image:hover,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) image,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) image:hover {
-    color: inherit; }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):hover {
-    color: #ffffff;
-    border-color: transparent;
-    background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):active,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):checked {
-    color: #ffffff;
-    border-color: transparent;
-    background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):disabled,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):disabled {
-    color: rgba(207, 218, 231, 0.35);
-    background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr),
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked {
-  border-left-style: none;
-  border-radius: 0 3px 3px 0;
-  -gtk-outline-radius: 0 1px 1px 0; }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl),
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):hover,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):active,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):checked {
-  border-right-style: none;
-  border-radius: 3px 0 0 3px;
-  -gtk-outline-radius: 1px 0 0 1px; }
-
-GbPreferencesPageLanguage entry {
-  border-radius: 3px 3px 0 0; }
-
-GbPreferencesPageLanguage .frame {
-  border-top-width: 0; }
-
-GbEditorTweakWidget .linked.vertical > entry {
-  border-bottom-style: solid; }
-
-GbEditorTweakWidget scrolledwindow, GbEditorTweakWidget placessidebar {
-  border-top: none; }
-
-GbViewStack box.header.notebook {
-  border-bottom: 1px solid #2b2e39; }
-
-GbViewStack.focused box.header.notebook,
-#project_sidebar_header.focused {
-  background-color: #404552; }
-
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid #2b2e39; }
-
-GbNewProjectDialog button.file.linked-on-right button {
-  border-radius: 3px 0 0 3px; }
-
-GbWorkspacePane box.header.notebook {
-  border-bottom: 1px solid #2b2e39; }
-
-GbWorkspacePane:not(.focused) box.header.notebook {
-  background-color: #383C4A; }
-
-DhSidebar entry.search,
-SymbolTree entry.search {
-  border-left: none;
-  border-right: none;
-  border-top: none;
-  border-radius: 0px; }
-
-entry.gb-command-bar-entry.flat,
-entry.gb-command-bar-entry.flat:focus {
-  font-family: Monospace;
-  color: #BAC3CF;
-  background-image: none;
-  background-color: #353945;
-  padding: 6px 6px 6px 6px;
-  border: none; }
-
-GbTerminalView {
-  background-color: #404552;
-  color: #D3DAE3; }
-
-GbSourceStyleSchemeWidget GtkSourceView {
-  font-family: Monospace; }
-
-scrolledwindow.gb-linked-scroller, placessidebar.gb-linked-scroller {
-  border-top: none; }
-
-GbSearchDisplayGroup list row
-GbDocumentStack button {
-  transition: none; }
-
-GbViewStack box.header.notebook,
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid #2b2e39; }
-
-GbViewStack.focused box.header.notebook {
-  background-color: #404552; }
-  GbViewStack.focused box.header.notebook button.dim-label, GbViewStack.focused box.header.notebook headerbar button.subtitle, headerbar GbViewStack.focused box.header.notebook button.subtitle {
-    opacity: 1; }
+.gedit-search-entry-occurrences-tag {
+  color: rgba(211, 218, 227, 0.6);
+  border: none;
+  margin: 2px;
+  padding: 2px; }
 
 button.documents-load-more {
   border-width: 1px 0 0;
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index 31b31be..86aea17 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -2753,7 +2753,7 @@ label selection,
 label selection:focus,
 label selection:hover, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, entry.gb-command-bar-entry.flat:selected, entry.gb-command-bar-entry.flat:selected:focus, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
+modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
   background-image: none;
   background-color: #5294E2;
   color: #ffffff;
@@ -2783,12 +2783,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   border-color: transparent;
   box-shadow: inset 0 -1px #dcdfe3; }
 
+.nautilus-window notebook,
 .nautilus-window notebook > stack:not(:only-child) searchbar {
   background-color: #ffffff; }
 
-.nautilus-window notebook {
-  background-color: #ffffff; }
-
 button.nautilus-circular-button.image-button {
   border-radius: 50%;
   -gtk-outline-radius: 50%;
@@ -2862,11 +2860,9 @@ button.nautilus-circular-button.image-button {
   background-color: #d9dde0;
   color: #5c616c; }
 
-.gedit-search-entry-occurrences-tag {
-  color: rgba(92, 97, 108, 0.6);
-  border: none;
-  margin: 2px;
-  padding: 2px; }
+.gedit-side-panel-paned statusbar {
+  border-top: 1px solid #dcdfe3;
+  background-color: #F5F6F7; }
 
 .gedit-search-slider {
   background-color: #fbfbfc;
@@ -2876,121 +2872,11 @@ button.nautilus-circular-button.image-button {
   border-width: 0 1px 1px 1px;
   border-style: solid; }
 
-GbWorkbench .floating-bar {
-  color: #5c616c; }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr),
-GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) {
-  padding: 0 10px;
-  color: rgba(207, 218, 231, 0.8);
-  border-color: rgba(21, 23, 28, 0.4);
-  background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.4));
-  background-color: transparent; }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr) image, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr) image:hover,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) image,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) image:hover {
-    color: inherit; }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):hover {
-    color: #ffffff;
-    border-color: transparent;
-    background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):active,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):checked {
-    color: #ffffff;
-    border-color: transparent;
-    background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):disabled,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):disabled {
-    color: rgba(207, 218, 231, 0.35);
-    background-image: linear-gradient(to bottom, rgba(95, 105, 127, 0.25)); }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr),
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked {
-  border-left-style: none;
-  border-radius: 0 3px 3px 0;
-  -gtk-outline-radius: 0 1px 1px 0; }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl),
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):hover,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):active,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):checked {
-  border-right-style: none;
-  border-radius: 3px 0 0 3px;
-  -gtk-outline-radius: 1px 0 0 1px; }
-
-GbPreferencesPageLanguage entry {
-  border-radius: 3px 3px 0 0; }
-
-GbPreferencesPageLanguage .frame {
-  border-top-width: 0; }
-
-GbEditorTweakWidget .linked.vertical > entry {
-  border-bottom-style: solid; }
-
-GbEditorTweakWidget scrolledwindow, GbEditorTweakWidget placessidebar {
-  border-top: none; }
-
-GbViewStack box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbViewStack.focused box.header.notebook,
-#project_sidebar_header.focused {
-  background-color: #ffffff; }
-
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbNewProjectDialog button.file.linked-on-right button {
-  border-radius: 3px 0 0 3px; }
-
-GbWorkspacePane box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbWorkspacePane:not(.focused) box.header.notebook {
-  background-color: #F5F6F7; }
-
-DhSidebar entry.search,
-SymbolTree entry.search {
-  border-left: none;
-  border-right: none;
-  border-top: none;
-  border-radius: 0px; }
-
-entry.gb-command-bar-entry.flat,
-entry.gb-command-bar-entry.flat:focus {
-  font-family: Monospace;
-  color: #BAC3CF;
-  background-image: none;
-  background-color: #353945;
-  padding: 6px 6px 6px 6px;
-  border: none; }
-
-GbTerminalView {
-  background-color: #ffffff;
-  color: #5c616c; }
-
-GbSourceStyleSchemeWidget GtkSourceView {
-  font-family: Monospace; }
-
-scrolledwindow.gb-linked-scroller, placessidebar.gb-linked-scroller {
-  border-top: none; }
-
-GbSearchDisplayGroup list row
-GbDocumentStack button {
-  transition: none; }
-
-GbViewStack box.header.notebook,
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbViewStack.focused box.header.notebook {
-  background-color: #ffffff; }
-  GbViewStack.focused box.header.notebook button.dim-label, GbViewStack.focused box.header.notebook headerbar button.subtitle, headerbar GbViewStack.focused box.header.notebook button.subtitle {
-    opacity: 1; }
+.gedit-search-entry-occurrences-tag {
+  color: rgba(92, 97, 108, 0.6);
+  border: none;
+  margin: 2px;
+  padding: 2px; }
 
 button.documents-load-more {
   border-width: 1px 0 0;
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index c75778b..67498a2 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -2757,7 +2757,7 @@ label selection,
 label selection:focus,
 label selection:hover, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, entry.gb-command-bar-entry.flat:selected, entry.gb-command-bar-entry.flat:selected:focus, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
+modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
   background-image: none;
   background-color: #5294E2;
   color: #ffffff;
@@ -2787,12 +2787,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   border-color: transparent;
   box-shadow: inset 0 -1px #dcdfe3; }
 
+.nautilus-window notebook,
 .nautilus-window notebook > stack:not(:only-child) searchbar {
   background-color: #ffffff; }
 
-.nautilus-window notebook {
-  background-color: #ffffff; }
-
 button.nautilus-circular-button.image-button {
   border-radius: 50%;
   -gtk-outline-radius: 50%;
@@ -2866,11 +2864,9 @@ button.nautilus-circular-button.image-button {
   background-color: #d9dde0;
   color: #5c616c; }
 
-.gedit-search-entry-occurrences-tag {
-  color: rgba(92, 97, 108, 0.6);
-  border: none;
-  margin: 2px;
-  padding: 2px; }
+.gedit-side-panel-paned statusbar {
+  border-top: 1px solid #dcdfe3;
+  background-color: #F5F6F7; }
 
 .gedit-search-slider {
   background-color: #fbfbfc;
@@ -2880,121 +2876,11 @@ button.nautilus-circular-button.image-button {
   border-width: 0 1px 1px 1px;
   border-style: solid; }
 
-GbWorkbench .floating-bar {
-  color: #5c616c; }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr),
-GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) {
-  padding: 0 10px;
-  color: rgba(82, 93, 118, 0.8);
-  border-color: rgba(82, 93, 118, 0.1);
-  background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9));
-  background-color: transparent; }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr) image, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr) image:hover,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) image,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) image:hover {
-    color: inherit; }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):hover {
-    color: #ffffff;
-    border-color: #5294E2;
-    background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):active,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):checked {
-    color: #ffffff;
-    border-color: #5294E2;
-    background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):disabled,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):disabled {
-    color: rgba(82, 93, 118, 0.35);
-    background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr),
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked {
-  border-left-style: none;
-  border-radius: 0 3px 3px 0;
-  -gtk-outline-radius: 0 1px 1px 0; }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl),
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):hover,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):active,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):checked {
-  border-right-style: none;
-  border-radius: 3px 0 0 3px;
-  -gtk-outline-radius: 1px 0 0 1px; }
-
-GbPreferencesPageLanguage entry {
-  border-radius: 3px 3px 0 0; }
-
-GbPreferencesPageLanguage .frame {
-  border-top-width: 0; }
-
-GbEditorTweakWidget .linked.vertical > entry {
-  border-bottom-style: solid; }
-
-GbEditorTweakWidget scrolledwindow, GbEditorTweakWidget placessidebar {
-  border-top: none; }
-
-GbViewStack box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbViewStack.focused box.header.notebook,
-#project_sidebar_header.focused {
-  background-color: #ffffff; }
-
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbNewProjectDialog button.file.linked-on-right button {
-  border-radius: 3px 0 0 3px; }
-
-GbWorkspacePane box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbWorkspacePane:not(.focused) box.header.notebook {
-  background-color: #F5F6F7; }
-
-DhSidebar entry.search,
-SymbolTree entry.search {
-  border-left: none;
-  border-right: none;
-  border-top: none;
-  border-radius: 0px; }
-
-entry.gb-command-bar-entry.flat,
-entry.gb-command-bar-entry.flat:focus {
-  font-family: Monospace;
-  color: #BAC3CF;
-  background-image: none;
-  background-color: #353945;
-  padding: 6px 6px 6px 6px;
-  border: none; }
-
-GbTerminalView {
-  background-color: #ffffff;
-  color: #5c616c; }
-
-GbSourceStyleSchemeWidget GtkSourceView {
-  font-family: Monospace; }
-
-scrolledwindow.gb-linked-scroller, placessidebar.gb-linked-scroller {
-  border-top: none; }
-
-GbSearchDisplayGroup list row
-GbDocumentStack button {
-  transition: none; }
-
-GbViewStack box.header.notebook,
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbViewStack.focused box.header.notebook {
-  background-color: #ffffff; }
-  GbViewStack.focused box.header.notebook button.dim-label, GbViewStack.focused box.header.notebook headerbar button.subtitle, headerbar GbViewStack.focused box.header.notebook button.subtitle {
-    opacity: 1; }
+.gedit-search-entry-occurrences-tag {
+  color: rgba(92, 97, 108, 0.6);
+  border: none;
+  margin: 2px;
+  padding: 2px; }
 
 button.documents-load-more {
   border-width: 1px 0 0;
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 1602115..0cf9e12 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -2757,7 +2757,7 @@ label selection,
 label selection:focus,
 label selection:hover, menuitem.button.flat:active, menuitem.button.flat:selected,
 modelbutton.flat:active,
-modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, entry.gb-command-bar-entry.flat:selected, entry.gb-command-bar-entry.flat:selected:focus, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
+modelbutton.flat:selected, treeview.view:selected, row:selected, .sidebar:selected, .sidebar .view:selected, .nautilus-window placessidebar.sidebar row.activatable:selected, .nautilus-window placessidebar.sidebar row.activatable:selected:hover, .nautilus-window placessidebar.sidebar row.activatable:active:hover {
   background-image: none;
   background-color: #5294E2;
   color: #ffffff;
@@ -2787,12 +2787,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   border-color: transparent;
   box-shadow: inset 0 -1px #dcdfe3; }
 
+.nautilus-window notebook,
 .nautilus-window notebook > stack:not(:only-child) searchbar {
   background-color: #ffffff; }
 
-.nautilus-window notebook {
-  background-color: #ffffff; }
-
 button.nautilus-circular-button.image-button {
   border-radius: 50%;
   -gtk-outline-radius: 50%;
@@ -2866,11 +2864,9 @@ button.nautilus-circular-button.image-button {
   background-color: #d9dde0;
   color: #5c616c; }
 
-.gedit-search-entry-occurrences-tag {
-  color: rgba(92, 97, 108, 0.6);
-  border: none;
-  margin: 2px;
-  padding: 2px; }
+.gedit-side-panel-paned statusbar {
+  border-top: 1px solid #dcdfe3;
+  background-color: #F5F6F7; }
 
 .gedit-search-slider {
   background-color: #fbfbfc;
@@ -2880,121 +2876,11 @@ button.nautilus-circular-button.image-button {
   border-width: 0 1px 1px 1px;
   border-style: solid; }
 
-GbWorkbench .floating-bar {
-  color: #5c616c; }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr),
-GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) {
-  padding: 0 10px;
-  color: rgba(82, 93, 118, 0.8);
-  border-color: rgba(82, 93, 118, 0.1);
-  background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.9));
-  background-color: transparent; }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr) image, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr) image:hover,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) image,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl) image:hover {
-    color: inherit; }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):hover {
-    color: #ffffff;
-    border-color: #5294E2;
-    background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active, GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):active,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):checked {
-    color: #ffffff;
-    border-color: #5294E2;
-    background-image: linear-gradient(to bottom, #5294E2); }
-  GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):disabled,
-  GbSearchBox.linked:not(.vertical) > button.popup:first-child:dir(rtl):disabled {
-    color: rgba(82, 93, 118, 0.35);
-    background-image: linear-gradient(to bottom, rgba(255, 255, 255, 0.75)); }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr),
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):hover,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):active,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(ltr):checked {
-  border-left-style: none;
-  border-radius: 0 3px 3px 0;
-  -gtk-outline-radius: 0 1px 1px 0; }
-
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl),
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):hover,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):active,
-GbSearchBox.linked:not(.vertical) > button.popup:last-child:dir(rtl):checked {
-  border-right-style: none;
-  border-radius: 3px 0 0 3px;
-  -gtk-outline-radius: 1px 0 0 1px; }
-
-GbPreferencesPageLanguage entry {
-  border-radius: 3px 3px 0 0; }
-
-GbPreferencesPageLanguage .frame {
-  border-top-width: 0; }
-
-GbEditorTweakWidget .linked.vertical > entry {
-  border-bottom-style: solid; }
-
-GbEditorTweakWidget scrolledwindow, GbEditorTweakWidget placessidebar {
-  border-top: none; }
-
-GbViewStack box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbViewStack.focused box.header.notebook,
-#project_sidebar_header.focused {
-  background-color: #ffffff; }
-
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbNewProjectDialog button.file.linked-on-right button {
-  border-radius: 3px 0 0 3px; }
-
-GbWorkspacePane box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbWorkspacePane:not(.focused) box.header.notebook {
-  background-color: #F5F6F7; }
-
-DhSidebar entry.search,
-SymbolTree entry.search {
-  border-left: none;
-  border-right: none;
-  border-top: none;
-  border-radius: 0px; }
-
-entry.gb-command-bar-entry.flat,
-entry.gb-command-bar-entry.flat:focus {
-  font-family: Monospace;
-  color: #BAC3CF;
-  background-image: none;
-  background-color: #353945;
-  padding: 6px 6px 6px 6px;
-  border: none; }
-
-GbTerminalView {
-  background-color: #ffffff;
-  color: #5c616c; }
-
-GbSourceStyleSchemeWidget GtkSourceView {
-  font-family: Monospace; }
-
-scrolledwindow.gb-linked-scroller, placessidebar.gb-linked-scroller {
-  border-top: none; }
-
-GbSearchDisplayGroup list row
-GbDocumentStack button {
-  transition: none; }
-
-GbViewStack box.header.notebook,
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid #dcdfe3; }
-
-GbViewStack.focused box.header.notebook {
-  background-color: #ffffff; }
-  GbViewStack.focused box.header.notebook button.dim-label, GbViewStack.focused box.header.notebook headerbar button.subtitle, headerbar GbViewStack.focused box.header.notebook button.subtitle {
-    opacity: 1; }
+.gedit-search-entry-occurrences-tag {
+  color: rgba(92, 97, 108, 0.6);
+  border: none;
+  margin: 2px;
+  padding: 2px; }
 
 button.documents-load-more {
   border-width: 1px 0 0;
diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 8fcb0a7..01315ce 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -32,28 +32,6 @@
 //  }
 //}
 
-//
-// Evolution
-//
-// needed for webkit/GtkStyle/Evolution compatibility
-//GtkHTML {
-//  background-color: $base_color;
-//  color: $text_color;
-//
-//  &:active {
-//    color: $selected_fg_color;
-//    background-color: $selected_bg_color;
-//  }
-//}
-
-//
-// Sushi
-//
-// used by gnome-font-viewer and sushi
-//SushiFontWidget {
-//  padding: 6px 12px;
-//}
-
 //
 // GNOME Terminal
 //
@@ -116,14 +94,11 @@
   box-shadow: inset 0 -1px $borders_color;
 }
 
+.nautilus-window notebook,
 .nautilus-window notebook > stack:not(:only-child) searchbar {
   background-color: $base_color;
 }
 
-.nautilus-window notebook {
-  background-color: $base_color;
-}
-
 button.nautilus-circular-button.image-button {
   border-radius: 50%;
   -gtk-outline-radius: 50%;
@@ -205,8 +180,6 @@ $disk_space_free: darken($bg_color, 3%);
 //
 // Gedit
 //
-//.gedit-headerbar-paned { color: $header_border; }
-
 .open-document-selector-treeview.view {
   padding: 3px 6px 3px 6px;
   border-color: $base_color;  // disable borders, making them transparent doesn't work for some reason
@@ -269,35 +242,12 @@ $disk_space_free: darken($bg_color, 3%);
   color: $fg_color;
 }
 
-//.gedit-document-panel-placeholder-row {
-//}
-
-//GeditStatusbar {
-//  border-top: 1px solid $borders_color;
-//  background-color: $bg_color;
-//}
-//
-//GeditStatusMenuButton.button.flat,
-//GeditStatusMenuButton:hover.button.flat,
-//GeditStatusMenuButton:checked.button.flat {
-//  border-bottom-style: none;
-//  border-radius: 0;
-//}
-
-.gedit-search-slider { @extend %search_slider }
-
-//GeditFileBrowserWidget toolbar {
-//  border-bottom: 1px solid $borders_color;
-//}
-
-.gedit-search-entry-occurrences-tag {
-  color: transparentize($fg_color, 0.4);
-  border: none;
-  margin: 2px;
-  padding: 2px;
+.gedit-side-panel-paned statusbar {
+  border-top: 1px solid $borders_color;
+  background-color: $bg_color;
 }
 
-%search_slider {
+.gedit-search-slider {
   background-color: lighten($bg_color, 2%);
   padding: 6px;
   border-color: $borders_color;
@@ -306,137 +256,16 @@ $disk_space_free: darken($bg_color, 3%);
   border-style: solid;
 }
 
-//
-// Gnome Builder
-//
-GbWorkbench .floating-bar { color: $fg_color; }
-
-GbSearchBox.linked:not(.vertical) {
-
-  > button.popup:last-child:dir(ltr),
-  > button.popup:first-child:dir(rtl) {
-    padding: 0 10px;
-
-    @include entry(header-normal);
-
-    &:hover { @include entry(header-focus); }
-    &:active, &:checked { @include entry(header-focus); }
-    &:disabled { @include entry(header-insensitive); }
-  }
-
-  > button.popup:last-child:dir(ltr),
-  > button.popup:last-child:dir(ltr):hover,
-  > button.popup:last-child:dir(ltr):active,
-  > button.popup:last-child:dir(ltr):checked {
-    border-left-style: none;
-    border-radius: 0 3px 3px 0;
-    -gtk-outline-radius: 0 1px 1px 0;
-  }
-
-  > button.popup:last-child:dir(rtl),
-  > button.popup:last-child:dir(rtl):hover,
-  > button.popup:last-child:dir(rtl):active,
-  > button.popup:last-child:dir(rtl):checked {
-    border-right-style: none;
-    border-radius: 3px 0 0 3px;
-    -gtk-outline-radius: 1px 0 0 1px;
-  }
-}
-
-// Preference page language style
-GbPreferencesPageLanguage  {
-  entry { border-radius: 3px 3px 0 0; }
-  .frame { border-top-width: 0 }
-}
-
-// Editor tweak widget
-GbEditorTweakWidget {
-  .linked.vertical > entry { border-bottom-style: solid; }
-  scrolledwindow { border-top: none; }
-}
-
-// View stack styling
-GbViewStack box.header.notebook {
-  border-bottom: 1px solid $borders_color;
-}
-
-GbViewStack.focused box.header.notebook,
-#project_sidebar_header.focused {
-  background-color: $base_color;
-}
-
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid $borders_color;
-}
-
-GbNewProjectDialog button.file.linked-on-right button {
-  border-radius: 3px 0 0 3px;
-}
-
-// Workspace pane header styling
-GbWorkspacePane box.header.notebook {
-  border-bottom: 1px solid $borders_color;
-}
-
-GbWorkspacePane:not(.focused) box.header.notebook {
-  background-color: $bg_color;
-}
-
-// Adjust devehlp and symbol panel styling
-DhSidebar entry.search,
-SymbolTree entry.search {
-  border-left: none;
-  border-right: none;
-  border-top: none;
-  border-radius: 0px;
-}
-
-// Command Bar styling
-entry.gb-command-bar-entry.flat,
-entry.gb-command-bar-entry.flat:focus {
-  font-family: Monospace;
-  color: $osd_fg_color;
-  background-image: none;
-  background-color: opacify($osd_bg_color, 1);
-  padding: 6px 6px 6px 6px;
+.gedit-search-entry-occurrences-tag {
+  color: transparentize($fg_color, 0.4);
   border: none;
-
-  &:selected,
-  &:selected:focus {
-    @extend %selected_items;
-  }
-}
-
-GbTerminalView {
-  background-color: $base_color;
-  color: $fg_color;
-}
-
-GbSourceStyleSchemeWidget GtkSourceView {
-  font-family: Monospace;
-}
-
-scrolledwindow.gb-linked-scroller {
-  border-top: none;
-}
-
-// Disable various animatinos that are enabled by default and really annoying
-// to the overall flow of Builder.
-GbSearchDisplayGroup list row
-GbDocumentStack button {
-  transition: none;
-}
-
-GbViewStack box.header.notebook,
-GbEditorWorkspace > paned > box > box.header.notebook {
-  border-bottom: 1px solid $borders_color;
+  margin: 2px;
+  padding: 2px;
 }
 
-GbViewStack.focused box.header.notebook {
-  background-color: $base_color;
-
- button.dim-label { opacity: 1; }
-}
+//GeditFileBrowserWidget toolbar {
+//  border-bottom: 1px solid $borders_color;
+//}
 
 //
 // Epiphany
@@ -502,19 +331,6 @@ button.documents-favorite:active:hover {
   border-image: url("assets/thumbnail-frame.png") 3 3 6 4;
 }
 
-//
-// Totem
-//
-//TotemGrilo.vertical GdMainView.frame {
-//  border-width: 0;
-//}
-
-//
-// Synapse
-//
-//SynapseGuiSelectionContainer *:selected,
-//SynapseGuiViewVirgilio *:selected { background-color: $selected_bg_color; }
-
 //
 // Transmission
 //
diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
index 26238af..0a0dfab 100644
--- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
@@ -91,9 +91,6 @@
 //NemoWindow.background > GtkGrid > paned > separator,
 //MarlinViewWindow.background > GtkBox > paned > separator { background-color: $dark_sidebar_border }
 
-// Fix Nautilus transparency issues
-//.nautilus-window NautilusWindowSlot { background-color: $base_color; }
-
 //GtkFileChooserDialog {
 //
 //  &.background.csd, &.background { background-color: $dark_sidebar_bg }
@@ -127,13 +124,6 @@
 //}
 
 // Gedit
-//GeditWindow.background {
-//  &.csd { background-color: transparent; }
-//
-//  .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; }
 
 .gedit-document-panel {