diff --git a/macOS11-GTK/gtk-3.0/gtk.css b/macOS11-GTK/gtk-3.0/gtk.css
index e1d3952..938dfd6 100644
--- a/macOS11-GTK/gtk-3.0/gtk.css
+++ b/macOS11-GTK/gtk-3.0/gtk.css
@@ -242,7 +242,7 @@ button {
   min-height: 22px;
   min-width: 20px;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-  border: 1px solid;
+  border: 0px solid;
   border-radius: 3px;
   padding: 2px 6px;
   color: #5c616c;
@@ -256,19 +256,21 @@ button {
     background-image: none;
     transition: none; }
     button.flat:hover, button.sidebar-button:hover {
-      transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-      transition-duration: 350ms; }
+    color: rgba(82, 93, 118, 0.8);
+    border-color: rgba(82, 93, 118, 0.1);
+    background-color: #ffffff; /*rgba(251, 251, 252, 0.9);*/
+    box-shadow: 0 2px 2px 0 rgba(0,0,0,0.1), 0 2px 4px 0 rgba(0,0,0,0.1); }
       button.flat:hover:active, button.sidebar-button:hover:active {
         transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); }
   button:hover {
-    color: #5c616c;
-    border-color: #cfd6e6;
-    background-color: white;
-    -gtk-icon-effect: highlight; }
+    color: rgba(82, 93, 118, 0.8);
+    border-color: rgba(82, 93, 118, 0.1);
+    background-color: #ffffff; /*rgba(251, 251, 252, 0.9);*/
+    box-shadow: 0 2px 2px 0 rgba(0,0,0,0.1), 0 2px 4px 0 rgba(0,0,0,0.1); }
   button:active, button:checked {
-    color: #ffffff;
-    border-color: rgba(0, 122, 255, 1);
-    background-color: rgba(0, 122, 255, 1);
+    color: #000000;
+    border-color: transparent;
+    background-color: transparent;
     background-clip: border-box;
     transition-duration: 50ms; }
     button:active:not(:disabled) label:disabled, button:checked:not(:disabled) label:disabled {
@@ -1099,7 +1101,7 @@ window.csd > .titlebar:not(headerbar):backdrop {
       background-color: white;
       color: #FC4138; }
 
-.primary-toolbar button, headerbar button {
+.primary-toolbar button, headerbar button, headerbar button.image-button {
   min-width: 22px;
   color: rgba(82, 93, 118, 0.8);
   outline-offset: -3px;
@@ -1107,17 +1109,24 @@ window.csd > .titlebar:not(headerbar):backdrop {
   border-color: #f0f0f0;}
   .primary-toolbar button:backdrop, headerbar button:backdrop {
     opacity: 0.7; }
-  .primary-toolbar button:hover, headerbar button:hover {
+  .primary-toolbar button:hover, headerbar button:hover, headerbar button.image-button:hover {
     color: rgba(82, 93, 118, 0.8);
     border-color: rgba(82, 93, 118, 0.1);
     background-color: #ffffff; /*rgba(251, 251, 252, 0.9);*/
     box-shadow: 0 2px 2px 0 rgba(0,0,0,0.1), 0 2px 4px 0 rgba(0,0,0,0.1); }
- .primary-toolbar button:active, headerbar button:active, .primary-toolbar button:checked, headerbar button:checked {
-   box-shadow: none;
-    color: #ffffff;
-    border-color: rgba(0, 122, 255, 1);
-    background-color: rgba(0, 122, 255, 1);
+ .primary-toolbar button:active, headerbar button:active, .primary-toolbar button:checked, headerbar button:checked, headerbar button.image-button:checked, headerbar button.image-button:active {
+   box-shadow: 0 2px 2px 0 rgba(0,0,0,0.1), 0 2px 4px 0 rgba(0,0,0,0.1);
+    color: #000000;
+    border-color: transparent;
+    background-color: transparent;
     background-clip: border-box; }
+ .primary-toolbar button:active:hover, headerbar button:active:hover, .primary-toolbar button:checked:hover, headerbar button:checked:hover { 
+color: #000000;
+    border-color: rgba(82, 93, 118, 0.1);
+    background-color: #ffffff; /*rgba(251, 251, 252, 0.9);*/
+    box-shadow: 0 2px 2px 0 rgba(0,0,0,0.1), 0 2px 4px 0 rgba(0,0,0,0.1); }
+
+
   .primary-toolbar button:disabled, headerbar button:disabled {
     background-color: rgba(231, 232, 235, 0);
     border-color: rgba(231, 232, 235, 0); }
@@ -2997,6 +3006,30 @@ headerbar button.titlebutton,
   .titlebar button.titlebutton.minimize:active {
     background-image: -gtk-scaled(url("assets/titlebutton-minimize-active.png"), url("assets/titlebutton-minimize-active@2.png")); }
 
+/*macOS11 nautilus path-bar gnome 3.30*/
+.nautilus-window .path-bar button.text-button,
+.nautilus-window .path-bar button.text-button.image-button,
+.nautilus-window .path-bar button {
+  color: #353535;
+  border-color: transparent;
+  background-color: transparent;}
+
+.nautilus-window .path-bar button.text-button:hover,
+.nautilus-window .path-bar button.text-button.image-button:hover,
+.nautilus-window .path-bar button:hover {
+color: #000000; 
+box-shadow: none;}
+
+.nautilus-window .path-bar button.text-button:checked,
+.nautilus-window .path-bar button.text-button.image-button:checked,
+.nautilus-window .path-bar button:checked {
+color: #000000;
+font-weight: bold;
+border-color: transparent;
+background-color: #ffffff;
+box-shadow: none;}
+
+
 
 /*macOS11 nautilus sidebar*/
 
diff --git a/macOS11-Shell-Dark/gnome-shell/gnome-shell.css b/macOS11-Shell-Dark/gnome-shell/gnome-shell.css
index 2c50c37..7e9d53c 100644
--- a/macOS11-Shell-Dark/gnome-shell/gnome-shell.css
+++ b/macOS11-Shell-Dark/gnome-shell/gnome-shell.css
@@ -177,6 +177,17 @@ StScrollBar StButton#vhandle:active {
   -slider-active-border-color: transparent;
   -slider-border-width: 0px;
   -slider-handle-radius: 0px;
+/* GNOME 3.30 */
+-barlevel-height: 25px;
+  -barlevel-background-color: rgba(58,50,50, 0.7);
+  -barlevel-border-color: transparent;
+  -barlevel-active-background-color: rgba(255,255,255, 0.6);
+  -barlevel-active-border-color: transparent;
+  -barlevel-overdrive-color: transparent;
+  -barlevel-overdrive-border-color: transparent;
+  -barlevel-overdrive-separator-width: 0px;
+  -barlevel-border-width: 0;
+  -slider-handle-radius: 0px;
 }
 
 
@@ -195,7 +206,7 @@ StScrollBar StButton#vhandle:active {
     box-shadow: none;
     padding:0px 0px;}
 .popup-menu .popup-menu-content {
-    padding: 0em 0em; }
+    padding: 0 0; }
 /*4.5*/
 .popup-menu .popup-menu-item {
     font-weight: normal;
@@ -204,7 +215,7 @@ StScrollBar StButton#vhandle:active {
     border-radius:10px;
     border: 0px;
     border-color: transparent;
-    padding: 0em 0em 0em 0em;
+    padding: 0 0 0 0;
     }
 .popup-menu .popup-menu-item:ltr {
 padding: 0.45em 0.75em 0.45em 0; }
@@ -759,8 +770,8 @@ StEntry:insensitive,
 #appMenu {
     spinner-image: url("resource:///org/gnome/shell/theme/process-working.svg");
   color: #ffffff;
-  padding: 0 8px 0 0px;
-  spacing: 4px;
+  padding: 2px 8px 0 0px;
+  spacing:0px;
     font-weight: 300;}
 
 /* Remove Shadows of Panel-buttons of GNOME 3.26 */
@@ -1212,8 +1223,8 @@ transition-duration:300ms;
 
 .icon-grid {/*30 136 136*/
     spacing: 30px;
-    -shell-grid-horizontal-item-size: 128px;
-    -shell-grid-vertical-item-size: 128px;
+    -shell-grid-horizontal-item-size: 140px;
+    -shell-grid-vertical-item-size: 140px;
     icon-size: 96px;
 }
 
@@ -1699,20 +1710,18 @@ color: white; }
 /* WEATHER BUTTON & WORLD CLOCK NEW 3.24*/
 
 .weather-header, .world-clocks-header {
-color: rgba(38, 50, 56, 0.8);
+color: rgba(255,255,255,0.9);
  font-weight: 300;}
 
 .weather-button, .world-clocks-button {
-color: rgba(38, 50, 56, 0.8);
-background-color: rgba(210,210,210, 0.8);
+color: rgba(255,255,255,0.9);
+background-color: rgba(101,93,93, 0.3);
 padding: 0.4em;
 border-radius: 10px;
 }
 .weather-button:hover, .weather-button:focus, .world-clocks-button:hover,.world-clocks-button:focus  {
-color: rgba(38, 50, 56, 0.8);
-background-color: rgba(220,220,220, 0.8);
-/*
-background-color: rgba(41,33,33, 0.5);*/ }
+color: rgba(255,255,255,0.9);
+background-color: rgba(101,93,93, 0.5); }
 
 
 /* Message List & Popup-menu NEW 3.24 */
diff --git a/macOS11-Shell/gnome-shell/gnome-shell.css b/macOS11-Shell/gnome-shell/gnome-shell.css
index 06650d0..676c21a 100644
--- a/macOS11-Shell/gnome-shell/gnome-shell.css
+++ b/macOS11-Shell/gnome-shell/gnome-shell.css
@@ -177,6 +177,17 @@ StScrollBar StButton#vhandle:active {
   -slider-active-border-color: transparent;
   -slider-border-width: 0px;
   -slider-handle-radius: 0px;
+/* GNOME 3.30 */
+-barlevel-height: 25px;
+  -barlevel-background-color: rgba(58,50,50, 0.7);
+  -barlevel-border-color: transparent;
+  -barlevel-active-background-color: rgba(255,255,255, 0.6);
+  -barlevel-active-border-color: transparent;
+  -barlevel-overdrive-color: transparent;
+  -barlevel-overdrive-border-color: transparent;
+  -barlevel-overdrive-separator-width: 0px;
+  -barlevel-border-width: 0;
+  -slider-handle-radius: 0px;
 }
 
 
