diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index 1ba01874..336ef112 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -5575,16 +5575,36 @@ filechooser placessidebar.sidebar,
   border: 2px solid #2777ff;
   box-shadow: none; }
 
-#whiskermenu-window .frame {
-  border: 0; }
+#whiskermenu-window button {
+  transition-duration: 0s; }
+  #whiskermenu-window button:hover {
+    color: white;
+    border-color: black;
+    background-color: transparent;
+    background-image: image(#303340);
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+    text-shadow: 0 1px black;
+    -gtk-icon-shadow: 0 1px black;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: transparent;
+    border-bottom-color: #1c1e25; }
+  #whiskermenu-window button:checked {
+    border-color: transparent; }
 
-#whiskermenu-window scrolledwindow treeview {
-  padding: 0 5px;
-  background: #23252e;
-  border-left: 1px solid #0d0e11; }
-  #whiskermenu-window scrolledwindow treeview:hover, #whiskermenu-window scrolledwindow treeview:active, #whiskermenu-window scrolledwindow treeview:selected {
-    background-color: rgba(0, 0, 0, 0.27);
-    color: inherit; }
+#whiskermenu-window scrolledwindow.frame {
+  border: 0;
+  border-radius: 8px;
+  box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.3);
+  background: #1c1e25;
+  padding: 7px 10px;
+  margin: 0 5px; }
+  #whiskermenu-window scrolledwindow.frame treeview {
+    background: transparent;
+    border-radius: 5px; }
+    #whiskermenu-window scrolledwindow.frame treeview:hover, #whiskermenu-window scrolledwindow.frame treeview:active, #whiskermenu-window scrolledwindow.frame treeview:selected {
+      background-color: rgba(0, 0, 0, 0.27);
+      color: inherit; }
 
 /* XFCE4 panel action buttons */
 #XfcePanelWindowWrapper > widget > box > #xfce-panel-button > image {
@@ -6000,279 +6020,3 @@ flowboxchild:selected > .icon-item-background {
   border-width:0px;
   border-radius:4px 4px 4px 4px;
 }
