diff --git a/share/themes/Kali-Dark/gtk-3.0/gtk.css b/share/themes/Kali-Dark/gtk-3.0/gtk.css
index a14ce912..7991c198 100644
--- a/share/themes/Kali-Dark/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Dark/gtk-3.0/gtk.css
@@ -5727,3 +5727,555 @@ read if you used those and something break with a version upgrade you're on your
 @define-color content_view_bg #272a34;
 /* Very contrasty background for text views (@theme_text_color foreground) */
 @define-color text_view_bg #1a1c23;
+.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;
+}
+.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/applications/gedit/Adwaita.css b/share/themes/Kali-Light/gtk-3.0/applications/gedit/Adwaita.css
deleted file mode 100644
index 784e72aa..00000000
--- a/share/themes/Kali-Light/gtk-3.0/applications/gedit/Adwaita.css
+++ /dev/null
@@ -1,61 +0,0 @@
-.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;
-}
diff --git a/share/themes/Kali-Light/gtk-3.0/applications/nautilus/Adwaita.css b/share/themes/Kali-Light/gtk-3.0/applications/nautilus/Adwaita.css
deleted file mode 100644
index 546d3e98..00000000
--- a/share/themes/Kali-Light/gtk-3.0/applications/nautilus/Adwaita.css
+++ /dev/null
@@ -1,215 +0,0 @@
-.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 a14ce912..7991c198 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk-dark.css
@@ -5727,3 +5727,555 @@ read if you used those and something break with a version upgrade you're on your
 @define-color content_view_bg #272a34;
 /* Very contrasty background for text views (@theme_text_color foreground) */
 @define-color text_view_bg #1a1c23;
+.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;
+}
+.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 ceedc784..54263551 100644
--- a/share/themes/Kali-Light/gtk-3.0/gtk.css
+++ b/share/themes/Kali-Light/gtk-3.0/gtk.css
@@ -5748,3 +5748,555 @@ read if you used those and something break with a version upgrade you're on your
 @define-color content_view_bg #fafafa;
 /* Very contrasty background for text views (@theme_text_color foreground) */
 @define-color text_view_bg #fafafa;
+.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;
+}
+.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/Makefile b/src/themes/Kali/sass/Makefile
index 388ca81c..28356bc7 100644
--- a/src/themes/Kali/sass/Makefile
+++ b/src/themes/Kali/sass/Makefile
@@ -1,4 +1,4 @@
-include ../../../Makefile.inc
+include ../../Makefile.inc
 
 THEMES_DIR=../../../../share/themes/
 
@@ -10,13 +10,8 @@ build: $(patsubst %.scss, %.css, $(wildcard *.scss))
 	mkdir -p $(THEMES_DIR)Kali-Light/gnome-shell
 	mkdir -p $(THEMES_DIR)Kali-Dark/gnome-shell
 	
-	cp -r gtk-sass/applications/* $(THEMES_DIR)Kali-Light/gtk-3.0/applications
-	cp -r gtk-sass/applications/* $(THEMES_DIR)Kali-Dark/gtk-3.0/applications
-	
-	find $(THEMES_DIR)Kali-*/gtk-3.0/applications \
-			! \( -type d -or -name "*.css" -or -name "*.scss" \) \
-			-exec rm {} \;
-	
+	cat $(wildcard gtk-applications-css/**/*.css) >> gtk.css
+	cat $(wildcard gtk-applications-css/**/*.css) >> gtk-dark.css
 	cp gtk.css $(THEMES_DIR)Kali-Light/gtk-3.0/gtk.css
 	cp gtk-dark.css $(THEMES_DIR)Kali-Light/gtk-3.0/gtk-dark.css
 	cp gtk-dark.css $(THEMES_DIR)Kali-Dark/gtk-3.0/gtk.css
diff --git a/share/themes/Kali-Dark/gtk-3.0/applications/gedit/Adwaita.css b/src/themes/Kali/sass/gtk-applications-css/gedit/Adwaita.css
similarity index 100%
rename from share/themes/Kali-Dark/gtk-3.0/applications/gedit/Adwaita.css
rename to src/themes/Kali/sass/gtk-applications-css/gedit/Adwaita.css
diff --git a/src/themes/Kali/sass/gtk-sass/applications/gedit/sync.sh b/src/themes/Kali/sass/gtk-applications-css/gedit/sync.sh
similarity index 100%
rename from src/themes/Kali/sass/gtk-sass/applications/gedit/sync.sh
rename to src/themes/Kali/sass/gtk-applications-css/gedit/sync.sh
diff --git a/share/themes/Kali-Dark/gtk-3.0/applications/nautilus/Adwaita.css b/src/themes/Kali/sass/gtk-applications-css/nautilus/Adwaita.css
similarity index 100%
rename from share/themes/Kali-Dark/gtk-3.0/applications/nautilus/Adwaita.css
rename to src/themes/Kali/sass/gtk-applications-css/nautilus/Adwaita.css
diff --git a/src/themes/Kali/sass/gtk-sass/applications/nautilus/sync.sh b/src/themes/Kali/sass/gtk-applications-css/nautilus/sync.sh
similarity index 100%
rename from src/themes/Kali/sass/gtk-sass/applications/nautilus/sync.sh
rename to src/themes/Kali/sass/gtk-applications-css/nautilus/sync.sh
diff --git a/src/themes/Kali/sass/gtk-sass/applications/gedit/Adwaita.css b/src/themes/Kali/sass/gtk-sass/applications/gedit/Adwaita.css
deleted file mode 100644
index 784e72aa..00000000
--- a/src/themes/Kali/sass/gtk-sass/applications/gedit/Adwaita.css
+++ /dev/null
@@ -1,61 +0,0 @@
-.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;
-}
diff --git a/src/themes/Kali/sass/gtk-sass/applications/nautilus/Adwaita.css b/src/themes/Kali/sass/gtk-sass/applications/nautilus/Adwaita.css
deleted file mode 100644
index 546d3e98..00000000
--- a/src/themes/Kali/sass/gtk-sass/applications/nautilus/Adwaita.css
+++ /dev/null
@@ -1,215 +0,0 @@
-.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;
-}