From 8f0b659a68c34a3183780402b4dd2358a715f161 Mon Sep 17 00:00:00 2001
From: vinceliuice <vinceliuice@hotmail.com>
Date: Wed, 19 Aug 2020 14:42:52 +0800
Subject: [PATCH] update

---
 src/main/cinnamon/cinnamon-dark-solid.css  |  9 +---
 src/main/cinnamon/cinnamon-dark.css        | 11 ++---
 src/main/cinnamon/cinnamon-light-solid.css |  9 +---
 src/main/cinnamon/cinnamon-light.css       | 11 ++---
 src/main/gtk-3.0/gtk-dark-solid.css        | 43 +++++++++++++++--
 src/main/gtk-3.0/gtk-dark.css              | 43 +++++++++++++++--
 src/main/gtk-3.0/gtk-light-solid.css       | 43 +++++++++++++++--
 src/main/gtk-3.0/gtk-light.css             | 43 +++++++++++++++--
 src/sass/cinnamon/_common.scss             |  2 +-
 src/sass/cinnamon/_drawing.scss            |  9 +---
 src/sass/gtk/_applications.scss            | 56 ++++++++++++++++++++--
 11 files changed, 224 insertions(+), 55 deletions(-)

diff --git a/src/main/cinnamon/cinnamon-dark-solid.css b/src/main/cinnamon/cinnamon-dark-solid.css
index cff6361..77731fd 100644
--- a/src/main/cinnamon/cinnamon-dark-solid.css
+++ b/src/main/cinnamon/cinnamon-dark-solid.css
@@ -103,20 +103,18 @@ stage {
   transition-duration: 300ms;
   border-radius: 5px;
   color: #dadada;
-  border: 1px solid rgba(255, 255, 255, 0.12);
+  border: 2px solid transparent;
   background-color: rgba(255, 255, 255, 0.05);
 }
 
 #menu-search-entry:focus, .notification StEntry:focus, .menu #notification StEntry:focus, .popup-menu #notification StEntry:focus, #notification StEntry:focus, #menu-search-entry:hover, .notification StEntry:hover, .menu #notification StEntry:hover, .popup-menu #notification StEntry:hover, #notification StEntry:hover {
   color: #dadada;
-  border: 1px solid #6887cd;
+  border: 2px solid rgba(104, 135, 205, 0.75);
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: 0 0 0 2px rgba(104, 135, 205, 0.75);
 }
 
 #menu-search-entry:insensitive, .notification StEntry:insensitive, .menu #notification StEntry:insensitive, .popup-menu #notification StEntry:insensitive, #notification StEntry:insensitive {
   color: rgba(222, 222, 222, 0.35);
-  border: 1px solid rgba(255, 255, 255, 0.12);
   background-color: rgba(255, 255, 255, 0);
 }
 
@@ -617,7 +615,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -cinnamon-caption-spacing: 4px;
   color: #dadada;
   background-color: rgba(98, 98, 98, 0.96);
-  border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
@@ -1104,14 +1101,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   selection-background-color: #0860f2;
   color: #dadada;
   background-color: rgba(98, 98, 98, 0.96);
-  border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
 .run-dialog-entry:focus {
   color: white;
   background-color: #0860f2;
-  border: 1px solid #0860f2;
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
diff --git a/src/main/cinnamon/cinnamon-dark.css b/src/main/cinnamon/cinnamon-dark.css
index 27a6d0a..7aea2c3 100644
--- a/src/main/cinnamon/cinnamon-dark.css
+++ b/src/main/cinnamon/cinnamon-dark.css
@@ -103,20 +103,18 @@ stage {
   transition-duration: 300ms;
   border-radius: 5px;
   color: #dadada;
-  border: 1px solid rgba(255, 255, 255, 0.12);
+  border: 2px solid transparent;
   background-color: rgba(255, 255, 255, 0.05);
 }
 
 #menu-search-entry:focus, .notification StEntry:focus, .menu #notification StEntry:focus, .popup-menu #notification StEntry:focus, #notification StEntry:focus, #menu-search-entry:hover, .notification StEntry:hover, .menu #notification StEntry:hover, .popup-menu #notification StEntry:hover, #notification StEntry:hover {
   color: #dadada;
-  border: 1px solid #6887cd;
+  border: 2px solid rgba(104, 135, 205, 0.75);
   background-color: rgba(255, 255, 255, 0.05);
-  box-shadow: 0 0 0 2px rgba(104, 135, 205, 0.75);
 }
 
 #menu-search-entry:insensitive, .notification StEntry:insensitive, .menu #notification StEntry:insensitive, .popup-menu #notification StEntry:insensitive, #notification StEntry:insensitive {
   color: rgba(222, 222, 222, 0.35);