-.gedit-document-panel {
-    background-color: @sidebar_bg;
-}
-
-.gedit-document-panel:backdrop {
-    color: #b0b2b2;
-}
-
-.gedit-document-panel row:selected:backdrop {
-    background-color: #8b8e8f;
-}
-
-.gedit-document-panel-group-row,
-.gedit-document-panel-group-row:hover {
-    border-top: 1px solid alpha(currentColor, 0.3);
-}
-
-.gedit-document-panel-group-row:first-child,
-.gedit-document-panel-group-row:first-child:hover {
-    border-top: 0px;
-}
-
-/* Try to look as the notebook tab close button */
-.gedit-document-panel row button.flat {
-    padding: 0;
-    margin-top: 8px;
-    margin-bottom: 8px;
-    min-width: 18px;
-    min-height: 18px;
-    color: alpha(currentColor,0.3);
-}
-
-.gedit-document-panel row:hover button.flat {
-    color: alpha(currentColor,0.5);
-}
-
-.gedit-document-panel row button.flat:hover {
-    color: @theme_fg_color;
-}
-
-statusbar {
-    border-top: 1px solid @borders;
-}
-
-.gedit-search-slider {
-    background-color: @theme_base_color;
-    padding: 6px;
-    border-color: @borders;
-    border-radius: 0 0 3px 3px;
-    border-width: 0 1px 1px 1px;
-    border-style: solid;
-}
-
-.gedit-search-entry-occurrences-tag {
-    background-color: @theme_base_color;
-    background-image: none;
-    color: shade (@theme_unfocused_fg_color, 0.8);
-    border: 0px;
-    margin: 2px;
-    padding: 2px;
-}
-.nautilus-window,
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-    background: @theme_base_color;
-}
-
-.nautilus-canvas-item {
-    border-radius: 5px;
-}
-
-.nautilus-canvas-item.dim-label,
-.nautilus-list-dim-label {
-    color: mix (@theme_fg_color, @theme_bg_color, 0.50);
-}
-
-.nautilus-canvas-item.dim-label:selected,
-.nautilus-list-dim-label:selected {
-    color: mix (@theme_selected_fg_color, @theme_selected_bg_color, 0.20);
-}
-
-/* Toolbar */
-
-/* Here we use the .button background-image colors from Adwaita, but ligthen them,
- * since is not possible to use lighten () in common css. */
-@keyframes needs_attention_keyframes {
-    0% {background-image: linear-gradient(to bottom, #fafafa, #ededed 40%,  #e0e0e0); border-color: @borders; }
-    /* can't do animation-direction, so holding the color on two keyframes */
-    30% {background-image: linear-gradient(to bottom, @theme_base_color, @theme_base_color, @theme_base_color); border-color: @theme_fg_color; }
-    90% {background-image: linear-gradient(to bottom, @theme_base_color, @theme_base_color, @theme_base_color); border-color: @theme_fg_color; }
-    100% {background-image: linear-gradient(to bottom, #fafafa, #ededed 40%,  #e0e0e0); border-color: @borders; }
-}
-
-.nautilus-operations-button-needs-attention {
-  animation: needs_attention_keyframes 2s ease-in-out;
-}
-.nautilus-operations-button-needs-attention-multiple {
-  animation: needs_attention_keyframes 3s ease-in-out;
-  animation-iteration-count: 3;
-}
-
-.disclosure-button {
-  padding-left: 4px;
-  padding-right: 4px;
-}
-
-/* Path bar */
-
-.path-bar-box {
-  border-radius: 5px;
-  border: 1px @borders solid;
-  background-color: @theme_bg_color;
-  padding-right: 6px;
-}
-
-.nautilus-path-bar button {
-  margin: 0px;
-}
-
-.nautilus-path-bar button:first-child {
-  border-width: 0px 1px 0px 0px;
-  border-radius: 3.5px 0px 0px 3.5px;
-}
-
-.nautilus-path-bar button:not(:first-child) {
-  border-width: 0px 1px 0px 1px;
-  border-radius: 0px 0px 0px 0px;
-}
-
-.nautilus-path-bar button:not(:checked) image { opacity: 0.8; } /* dim the icon when not checked */
-
-/* Make the tags fit into the box */
-entry.search > * {
-  margin: 5px;
-}
-
-/* Sidebar */
-
-.nautilus-window .sidebar-row:selected {
-    background: mix(@theme_bg_color, @theme_fg_color, 0.07);
-}
-
-.nautilus-window .sidebar-row:selected,
-.nautilus-window .sidebar-row:selected image,
-.nautilus-window .sidebar-row:selected label {
-    color: mix(@theme_fg_color, @theme_text_color, 0.5);
-}
-
-.nautilus-window .sidebar-row:selected:backdrop {
-    background: mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.07);
-}
-
-.nautilus-window .sidebar-row:selected:backdrop,
-.nautilus-window .sidebar-row:selected:backdrop label {
-    color: mix(@theme_unfocused_fg_color, @theme_unfocused_text_color, 0.15);
-}
-
-/* Floating status bar */
-.floating-bar {
-  padding: 1px;
-  background-color: @theme_base_color;
-  border-width: 1px;
-  border-style: solid solid none;
-  border-color: @borders;
-  border-radius: 3px 3px 0 0;
-}
-
-.floating-bar.bottom.left { /* axes left border and border radius */
-  border-left-style: none;
-  border-top-left-radius: 0;
-}
-.floating-bar.bottom.right { /* axes right border and border radius */
-  border-right-style: none;
-  border-top-right-radius: 0;
-}
-
-.floating-bar:backdrop {
-  background-color: @theme_unfocused_base_color;
-  border-color: @unfocused_borders;
-}
-
-.floating-bar button {
-  padding: 0px;
-}
-
-@define-color disk_space_unknown #888a85;
-@define-color disk_space_used #729fcf;
-@define-color disk_space_free #eeeeec;
-
-.disk-space-display {
-    border-style: solid;
-    border-width: 2px;
-}
-
-.disk-space-display.unknown {
-    background-color: @disk_space_unknown;
-    border-color: shade(@disk_space_unknown, 0.7);
-    color: @disk_space_unknown;
-}
-.disk-space-display.unknown.border {
-    color: shade(@disk_space_unknown, 0.7);
-}
-
-.disk-space-display.used {
-    background-color: @disk_space_used;
-    border-color: shade(@disk_space_used, 0.7);
-    color: @disk_space_used;
-}
-.disk-space-display.used.border {
-    color: shade(@disk_space_used, 0.7);
-}
-
-.disk-space-display.free {
-    background-color: @disk_space_free;
-    border-color: shade(@disk_space_free, 0.7);
-    color: @disk_space_free;
-}
-.disk-space-display.free.border {
-    color: shade(@disk_space_free, 0.7);
-}
-
-/* View */
-.nautilus-list-view .view {
-    border-bottom: 1px solid @theme_bg_color;
-}
-
-.search-information {
-  background-color: @theme_selected_bg_color;
-  color:white;
-  padding:2px;
-}
-
-/* Hide superfluous treeview drop target indication */
-.nautilus-list-view .view.dnd {
-    border-style: none;
-}
-
-@define-color conflict_bg #fef6b6;
-
-.conflict-row {
-    background: @conflict_bg;
-    color: black;
-}
-
-.conflict-row:hover {
-    background-color: shade(@conflict_bg, 0.9);
-}
-
-.conflict-row:selected {
-  background: @theme_selected_bg_color;
-  color: @theme_selected_fg_color;
-}
-
-/* Icon view */
-flowboxchild:selected {
-  background-color:transparent;
-}
-
-.icon-background {
-  background-color:black;
-  border-color:#4a90d9;
-  border-style:solid;
-  border-width:0px;
-}
-
-flowboxchild > .icon-item-background {
-  padding:4px;
-}
-flowboxchild:selected > .icon-item-background {
-  padding:4px;
-  background-color:#4a90d9;
-  border-color:#4a90d9;
-  border-style:solid;
-  border-width:0px;
-  border-radius:4px 4px 4px 4px;
-}
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
index 1ba01874..336ef112 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -5575,16 +5575,36 @@ filechooser placessidebar.sidebar,
   border: 2px solid #2777ff;
   box-shadow: none; }
 
-#whiskermenu-window .frame {
-  border: 0; }
+#whiskermenu-window button {
+  transition-duration: 0s; }
+  #whiskermenu-window button:hover {
+    color: white;
+    border-color: black;
+    background-color: transparent;
+    background-image: image(#303340);
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+    text-shadow: 0 1px black;
+    -gtk-icon-shadow: 0 1px black;
+    outline-color: rgba(255, 255, 255, 0.3);
+    border-color: transparent;
+    border-bottom-color: #1c1e25; }
+  #whiskermenu-window button:checked {
+    border-color: transparent; }
 
