diff --git a/gtk-3.0/scss/apps/_gedit.scss b/gtk-3.0/scss/apps/_gedit.scss
new file mode 100644
index 0000000..86ec7a5
--- /dev/null
+++ b/gtk-3.0/scss/apps/_gedit.scss
@@ -0,0 +1,132 @@
+/*********
+ ! Gedit *
+**********/
+
+@include exports("gedit") {
+    GeditWindow .pane-separator {
+        border-width: 0 1px 0 0;
+        border-style: solid;
+
+        &, &:hover {
+            border-color: shade($bg_color, ($contrast + .1));
+            background-color: $bg_color;
+        }
+    }
+
+    .gedit-document-panel {
+        background-color: $bg_color;
+        color: mix($fg_color, $bg_color, 0.1);
+
+        .list-row {
+            padding: $spacing;
+
+            .button {
+                padding: 1px;
+                border-radius: $roundness;
+                border-style: solid;
+                border-color: transparent;
+                border-width: 1px;
+                background-color: transparent;
+                background-image: none;
+                color: transparent;
+                icon-shadow: none;
+            }
+        }
+
+        .prelight-row .button  {
+            border-color: alpha(black, 0.1);
+            color: alpha(white, 0.8);
+
+            &:active {
+                border-color: alpha(black, 0.2);
+                background-color: alpha(black, 0.08);
+                color: white;
+            }
+        }
+
+        list-row, .prelight-row {
+            .button:hover {
+                border-color: alpha(black, 0.1);
+                color: white;
+            }
+        }
+    }
+
+    .gedit-document-panel-group-row {
+        &, &:hover {
+            border-top: 1px solid shade($bg_color, ($contrast + .1));
+            background-color: $bg_color;
+        }
+    }
+
+    .gedit-document-panel-document-row {
+        &:hover { background-color: shade($bg_color, 1.05); }
+
+        &:selected {
+            &, &:hover { @extend %selected; }
+        }
+    }
+
+    .gedit-document-panel-dragged-row {
+        border: 1px solid alpha(black, 0.1);
+        background-color: alpha(black, 0.5);
+        color: white;
+    }
+
+    .gedit-document-panel-placeholder-row {
+        border: none;
+        background-color: alpha(black, 0.08);
+        transition: all 200ms ease-in;
+    }
+
+    GeditStatusbar { border-top: 1px solid border_normal($bg_color); }
+
+    GeditStatusbar GeditSmallButton, GeditStatusMenuButton {
+        text-shadow: none;
+
+        .button {
+            border-style: solid;
+            border-width: 0 1px;
+            border-color: transparent;
+            border-radius: 0;
+            padding: 1px 6px 2px 4px;
+
+            &:hover, &:active, &:active:hover { border-color: border_normal($bg_color); }
+
+            &:active {
+                background-color: shade($bg_color, 0.95);
+                color: $fg_color;
+            }
+        }
+    }
+
+    GeditViewFrame .gedit-search-slider {
+        padding: $spacing;
+        border-radius: 0 0 $roundness $roundness;
+        border-width: 0 1px 1px 1px;
+        border-style: solid;
+        border-color: border_normal($base_color);
+        background-color: $base_color;
+
+        .not-found {
+            background-color: $error_bg_color;
+            background-image: none;
+            color: $error_fg_color;
+
+            &:selected { @extend %selected; }
+        }
+    }
+
+    GeditFileBrowserWidget .toolbar {
+        padding: $spacing / 2;
+        border-top: none;
+        background-color: $bg_color;
+        background-image: none;
+    }
+
+    .gedit-search-entry-occurrences-tag {
+        margin: $spacing / 2;
+        padding: $spacing / 2;
+        color: mix($text_color, $base_color, 0.5);
+    }
+}
diff --git a/gtk-3.0/scss/apps/_gnome-applications.scss b/gtk-3.0/scss/apps/_gnome-applications.scss
deleted file mode 100644
index f2679f6..0000000
--- a/gtk-3.0/scss/apps/_gnome-applications.scss
+++ /dev/null
@@ -1,341 +0,0 @@
-/***********************
- ! Fallback mode panel *
-************************/
-
-@include exports("panel") {
-    %panel {
-        @include linear-gradient($panel_bg_color);
-
-        color: $panel_fg_color;
-    }
-
-    PanelWidget, PanelApplet, PanelToplevel {
-        @extend %panel;
-
-        padding: 0;
-    }
-
-    PanelApplet {
-        border: none;
-
-        .button {
-            -GtkButton-inner-border: 2;
-
-            border-width: 0 1px;
-            border-radius: 0;
-            border-color: transparent;
-            background-color: transparent;
-            background-image: none;
-            color: $panel_fg_color;
-
-            &:hover, &:prelight {
-                @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.11));
-
-                border-color: mix($panel_bg_color, $panel_fg_color, 0.11);
-                color: shade($panel_fg_color, 1.08);
-            }
-
-            &:active, &:checked {
-                @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.21), to top);
-
-                border-color: mix($panel_bg_color, $panel_fg_color, 0.21);
-                color: shade($panel_fg_color, 1.08);
-
-                &:prelight {
-                    @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.31), to top);
-
-                    border-color: mix($panel_bg_color, $panel_fg_color, 0.31);
-                }
-            }
-        }
-    }
-
-    PanelSeparator {
-        @extend %panel;
-
-        border: none;
-    }
-
-    PanelApplet > GtkMenuBar.menubar, PanelMenuBar.menubar, .gnome-panel-menu-bar {
-        &.menuitem {
-            @extend %panel;
-
-            border: none;
-
-            -PanelMenuBar-icon-visible: true;
-        }
-    }
-
-    PanelAppletFrame {
-        @extend %panel;
-
-        border: none;
-    }
-
-    WnckPager, WnckTasklist { @extend %panel; }
-}
-
-
-/************
- ! Nautilus *
-*************/
-
-@include exports("nautilus") {
-    .nautilus-desktop.nautilus-canvas-item {
-        color: white;
-        text-shadow: 1px 1px black;
-
-        &:active { color: $fg_color; }
-
-        &:selected { color: $selected_fg_color; }
-
-        &:active, &:prelight, &:selected { text-shadow: none; }
-    }
-
-    NautilusWindow {
-        .toolbar {
-            border-width: 0 0 1px;
-            border-style: solid;
-            border-color: border_normal($toolbar_bg_color);
-        }
-
-        .sidebar .frame { border: none; }
-
-        > GtkGrid > .pane-separator {
-            border-width: 0 1px 0 0;
-            border-style: solid;
-
-            &, &:hover {
-                border-color: shade($bg_color, ($contrast + .1));
-                background-color: $bg_color;
-            }
-        }
-    }
-
-    NautilusNotebook {
-        &.notebook {
-            border-right-width: 0;
-            border-left-width: 0;
-            border-bottom-width: 0;
-        }
-
-        .frame { border: none; }
-    }
-
-    NautilusQueryEditor {
-        .search-bar.toolbar {
-            border-top-width: 0;
-            border-bottom-width: 0;
-        }
-
-        .toolbar {
-            padding-top: $spacing - 1px;
-            padding-bottom: $spacing - 2px;
-            border-width: 1px 0 0 0;
-            border-style: solid;
-            border-color: $toolbar_bg_color;
-            background-color: shade($toolbar_bg_color, 0.9);
-
-            &:nth-child(2) { border-color: border_normal($toolbar_bg_color); }
-
-            &.search-bar {
-                border-top-width: 0;
-                border-bottom-width: 0;
-            }
-
-            &, &.search-bar {
-                &:only-child {
-                    border-bottom-width: 1px;
-                    border-bottom-color: border_normal($toolbar_bg_color);
-                }
-            }
-
-        }
-    }
-}
-
-
-/*********
- ! Gedit *
-**********/
-
-@include exports("gedit") {
-    GeditWindow .pane-separator {
-        border-width: 0 1px 0 0;
-        border-style: solid;
-
-        &, &:hover {
-            border-color: shade($bg_color, ($contrast + .1));
-            background-color: $bg_color;
-        }
-    }
-
-    .gedit-document-panel {
-        background-color: $bg_color;
-        color: mix($fg_color, $bg_color, 0.1);
-
-        .list-row {
-            padding: $spacing;
-
-            .button {
-                padding: 1px;
-                border-radius: $roundness;
-                border-style: solid;
-                border-color: transparent;
-                border-width: 1px;
-                background-color: transparent;
-                background-image: none;
-                color: transparent;
-                icon-shadow: none;
-            }
-        }
-
-        .prelight-row .button  {
-            border-color: alpha(black, 0.1);
-            color: alpha(white, 0.8);
-
-            &:active {
-                border-color: alpha(black, 0.2);
-                background-color: alpha(black, 0.08);
-                color: white;
-            }
-        }
-
-        list-row, .prelight-row {
-            .button:hover {
-                border-color: alpha(black, 0.1);
-                color: white;
-            }
-        }
-    }
-
-    .gedit-document-panel-group-row {
-        &, &:hover {
-            border-top: 1px solid shade($bg_color, ($contrast + .1));
-            background-color: $bg_color;
-        }
-    }
-
-    .gedit-document-panel-document-row {
-        &:hover { background-color: shade($bg_color, 1.05); }
-
-        &:selected {
-            &, &:hover { @extend %selected; }
-        }
-    }
-
-    .gedit-document-panel-dragged-row {
-        border: 1px solid alpha(black, 0.1);
-        background-color: alpha(black, 0.5);
-        color: white;
-    }
-
-    .gedit-document-panel-placeholder-row {
-        border: none;
-        background-color: alpha(black, 0.08);
-        transition: all 200ms ease-in;
-    }
-
-    GeditStatusbar { border-top: 1px solid border_normal($bg_color); }
-
-    GeditStatusbar GeditSmallButton, GeditStatusMenuButton {
-        text-shadow: none;
-
-        .button {
-            border-style: solid;
-            border-width: 0 1px;
-            border-color: transparent;
-            border-radius: 0;
-            padding: 1px 6px 2px 4px;
-
-            &:hover, &:active, &:active:hover { border-color: border_normal($bg_color); }
-
-            &:active {
-                background-color: shade($bg_color, 0.95);
-                color: $fg_color;
-            }
-        }
-    }
-
-    GeditViewFrame .gedit-search-slider {
-        padding: $spacing;
-        border-radius: 0 0 $roundness $roundness;
-        border-width: 0 1px 1px 1px;
-        border-style: solid;
-        border-color: border_normal($base_color);
-        background-color: $base_color;
-
-        .not-found {
-            background-color: $error_bg_color;
-            background-image: none;
-            color: $error_fg_color;
-
-            &:selected { @extend %selected; }
-        }
-    }
-
-    GeditFileBrowserWidget .toolbar {
-        padding: $spacing / 2;
-        border-top: none;
-        background-color: $bg_color;
-        background-image: none;
-    }
-
-    .gedit-search-entry-occurrences-tag {
-        margin: $spacing / 2;
-        padding: $spacing / 2;
-        color: mix($text_color, $base_color, 0.5);
-    }
-}
-
-
-/***************
- ! Font-viewer *
-****************/
-
-@include exports("fontviewer") {
-    SushiFontWidget {
-        padding: $spacing ($spacing * 2);
-    }
-}
-
-
-/*************
- ! Gucharmap *
-**************/
-
-@include exports("charmap") {
-    GucharmapChartable {
-        background-color: $base_color;
-        color: $text_color;
-
-        &:focus, &:hover, &:active, &:selected { @extend %selected; }
-    }
-}
-
-
-/*************
- ! Evolution *
-**************/
-
-@include exports("evolution") {
-    EPreviewPane .entry {
-        background-color: $base_color;
-        color: $text_color;
-    }
-}
-
-
-/*******************
- * Gnome Bluetooth *
-********************/
-
-@include exports("gnome-bluetooth") {
-    GtkEntry.entry.pin-entry {
-        font: regular 50;
-        padding-left: 25px;
-        padding-right: 25px;
-    }
-
-    GtkLabel.pin-label { font: regular 50; }
-}
diff --git a/gtk-3.0/scss/apps/_nautilus.scss b/gtk-3.0/scss/apps/_nautilus.scss
new file mode 100644
index 0000000..d31a25e
--- /dev/null
+++ b/gtk-3.0/scss/apps/_nautilus.scss
@@ -0,0 +1,77 @@
+/************
+ ! Nautilus *
+*************/
+
+@include exports("nautilus") {
+    .nautilus-desktop.nautilus-canvas-item {
+        color: white;
+        text-shadow: 1px 1px black;
+
+        &:active { color: $fg_color; }
+
+        &:selected { color: $selected_fg_color; }
+
+        &:active, &:prelight, &:selected { text-shadow: none; }
+    }
+
+    NautilusWindow {
+        .toolbar {
+            border-width: 0 0 1px;
+            border-style: solid;
+            border-color: border_normal($toolbar_bg_color);
+        }
+
+        .sidebar .frame { border: none; }
+
+        > GtkGrid > .pane-separator {
+            border-width: 0 1px 0 0;
+            border-style: solid;
+
+            &, &:hover {
+                border-color: shade($bg_color, ($contrast + .1));
+                background-color: $bg_color;
+            }
+        }
+    }
+
+    NautilusNotebook {
+        &.notebook {
+            border-right-width: 0;
+            border-left-width: 0;
+            border-bottom-width: 0;
+        }
+
+        .frame { border: none; }
+    }
+
+    NautilusQueryEditor {
+        .search-bar.toolbar {
+            border-top-width: 0;
+            border-bottom-width: 0;
+        }
+
+        .toolbar {
+            padding-top: $spacing - 1px;
+            padding-bottom: $spacing - 2px;
+            border-width: 1px 0 0 0;
+            border-style: solid;
+            border-color: $toolbar_bg_color;
+            background-color: shade($toolbar_bg_color, 0.9);
+
+            &:nth-child(2) { border-color: border_normal($toolbar_bg_color); }
+
+            &.search-bar {
+                border-top-width: 0;
+                border-bottom-width: 0;
+            }
+
+            &, &.search-bar {
+                &:only-child {
+                    border-bottom-width: 1px;
+                    border-bottom-color: border_normal($toolbar_bg_color);
+                }
+            }
+
+        }
+    }
+}
diff --git a/gtk-3.0/scss/apps/_panel.scss b/gtk-3.0/scss/apps/_panel.scss
new file mode 100644
index 0000000..adc096e
--- /dev/null
+++ b/gtk-3.0/scss/apps/_panel.scss
@@ -0,0 +1,76 @@
+/***********************
+ ! Fallback mode panel *
+************************/
+
+@include exports("panel") {
+    %panel {
+        @include linear-gradient($panel_bg_color);
+
+        color: $panel_fg_color;
+    }
+
+    PanelWidget, PanelApplet, PanelToplevel {
+        @extend %panel;
+
+        padding: 0;
+    }
+
+    PanelApplet {
+        border: none;
+
+        .button {
+            -GtkButton-inner-border: 2;
+
+            border-width: 0 1px;
+            border-radius: 0;
+            border-color: transparent;
+            background-color: transparent;
+            background-image: none;
+            color: $panel_fg_color;
+
+            &:hover, &:prelight {
+                @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.11));
+
+                border-color: mix($panel_bg_color, $panel_fg_color, 0.11);
+                color: shade($panel_fg_color, 1.08);
+            }
+
+            &:active, &:checked {
+                @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.21), to top);
+
+                border-color: mix($panel_bg_color, $panel_fg_color, 0.21);
+                color: shade($panel_fg_color, 1.08);
+
+                &:prelight {
+                    @include linear-gradient(mix($panel_bg_color, $panel_fg_color, 0.31), to top);
+
+                    border-color: mix($panel_bg_color, $panel_fg_color, 0.31);
+                }
+            }
+        }
+    }
+
+    PanelSeparator {
+        @extend %panel;
+
+        border: none;
+    }
+
+    PanelApplet > GtkMenuBar.menubar, PanelMenuBar.menubar, .gnome-panel-menu-bar {
+        &.menuitem {
+            @extend %panel;
+
+            border: none;
+
+            -PanelMenuBar-icon-visible: true;
+        }
+    }
+
+    PanelAppletFrame {
+        @extend %panel;
+
+        border: none;
+    }
+
+    WnckPager, WnckTasklist { @extend %panel; }
+}
diff --git a/gtk-3.0/scss/gtk.scss b/gtk-3.0/scss/gtk.scss
index e191304..4b0d533 100755
--- a/gtk-3.0/scss/gtk.scss
+++ b/gtk-3.0/scss/gtk.scss
@@ -24,8 +24,10 @@
 @import "widgets/window";
 
 