-  border: 1px solid rgba(255, 255, 255, 0.12);
   background-color: rgba(255, 255, 255, 0);
 }
 
@@ -518,7 +516,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: white;
   font-size: 1em;
   padding: 0px;
-  background-color: rgba(0, 0, 0, 0.95);
+  background-color: rgba(0, 0, 0, 0.16);
   box-shadow: 0 0 5px rgba(0, 0, 0, 0.5), 0 0 16px rgba(0, 0, 0, 0.24);
 }
 
@@ -617,7 +615,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -cinnamon-caption-spacing: 4px;
   color: #dadada;
   background-color: rgba(98, 98, 98, 0.96);
-  border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
@@ -1104,14 +1101,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   selection-background-color: #0860f2;
   color: #dadada;
   background-color: rgba(98, 98, 98, 0.96);
-  border: 1px solid rgba(0, 0, 0, 0.15);
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
 .run-dialog-entry:focus {
   color: white;
   background-color: #0860f2;
-  border: 1px solid #0860f2;
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
diff --git a/src/main/cinnamon/cinnamon-light-solid.css b/src/main/cinnamon/cinnamon-light-solid.css
index 4e3de53..0c77968 100644
--- a/src/main/cinnamon/cinnamon-light-solid.css
+++ b/src/main/cinnamon/cinnamon-light-solid.css
@@ -103,20 +103,18 @@ stage {
   transition-duration: 300ms;
   border-radius: 5px;
   color: #363636;
-  border: 1px solid rgba(0, 0, 0, 0.12);
+  border: 2px solid transparent;
   background-color: rgba(0, 0, 0, 0.05);
 }
 
 #menu-search-entry:focus, .notification StEntry:focus, .menu #notification StEntry:focus, .popup-menu #notification StEntry:focus, #notification StEntry:focus, #menu-search-entry:hover, .notification StEntry:hover, .menu #notification StEntry:hover, .popup-menu #notification StEntry:hover, #notification StEntry:hover {
   color: #363636;
-  border: 1px solid #6887cd;
+  border: 2px solid rgba(103, 164, 233, 0.75);
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: 0 0 0 2px rgba(103, 164, 233, 0.75);
 }
 
 #menu-search-entry:insensitive, .notification StEntry:insensitive, .menu #notification StEntry:insensitive, .popup-menu #notification StEntry:insensitive, #notification StEntry:insensitive {
   color: rgba(36, 36, 36, 0.45);
-  border: 1px solid rgba(0, 0, 0, 0.12);
   background-color: rgba(0, 0, 0, 0);
 }
 
@@ -601,7 +599,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -cinnamon-caption-spacing: 4px;
   color: #dadada;
   background-color: rgba(98, 98, 98, 0.96);
-  border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
@@ -1088,14 +1085,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   selection-background-color: #0860f2;
   color: #dadada;
   background-color: rgba(98, 98, 98, 0.96);