-#whiskermenu-window scrolledwindow treeview {
-  padding: 0 5px;
-  background: #23252e;
-  border-left: 1px solid #0d0e11; }
-  #whiskermenu-window scrolledwindow treeview:hover, #whiskermenu-window scrolledwindow treeview:active, #whiskermenu-window scrolledwindow treeview:selected {
-    background-color: rgba(0, 0, 0, 0.27);
-    color: inherit; }
+#whiskermenu-window scrolledwindow.frame {
+  border: 0;
+  border-radius: 8px;
+  box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.3);
+  background: #1c1e25;
+  padding: 7px 10px;
+  margin: 0 5px; }
+  #whiskermenu-window scrolledwindow.frame treeview {
+    background: transparent;
+    border-radius: 5px; }
+    #whiskermenu-window scrolledwindow.frame treeview:hover, #whiskermenu-window scrolledwindow.frame treeview:active, #whiskermenu-window scrolledwindow.frame treeview:selected {
+      background-color: rgba(0, 0, 0, 0.27);
+      color: inherit; }
 
 /* XFCE4 panel action buttons */
 #XfcePanelWindowWrapper > widget > box > #xfce-panel-button > image {
@@ -6000,279 +6020,3 @@ flowboxchild:selected > .icon-item-background {
   border-width:0px;
   border-radius:4px 4px 4px 4px;
 }