-@import "apps/gnome-applications";
+@import "apps/gedit";
+@import "apps/nautilus";
 @import "apps/nemo";
+@import "apps/panel";
 @import "apps/synaptic";
 
 
diff --git a/gtk-3.0/scss/widgets/_misc.scss b/gtk-3.0/scss/widgets/_misc.scss
index 73e64b5..1d5a510 100644
--- a/gtk-3.0/scss/widgets/_misc.scss
+++ b/gtk-3.0/scss/widgets/_misc.scss
@@ -163,3 +163,54 @@
 		.toolbar { background-color: transparent; }
 	}
 }
+
+/***************
+ ! Font-viewer *
+****************/
+
+@include exports("fontviewer") {
+	SushiFontWidget {
+		padding: $spacing ($spacing * 2);
+	}
+}
+
+
+/*************
+ ! Gucharmap *
+**************/
+
+@include exports("charmap") {
+	GucharmapChartable {
+		background-color: $base_color;
+		color: $text_color;
+
+		&:focus, &:hover, &:active, &:selected { @extend %selected; }
+	}
+}
+
+
+/*************
+ ! Evolution *
+**************/
+
+@include exports("evolution") {
+	EPreviewPane .entry {
+		background-color: $base_color;
+		color: $text_color;
+	}
+}
+
+
+/*******************
+ ! Gnome Bluetooth *
+********************/
+
+@include exports("gnome-bluetooth") {
+	GtkEntry.entry.pin-entry {
+		font: regular 50;
+		padding-left: 25px;
+		padding-right: 25px;
+	}
+
+	GtkLabel.pin-label { font: regular 50; }
+}