-  border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
 .run-dialog-entry:focus {
   color: white;
   background-color: #0860f2;
-  border: 1px solid #0860f2;
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
diff --git a/src/main/cinnamon/cinnamon-light.css b/src/main/cinnamon/cinnamon-light.css
index 167b8bf..c5211ee 100644
--- a/src/main/cinnamon/cinnamon-light.css
+++ b/src/main/cinnamon/cinnamon-light.css
@@ -103,20 +103,18 @@ stage {
   transition-duration: 300ms;
   border-radius: 5px;
   color: #363636;
-  border: 1px solid rgba(0, 0, 0, 0.12);
+  border: 2px solid transparent;
   background-color: rgba(0, 0, 0, 0.05);
 }
 
 #menu-search-entry:focus, .notification StEntry:focus, .menu #notification StEntry:focus, .popup-menu #notification StEntry:focus, #notification StEntry:focus, #menu-search-entry:hover, .notification StEntry:hover, .menu #notification StEntry:hover, .popup-menu #notification StEntry:hover, #notification StEntry:hover {
   color: #363636;
-  border: 1px solid #6887cd;
+  border: 2px solid rgba(103, 164, 233, 0.75);
   background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: 0 0 0 2px rgba(103, 164, 233, 0.75);
 }
 
 #menu-search-entry:insensitive, .notification StEntry:insensitive, .menu #notification StEntry:insensitive, .popup-menu #notification StEntry:insensitive, #notification StEntry:insensitive {
   color: rgba(36, 36, 36, 0.45);
-  border: 1px solid rgba(0, 0, 0, 0.12);
   background-color: rgba(0, 0, 0, 0);
 }
 
@@ -518,7 +516,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   color: white;
   font-size: 1em;
   padding: 0px;
-  background-color: rgba(255, 255, 255, 0.95);
+  background-color: rgba(255, 255, 255, 0.16);
   box-shadow: 0 0 5px rgba(0, 0, 0, 0.5), 0 0 16px rgba(0, 0, 0, 0.24);
 }
 
@@ -601,7 +599,6 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -cinnamon-caption-spacing: 4px;
   color: #dadada;
   background-color: rgba(98, 98, 98, 0.96);
-  border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
@@ -1088,14 +1085,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   selection-background-color: #0860f2;
   color: #dadada;
   background-color: rgba(98, 98, 98, 0.96);
-  border: 1px solid rgba(0, 0, 0, 0.08);
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
 .run-dialog-entry:focus {
   color: white;
   background-color: #0860f2;
-  border: 1px solid #0860f2;
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05);
 }
 
diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css
index 507bebf..6ee75f3 100644
--- a/src/main/gtk-3.0/gtk-dark-solid.css
+++ b/src/main/gtk-3.0/gtk-dark-solid.css
@@ -4783,20 +4783,24 @@ filechooser paned > separator:dir(rtl),
 .nautilus-window.background.csd {
   border-radius: 0 0 14px 14px;
   background-color: transparent;
-  background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #0d0d0d 201px, #242424 201px, #242424 100%);
+  background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
 .nautilus-window.background.csd > headerbar.titlebar {
   border: none;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   background: none;
-  background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #0d0d0d 201px, #242424 201px, #242424 100%);
+  background-image: linear-gradient(90deg, #333333 0%, #333333 200px, #141414 200px, #141414 201px, #242424 201px, #242424 100%);
 }
 
 .nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
+.nautilus-window.background.csd > grid.horizontal > paned.horizontal > box.vertical > placessidebar {
+  border-bottom-left-radius: 14px;
+}
+
 .nautilus-window headerbar .path-bar-box {
   color: transparent;
   background: none;
@@ -4823,9 +4827,11 @@ filechooser paned > separator:dir(rtl),
 }
 
 .nautilus-window placessidebar.sidebar {
+  margin-bottom: 14px;
   border: none;
-  background-color: transparent;
   min-width: 200px;
+  background-color: transparent;
+  background-image: linear-gradient(90deg, #333333 0%, #333333 200px, transparent 200px, transparent 100%);
 }
 
 .nautilus-window placessidebar.sidebar row.sidebar-row {
@@ -4902,6 +4908,37 @@ filechooser paned > separator:dir(rtl),
   background-color: transparent;
 }
 
+.nautilus-window placessidebar.sidebar scrollbar {
+  background: none;
+  border: none;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+  background-color: rgba(255, 255, 255, 0.35);
+  border: none;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider {
+  min-width: 4px;
+  background-color: rgba(255, 255, 255, 0.7);
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider:hover {
+  background-color: white;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider:hover:active {
+  background-color: #aaaaaa;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider:disabled {
+  background-color: transparent;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar trough {
+  background-color: transparent;
+}
+
 .nautilus-window notebook {
   margin-left: -1px;
   margin-right: -1px;
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index 9c255b4..4bae813 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -4783,20 +4783,24 @@ filechooser paned > separator:dir(rtl),
 .nautilus-window.background.csd {
   border-radius: 0 0 14px 14px;
   background-color: transparent;
-  background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(13, 13, 13, 0.95) 201px, #242424 201px, #242424 100%);
+  background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
 .nautilus-window.background.csd > headerbar.titlebar {
   border: none;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   background: none;
-  background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(13, 13, 13, 0.95) 201px, #242424 201px, #242424 100%);
+  background-image: linear-gradient(90deg, rgba(51, 51, 51, 0.95) 0%, rgba(51, 51, 51, 0.95) 200px, rgba(20, 20, 20, 0.95) 200px, rgba(20, 20, 20, 0.95) 201px, #242424 201px, #242424 100%);
 }
 
 .nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
+.nautilus-window.background.csd > grid.horizontal > paned.horizontal > box.vertical > placessidebar {
+  border-bottom-left-radius: 14px;
+}
+
 .nautilus-window headerbar .path-bar-box {
   color: transparent;
   background: none;
@@ -4823,9 +4827,11 @@ filechooser paned > separator:dir(rtl),
 }
 
 .nautilus-window placessidebar.sidebar {
+  margin-bottom: 14px;
   border: none;
-  background-color: transparent;
   min-width: 200px;
+  background-color: transparent;
+  background-image: none;
 }
 
 .nautilus-window placessidebar.sidebar row.sidebar-row {
@@ -4902,6 +4908,37 @@ filechooser paned > separator:dir(rtl),
   background-color: transparent;
 }
 
+.nautilus-window placessidebar.sidebar scrollbar {
+  background: none;
+  border: none;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+  background-color: rgba(255, 255, 255, 0.35);
+  border: none;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider {
+  min-width: 4px;
+  background-color: rgba(255, 255, 255, 0.7);
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider:hover {
+  background-color: white;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider:hover:active {
+  background-color: #aaaaaa;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider:disabled {
+  background-color: transparent;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar trough {
+  background-color: transparent;
+}
+
 .nautilus-window notebook {
   margin-left: -1px;
   margin-right: -1px;
diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css
index da20f87..b98d9bf 100644
--- a/src/main/gtk-3.0/gtk-light-solid.css
+++ b/src/main/gtk-3.0/gtk-light-solid.css
@@ -4804,20 +4804,24 @@ filechooser paned > separator:dir(rtl),
 .nautilus-window.background.csd {
   border-radius: 0 0 14px 14px;
   background-color: transparent;
-  background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #cacaca 201px, #ffffff 201px, #ffffff 100%);
+  background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
 .nautilus-window.background.csd > headerbar.titlebar {
   border: none;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   background: none;
-  background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #cacaca 201px, #ffffff 201px, #ffffff 100%);
+  background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, #d1d1d1 200px, #d1d1d1 201px, #ffffff 201px, #ffffff 100%);
 }
 
 .nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
+.nautilus-window.background.csd > grid.horizontal > paned.horizontal > box.vertical > placessidebar {
+  border-bottom-left-radius: 14px;
+}
+
 .nautilus-window headerbar .path-bar-box {
   color: transparent;
   background: none;
@@ -4844,9 +4848,11 @@ filechooser paned > separator:dir(rtl),
 }
 
 .nautilus-window placessidebar.sidebar {
+  margin-bottom: 14px;
   border: none;
-  background-color: transparent;
   min-width: 200px;
+  background-color: transparent;
+  background-image: linear-gradient(90deg, #f0f0f0 0%, #f0f0f0 200px, transparent 200px, transparent 100%);
 }
 
 .nautilus-window placessidebar.sidebar row.sidebar-row {
@@ -4923,6 +4929,37 @@ filechooser paned > separator:dir(rtl),
   background-color: transparent;
 }
 
+.nautilus-window placessidebar.sidebar scrollbar {
+  background: none;
+  border: none;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+  background-color: rgba(92, 92, 92, 0.35);
+  border: none;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider {
+  min-width: 4px;
+  background-color: rgba(92, 92, 92, 0.7);
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider:hover {
+  background-color: dimgray;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider:hover:active {
+  background-color: #686868;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider:disabled {
+  background-color: transparent;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar trough {
+  background-color: transparent;
+}
+
 .nautilus-window notebook {
   margin-left: -1px;
   margin-right: -1px;
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index 3fc33e8..c7934a2 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -4804,20 +4804,24 @@ filechooser paned > separator:dir(rtl),
 .nautilus-window.background.csd {
   border-radius: 0 0 14px 14px;
   background-color: transparent;
-  background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(202, 202, 202, 0.94) 201px, #ffffff 201px, #ffffff 100%);
+  background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
 .nautilus-window.background.csd > headerbar.titlebar {
   border: none;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   background: none;
-  background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(202, 202, 202, 0.94) 201px, #ffffff 201px, #ffffff 100%);
+  background-image: linear-gradient(90deg, rgba(240, 240, 240, 0.94) 0%, rgba(240, 240, 240, 0.94) 200px, rgba(209, 209, 209, 0.94) 200px, rgba(209, 209, 209, 0.94) 201px, #ffffff 201px, #ffffff 100%);
 }
 
 .nautilus-window.background.csd > headerbar.titlebar > .linked.raised > button:first-child {
   margin-left: 120px;
 }
 
+.nautilus-window.background.csd > grid.horizontal > paned.horizontal > box.vertical > placessidebar {
+  border-bottom-left-radius: 14px;
+}
+
 .nautilus-window headerbar .path-bar-box {
   color: transparent;
   background: none;
@@ -4844,9 +4848,11 @@ filechooser paned > separator:dir(rtl),
 }
 
 .nautilus-window placessidebar.sidebar {
+  margin-bottom: 14px;
   border: none;
-  background-color: transparent;
   min-width: 200px;
+  background-color: transparent;
+  background-image: none;
 }
 
 .nautilus-window placessidebar.sidebar row.sidebar-row {
@@ -4923,6 +4929,37 @@ filechooser paned > separator:dir(rtl),
   background-color: transparent;
 }
 
+.nautilus-window placessidebar.sidebar scrollbar {
+  background: none;
+  border: none;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+  background-color: rgba(92, 92, 92, 0.35);
+  border: none;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider {
+  min-width: 4px;
+  background-color: rgba(92, 92, 92, 0.7);
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider:hover {
+  background-color: dimgray;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider:hover:active {
+  background-color: #686868;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar slider:disabled {
+  background-color: transparent;
+}
+
+.nautilus-window placessidebar.sidebar scrollbar trough {
+  background-color: transparent;
+}
+
 .nautilus-window notebook {
   margin-left: -1px;
   margin-right: -1px;
diff --git a/src/sass/cinnamon/_common.scss b/src/sass/cinnamon/_common.scss
index fe674e4..c43825e 100644
--- a/src/sass/cinnamon/_common.scss
+++ b/src/sass/cinnamon/_common.scss
@@ -445,7 +445,7 @@ $menu_border: if($variant=='light', darken($menu_bg, 18%), darken($menu_bg, 12%)
     color: $panel_fg;
     font-size: 1em;
     padding: 0px;
-    background-color: if($trans == 'true', rgba($panel_bg, 0.95), $panel_bg);
+    background-color: $panel_bg;
     box-shadow: 0 0 5px rgba(#000, 0.5), 0 0 16px rgba(#000, 0.24);
 
     .panel-button,
diff --git a/src/sass/cinnamon/_drawing.scss b/src/sass/cinnamon/_drawing.scss
index e61330b..b7fb0a2 100644
--- a/src/sass/cinnamon/_drawing.scss
+++ b/src/sass/cinnamon/_drawing.scss
@@ -18,41 +18,36 @@
 
   @if $t==normal {
     color: $text_color;
-    border: 1px solid $borders_color;
+    border: 2px solid transparent;
     background-color: $entry_bg;
   }
 
   @if $t==focus {
     color: $text_color;
-    border: 1px solid $selection_mode_bg;
+    border: 2px solid $entry_highlight;
     background-color: $entry_bg;
-    box-shadow: 0 0 0 2px $entry_highlight;
   }
 
   @if $t==insensitive {
     color: $disabled_fg_color;
-    border: 1px solid $entry_border;
     background-color: transparentize($entry_bg, 0.45);
   }
 
   @if $t==osd {
     color: $osd_fg_color;
     background-color: $osd_entry_bg;
-    border: 1px solid $osd_entry_border;
     box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 
   @if $t==osd-focus {
     color: $selected_fg_color;
     background-color: $selected_bg_color;
-    border: 1px solid $selected_bg_color;
     box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 
   @if $t==osd-insensitive {
     color: transparentize($osd_fg_color, 0.45);
     background-color: transparentize($osd_entry_bg, 0.15);
-    border: 1px solid $osd_entry_border;
     box-shadow: inset 0 2px 4px transparentize(black, 0.95);
   }
 }
diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index 1407ec4..eebc1f2 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -63,9 +63,22 @@ window.background.csd { // gnome-terminal 3.32 setting
 
 $nautilus_radius: $wm_radius + 2px;
 $nautilus_sidebar_size: 200px;
-$nautilus_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
+$nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
                                         $dark_sidebar_bg $nautilus_sidebar_size,
-                                        darken($dark_sidebar_bg, 15%) ($nautilus_sidebar_size + 1px),
+                                        darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
+                                        darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
+                                        $base_color ($nautilus_sidebar_size + 1px),
+                                        $base_color 100%);
+
+$nautilus_sidebar_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
+                                        $dark_sidebar_bg $nautilus_sidebar_size,
+                                        transparent $nautilus_sidebar_size,
+                                        transparent 100%);
+
+$nautilus_background_image: linear-gradient(90deg, $dark_sidebar_bg 0%,
+                                        $dark_sidebar_bg $nautilus_sidebar_size,
+                                        darken($dark_sidebar_bg, 12%) $nautilus_sidebar_size,
+                                        darken($dark_sidebar_bg, 12%) ($nautilus_sidebar_size + 1px),
                                         $base_color ($nautilus_sidebar_size + 1px),
                                         $base_color 100%);
 
@@ -87,16 +100,20 @@ filechooser,
   &.background.csd {
     border-radius: 0 0 $wm_radius $wm_radius;
     background-color: transparent;
-    background-image: $nautilus_image;
+    background-image: $nautilus_background_image;
 
     > headerbar.titlebar {
       border: none;
       box-shadow: inset 0 1px rgba(white, 0.1);
       background: none;
-      background-image: $nautilus_image;
+      background-image: $nautilus_header_image;
 
       > .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - 80px; }
     }
+
+    > grid.horizontal > paned.horizontal > box.vertical > placessidebar {
+      border-bottom-left-radius: $wm_radius;
+    }
   }
 
   headerbar {
@@ -127,9 +144,11 @@ filechooser,
   }
 
   placessidebar.sidebar {
+    margin-bottom: $wm_radius;
     border: none;
-    background-color: transparent;
     min-width: $nautilus_sidebar_size;
+    background-color: transparent;
+    background-image: if($trans == 'true', none, $nautilus_sidebar_image);
 
     row.sidebar-row {
       color: $dark_sidebar_fg;
@@ -196,6 +215,33 @@ filechooser,
     }
 
     separator { background-color: transparent; }
+
+    scrollbar {
+      background: none;
+      border: none;
+
+      &.overlay-indicator:not(.dragging):not(.hovering) slider {
+        background-color: rgba(lighten($dark_sidebar_fg, 15%), 0.35);
+        border: none;
+      }
+
+      slider {
+        min-width: 4px;
+        background-color: transparentize(lighten($dark_sidebar_fg, 15%), 0.3);
+
+        &:hover { background-color: lighten($dark_sidebar_fg, 20%); }
+
+        &:hover:active { background-color: $header_button_checked_bg; }
+
+        &:disabled {
+          background-color: transparent;
+        }
+      }
+
+      trough {
+        background-color: transparent;
+      }
+    }
   }
 
   notebook {