-.gedit-document-panel {
-    background-color: @sidebar_bg;
-}
-
-.gedit-document-panel:backdrop {
-    color: #b0b2b2;
-}
-
-.gedit-document-panel row:selected:backdrop {
-    background-color: #8b8e8f;
-}
-
-.gedit-document-panel-group-row,
-.gedit-document-panel-group-row:hover {
-    border-top: 1px solid alpha(currentColor, 0.3);
-}
-
-.gedit-document-panel-group-row:first-child,
-.gedit-document-panel-group-row:first-child:hover {
-    border-top: 0px;
-}
-
-/* Try to look as the notebook tab close button */
-.gedit-document-panel row button.flat {
-    padding: 0;
-    margin-top: 8px;
-    margin-bottom: 8px;
-    min-width: 18px;
-    min-height: 18px;
-    color: alpha(currentColor,0.3);
-}
-
-.gedit-document-panel row:hover button.flat {
-    color: alpha(currentColor,0.5);
-}
-
-.gedit-document-panel row button.flat:hover {
-    color: @theme_fg_color;
-}
-
-statusbar {
-    border-top: 1px solid @borders;
-}
-
-.gedit-search-slider {
-    background-color: @theme_base_color;
-    padding: 6px;
-    border-color: @borders;
-    border-radius: 0 0 3px 3px;
-    border-width: 0 1px 1px 1px;
-    border-style: solid;
-}
-
-.gedit-search-entry-occurrences-tag {
-    background-color: @theme_base_color;
-    background-image: none;
-    color: shade (@theme_unfocused_fg_color, 0.8);
-    border: 0px;
-    margin: 2px;
-    padding: 2px;
-}
-.nautilus-window,
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-    background: @theme_base_color;
-}
-
-.nautilus-canvas-item {
-    border-radius: 5px;
-}
-
-.nautilus-canvas-item.dim-label,
-.nautilus-list-dim-label {
-    color: mix (@theme_fg_color, @theme_bg_color, 0.50);
-}
-
-.nautilus-canvas-item.dim-label:selected,
-.nautilus-list-dim-label:selected {
-    color: mix (@theme_selected_fg_color, @theme_selected_bg_color, 0.20);
-}
-
-/* Toolbar */
-
-/* Here we use the .button background-image colors from Adwaita, but ligthen them,
- * since is not possible to use lighten () in common css. */
-@keyframes needs_attention_keyframes {
-    0% {background-image: linear-gradient(to bottom, #fafafa, #ededed 40%,  #e0e0e0); border-color: @borders; }
-    /* can't do animation-direction, so holding the color on two keyframes */
-    30% {background-image: linear-gradient(to bottom, @theme_base_color, @theme_base_color, @theme_base_color); border-color: @theme_fg_color; }
-    90% {background-image: linear-gradient(to bottom, @theme_base_color, @theme_base_color, @theme_base_color); border-color: @theme_fg_color; }
-    100% {background-image: linear-gradient(to bottom, #fafafa, #ededed 40%,  #e0e0e0); border-color: @borders; }
-}
-
-.nautilus-operations-button-needs-attention {
-  animation: needs_attention_keyframes 2s ease-in-out;
-}
-.nautilus-operations-button-needs-attention-multiple {
-  animation: needs_attention_keyframes 3s ease-in-out;
-  animation-iteration-count: 3;
-}
-
-.disclosure-button {
-  padding-left: 4px;
-  padding-right: 4px;
-}
-
-/* Path bar */
-
-.path-bar-box {
-  border-radius: 5px;
-  border: 1px @borders solid;
-  background-color: @theme_bg_color;
-  padding-right: 6px;
-}
-
-.nautilus-path-bar button {
-  margin: 0px;
-}
-
-.nautilus-path-bar button:first-child {
-  border-width: 0px 1px 0px 0px;
-  border-radius: 3.5px 0px 0px 3.5px;
-}
-
-.nautilus-path-bar button:not(:first-child) {
-  border-width: 0px 1px 0px 1px;
-  border-radius: 0px 0px 0px 0px;
-}
-
-.nautilus-path-bar button:not(:checked) image { opacity: 0.8; } /* dim the icon when not checked */
-
-/* Make the tags fit into the box */
-entry.search > * {
-  margin: 5px;
-}
-
-/* Sidebar */
-
-.nautilus-window .sidebar-row:selected {
-    background: mix(@theme_bg_color, @theme_fg_color, 0.07);
-}
-
-.nautilus-window .sidebar-row:selected,
-.nautilus-window .sidebar-row:selected image,
-.nautilus-window .sidebar-row:selected label {
-    color: mix(@theme_fg_color, @theme_text_color, 0.5);
-}
-
-.nautilus-window .sidebar-row:selected:backdrop {
-    background: mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.07);
-}
-
-.nautilus-window .sidebar-row:selected:backdrop,
-.nautilus-window .sidebar-row:selected:backdrop label {
-    color: mix(@theme_unfocused_fg_color, @theme_unfocused_text_color, 0.15);
-}
-
-/* Floating status bar */
-.floating-bar {
-  padding: 1px;
-  background-color: @theme_base_color;
-  border-width: 1px;
-  border-style: solid solid none;
-  border-color: @borders;
-  border-radius: 3px 3px 0 0;
-}
-
-.floating-bar.bottom.left { /* axes left border and border radius */
-  border-left-style: none;
-  border-top-left-radius: 0;
-}
-.floating-bar.bottom.right { /* axes right border and border radius */
-  border-right-style: none;
-  border-top-right-radius: 0;
-}
-
-.floating-bar:backdrop {
-  background-color: @theme_unfocused_base_color;
-  border-color: @unfocused_borders;
-}
-
-.floating-bar button {
-  padding: 0px;
-}
-
-@define-color disk_space_unknown #888a85;
-@define-color disk_space_used #729fcf;
-@define-color disk_space_free #eeeeec;
-
-.disk-space-display {
-    border-style: solid;
-    border-width: 2px;
-}
-
-.disk-space-display.unknown {
-    background-color: @disk_space_unknown;
-    border-color: shade(@disk_space_unknown, 0.7);
-    color: @disk_space_unknown;
-}
-.disk-space-display.unknown.border {
-    color: shade(@disk_space_unknown, 0.7);
-}
-
-.disk-space-display.used {
-    background-color: @disk_space_used;
-    border-color: shade(@disk_space_used, 0.7);
-    color: @disk_space_used;
-}
-.disk-space-display.used.border {
-    color: shade(@disk_space_used, 0.7);
-}
-
-.disk-space-display.free {
-    background-color: @disk_space_free;
-    border-color: shade(@disk_space_free, 0.7);
-    color: @disk_space_free;
-}
-.disk-space-display.free.border {
-    color: shade(@disk_space_free, 0.7);
-}
-
-/* View */
-.nautilus-list-view .view {
-    border-bottom: 1px solid @theme_bg_color;
-}
-
-.search-information {
-  background-color: @theme_selected_bg_color;
-  color:white;
-  padding:2px;
-}
-
-/* Hide superfluous treeview drop target indication */
-.nautilus-list-view .view.dnd {
-    border-style: none;
-}
-
-@define-color conflict_bg #fef6b6;
-
-.conflict-row {
-    background: @conflict_bg;
-    color: black;
-}
-
-.conflict-row:hover {
-    background-color: shade(@conflict_bg, 0.9);
-}
-
-.conflict-row:selected {
-  background: @theme_selected_bg_color;
-  color: @theme_selected_fg_color;
-}
-
-/* Icon view */
-flowboxchild:selected {
-  background-color:transparent;
-}
-
-.icon-background {
-  background-color:black;
-  border-color:#4a90d9;
-  border-style:solid;
-  border-width:0px;
-}
-
-flowboxchild > .icon-item-background {
-  padding:4px;
-}
-flowboxchild:selected > .icon-item-background {
-  padding:4px;
-  background-color:#4a90d9;
-  border-color:#4a90d9;
-  border-style:solid;
-  border-width:0px;
-  border-radius:4px 4px 4px 4px;
-}
diff --git a/share/themes/Kali-Light/gtk-3.0/gtk.css b/share/themes/Kali-Light/gtk-3.0/gtk.css
index 14c968be..7eaa5f3a 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -5596,16 +5596,24 @@ filechooser placessidebar.sidebar,
   border: 2px solid #2777ff;
   box-shadow: none; }
 
-#whiskermenu-window .frame {
-  border: 0; }
+#whiskermenu-window button {
+  transition-duration: 0s; }
+  #whiskermenu-window button:checked {
+    border-color: transparent; }
 