@@ -753,8 +764,8 @@ StEntry:insensitive,
 #appMenu {
     spinner-image: url("resource:///org/gnome/shell/theme/process-working.svg");
   color: #ffffff;
-  padding: 0 8px 0 0px;
-  spacing: 4px;
+  padding: 2px 8px 0 0px;
+  spacing: 0px;
     font-weight: 300;}
 
 /* Remove Shadows of Panel-buttons of GNOME 3.26 */
@@ -813,23 +824,29 @@ StEntry:insensitive,
 .panel-button:checked #appMenuIcon,
 .panel-button:focus #appMenuIcon {
     app-icon-bottom-clip: 0px;}
-.app-menu-icon {
+ .app-menu-icon {
     width: 0px;
     height: 0px;
-    margin: 4;
+    margin: 4px;
     -st-icon-style: regular;}
 .panel-button {
     hpadding: 10px;
-/*    -natural-hpadding: 6px;
-    -minimum-hpadding: 4px;*/
     font-weight: normal;
     border-radius: 16px;
-    color: #ffffff;/*tulisan toolbar scr umum*/
+    color: #ffffff;
     background-color: rgba(123,123,126, 0.7);
-    transition-duration: 200ms;/*nonstatus*/
+    transition-duration: 150ms;
     margin: 3px 5px 5px 1px;
    }
-
+/*
+#panel .panel-button {
+  -natural-hpadding: 12px;
+  -minimum-hpadding: 6px;
+  font-weight: bold;
+  color: rgba(255, 255, 255, 0.7);
+  text-shadow: none;
+  transition-duration: 150ms;
+}*/
 
 .panel-button:hover {
     background-color: rgba(150,150,150, 0.85); /* rgba(41, 33, 33, 0.3); */
@@ -1206,8 +1223,8 @@ transition-duration:300ms;
 
 .icon-grid {/*30 136 136*/
     spacing: 30px;
-    -shell-grid-horizontal-item-size: 128px;
-    -shell-grid-vertical-item-size: 128px;
+    -shell-grid-horizontal-item-size: 140px;
+    -shell-grid-vertical-item-size: 140px;
     icon-size: 96px;
 }