-#whiskermenu-window scrolledwindow treeview {
-  padding: 0 5px;
+#whiskermenu-window scrolledwindow.frame {
+  border: 0;
+  border-radius: 8px;
+  box-shadow: inset 0 0 10px rgba(0, 0, 0, 0.1);
   background: #ffffff;
-  border-left: 1px solid #d9d9d9; }
-  #whiskermenu-window scrolledwindow treeview:hover, #whiskermenu-window scrolledwindow treeview:active, #whiskermenu-window scrolledwindow treeview:selected {
-    background-color: rgba(0, 0, 0, 0.07);
-    color: inherit; }
+  padding: 7px 10px;
+  margin: 0 5px; }
+  #whiskermenu-window scrolledwindow.frame treeview {
+    background: transparent;
+    border-radius: 5px; }
+    #whiskermenu-window scrolledwindow.frame treeview:hover, #whiskermenu-window scrolledwindow.frame treeview:active, #whiskermenu-window scrolledwindow.frame treeview:selected {
+      background-color: rgba(0, 0, 0, 0.07);
+      color: inherit; }
 
 /* XFCE4 panel action buttons */
 #XfcePanelWindowWrapper > widget > box > #xfce-panel-button > image {
@@ -6021,279 +6029,3 @@ flowboxchild:selected > .icon-item-background {
   border-width:0px;
   border-radius:4px 4px 4px 4px;
 }
-.gedit-document-panel {
-    background-color: @sidebar_bg;
-}
-
-.gedit-document-panel:backdrop {
-    color: #b0b2b2;
-}
-
-.gedit-document-panel row:selected:backdrop {
-    background-color: #8b8e8f;
-}
-
-.gedit-document-panel-group-row,
-.gedit-document-panel-group-row:hover {
-    border-top: 1px solid alpha(currentColor, 0.3);
-}
-
-.gedit-document-panel-group-row:first-child,
-.gedit-document-panel-group-row:first-child:hover {
-    border-top: 0px;
-}
-
-/* Try to look as the notebook tab close button */
-.gedit-document-panel row button.flat {
-    padding: 0;
-    margin-top: 8px;
-    margin-bottom: 8px;
-    min-width: 18px;
-    min-height: 18px;
-    color: alpha(currentColor,0.3);
-}
-
-.gedit-document-panel row:hover button.flat {
-    color: alpha(currentColor,0.5);
-}
-
-.gedit-document-panel row button.flat:hover {
-    color: @theme_fg_color;
-}
-
-statusbar {
-    border-top: 1px solid @borders;
-}
-
-.gedit-search-slider {
-    background-color: @theme_base_color;
-    padding: 6px;
-    border-color: @borders;
-    border-radius: 0 0 3px 3px;
-    border-width: 0 1px 1px 1px;
-    border-style: solid;
-}
-
-.gedit-search-entry-occurrences-tag {
-    background-color: @theme_base_color;
-    background-image: none;
-    color: shade (@theme_unfocused_fg_color, 0.8);
-    border: 0px;
-    margin: 2px;
-    padding: 2px;
-}
-.nautilus-window,
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-    background: @theme_base_color;
-}
-
-.nautilus-canvas-item {
-    border-radius: 5px;
-}
-
-.nautilus-canvas-item.dim-label,
-.nautilus-list-dim-label {
-    color: mix (@theme_fg_color, @theme_bg_color, 0.50);
-}
-
-.nautilus-canvas-item.dim-label:selected,
-.nautilus-list-dim-label:selected {
-    color: mix (@theme_selected_fg_color, @theme_selected_bg_color, 0.20);
-}
-
-/* Toolbar */
-
-/* Here we use the .button background-image colors from Adwaita, but ligthen them,
- * since is not possible to use lighten () in common css. */
-@keyframes needs_attention_keyframes {
-    0% {background-image: linear-gradient(to bottom, #fafafa, #ededed 40%,  #e0e0e0); border-color: @borders; }
-    /* can't do animation-direction, so holding the color on two keyframes */
-    30% {background-image: linear-gradient(to bottom, @theme_base_color, @theme_base_color, @theme_base_color); border-color: @theme_fg_color; }
-    90% {background-image: linear-gradient(to bottom, @theme_base_color, @theme_base_color, @theme_base_color); border-color: @theme_fg_color; }
-    100% {background-image: linear-gradient(to bottom, #fafafa, #ededed 40%,  #e0e0e0); border-color: @borders; }
-}
-
-.nautilus-operations-button-needs-attention {
-  animation: needs_attention_keyframes 2s ease-in-out;
-}
-.nautilus-operations-button-needs-attention-multiple {
-  animation: needs_attention_keyframes 3s ease-in-out;
-  animation-iteration-count: 3;
-}
-
-.disclosure-button {
-  padding-left: 4px;
-  padding-right: 4px;
-}
-
-/* Path bar */
-
-.path-bar-box {
-  border-radius: 5px;
-  border: 1px @borders solid;
-  background-color: @theme_bg_color;
-  padding-right: 6px;
-}
-
-.nautilus-path-bar button {
-  margin: 0px;
-}
-
-.nautilus-path-bar button:first-child {
-  border-width: 0px 1px 0px 0px;
-  border-radius: 3.5px 0px 0px 3.5px;
-}
-
-.nautilus-path-bar button:not(:first-child) {
-  border-width: 0px 1px 0px 1px;
-  border-radius: 0px 0px 0px 0px;
-}
-
-.nautilus-path-bar button:not(:checked) image { opacity: 0.8; } /* dim the icon when not checked */
-
-/* Make the tags fit into the box */
-entry.search > * {
-  margin: 5px;
-}
-
-/* Sidebar */
-
-.nautilus-window .sidebar-row:selected {
-    background: mix(@theme_bg_color, @theme_fg_color, 0.07);
-}
-
-.nautilus-window .sidebar-row:selected,
-.nautilus-window .sidebar-row:selected image,
-.nautilus-window .sidebar-row:selected label {
-    color: mix(@theme_fg_color, @theme_text_color, 0.5);
-}
-
-.nautilus-window .sidebar-row:selected:backdrop {
-    background: mix(@theme_unfocused_bg_color, @theme_unfocused_fg_color, 0.07);
-}
-
-.nautilus-window .sidebar-row:selected:backdrop,
-.nautilus-window .sidebar-row:selected:backdrop label {
-    color: mix(@theme_unfocused_fg_color, @theme_unfocused_text_color, 0.15);
-}
-
-/* Floating status bar */
-.floating-bar {
-  padding: 1px;
-  background-color: @theme_base_color;
-  border-width: 1px;
-  border-style: solid solid none;
-  border-color: @borders;
-  border-radius: 3px 3px 0 0;
-}
-
-.floating-bar.bottom.left { /* axes left border and border radius */
-  border-left-style: none;
-  border-top-left-radius: 0;
-}
-.floating-bar.bottom.right { /* axes right border and border radius */
-  border-right-style: none;
-  border-top-right-radius: 0;
-}
-
-.floating-bar:backdrop {
-  background-color: @theme_unfocused_base_color;
-  border-color: @unfocused_borders;
-}
-
-.floating-bar button {
-  padding: 0px;
-}
-
-@define-color disk_space_unknown #888a85;
-@define-color disk_space_used #729fcf;
-@define-color disk_space_free #eeeeec;
-
-.disk-space-display {
-    border-style: solid;
-    border-width: 2px;
-}
-
-.disk-space-display.unknown {
-    background-color: @disk_space_unknown;
-    border-color: shade(@disk_space_unknown, 0.7);
-    color: @disk_space_unknown;
-}
-.disk-space-display.unknown.border {
-    color: shade(@disk_space_unknown, 0.7);
-}
-
-.disk-space-display.used {
-    background-color: @disk_space_used;
-    border-color: shade(@disk_space_used, 0.7);
-    color: @disk_space_used;
-}
-.disk-space-display.used.border {
-    color: shade(@disk_space_used, 0.7);
-}
-
-.disk-space-display.free {
-    background-color: @disk_space_free;
-    border-color: shade(@disk_space_free, 0.7);
-    color: @disk_space_free;
-}
-.disk-space-display.free.border {
-    color: shade(@disk_space_free, 0.7);
-}
-
-/* View */
-.nautilus-list-view .view {
-    border-bottom: 1px solid @theme_bg_color;
-}
-
-.search-information {
-  background-color: @theme_selected_bg_color;
-  color:white;
-  padding:2px;
-}
-
-/* Hide superfluous treeview drop target indication */
-.nautilus-list-view .view.dnd {
-    border-style: none;
-}
-
-@define-color conflict_bg #fef6b6;
-
-.conflict-row {
-    background: @conflict_bg;
-    color: black;
-}
-
-.conflict-row:hover {
-    background-color: shade(@conflict_bg, 0.9);
-}
-
-.conflict-row:selected {
-  background: @theme_selected_bg_color;
-  color: @theme_selected_fg_color;
-}
-
-/* Icon view */
-flowboxchild:selected {
-  background-color:transparent;
-}
-
-.icon-background {
-  background-color:black;
-  border-color:#4a90d9;
-  border-style:solid;
-  border-width:0px;
-}
-
-flowboxchild > .icon-item-background {
-  padding:4px;
-}
-flowboxchild:selected > .icon-item-background {
-  padding:4px;
-  background-color:#4a90d9;
-  border-color:#4a90d9;
-  border-style:solid;
-  border-width:0px;
-  border-radius:4px 4px 4px 4px;
-}
diff --git a/src/themes/Kali/sass/gtk-sass/_applications.scss b/src/themes/Kali/sass/gtk-sass/_applications.scss
index f1aab855..3cd669b2 100644
--- a/src/themes/Kali/sass/gtk-sass/_applications.scss
+++ b/src/themes/Kali/sass/gtk-sass/_applications.scss
@@ -111,22 +111,41 @@ filechooser,
 
 /* Whisker menu */
 #whiskermenu-window {
+  $_dark_bg: if($variant == 'light', $bg_color, darken($bg_color, 3%));
   entry {
     border-radius: 100px;
     border: 2px solid $selected_bg_color;
     box-shadow: none;
   }
 
-  .frame { border: 0; }
+  button {
+    transition-duration: 0s;
+    @if $variant == 'dark' {
+      &:hover {
+        @include button(osd);
+        border-color: transparent;
+        border-bottom-color: $_dark_bg;
+      }
+    }
+    &:checked { border-color: transparent; }
+  }
 
-  scrolledwindow  treeview {
-    padding: 0 5px;
-    background: $bg_color;
-    border-left: 1px solid $borders_color;
+  scrolledwindow.frame {
+    border: 0;
+    border-radius: 8px;
+    box-shadow: inset 0 0 10px $shadow_color;
+    background: $_dark_bg;
+    padding: 7px 10px;
+    margin: 0 5px;
 
-    &:hover, &:active, &:selected {
-      background-color: transparentize($shadow_color, 0.03);
-      color: inherit;
+    treeview {
+      background: transparent;
+      border-radius: $button_radius;
+
+      &:hover, &:active, &:selected {
+        background-color: transparentize($shadow_color, 0.03);
+        color: inherit;
+      }
     }
   }
 }