diff --git a/gtk-3.0/scss/_button.scss b/gtk-3.0/scss/_button.scss
index 51c296f..4baaf0f 100755
--- a/gtk-3.0/scss/_button.scss
+++ b/gtk-3.0/scss/_button.scss
@@ -145,6 +145,27 @@
 	.linked & { @include linked_button($bg, $dark_shadow); }
 }
 
+%close_button {
+	border: 1px solid transparent;
+	background-color: transparent;
+	background-image: none;
+	box-shadow: none;
+
+	&:focus, &:hover {
+		border: 1px solid alpha(black, 0.3);
+		background-color: alpha(white, 0.2);
+		background-image: none;
+		box-shadow: none;
+	}
+
+	&:active, &:checked, &:active:hover, &:checked:hover  {
+		border: 1px solid alpha(black, 0.3);
+		background-color: alpha(black, 0.1);
+		background-image: none;
+		box-shadow: none;
+	}
+}
+
 .button {
 	@include button($bg_color, $fg_color);
 
diff --git a/gtk-3.0/scss/_infobar.scss b/gtk-3.0/scss/_infobar.scss
index 168a1d7..29a096b 100644
--- a/gtk-3.0/scss/_infobar.scss
+++ b/gtk-3.0/scss/_infobar.scss
@@ -1,5 +1,6 @@
 @import "functions";
 @import "global";
+@import "button";
 
 
 /*********
@@ -30,26 +31,7 @@ GtkInfoBar {
 			.button {
 				@include button($bg_color, $fg_color);
 
-				&.close {
-					border: 1px solid transparent;
-					background-color: transparent;
-					background-image: none;
-					box-shadow: none;
-
-					&:focus, &:hover {
-						border: 1px solid alpha(black, 0.3);
-						background-color: alpha(white, 0.2);
-						background-image: none;
-						box-shadow: none;
-					}
-
-					&:active, &:checked, &:active:hover, &:checked:hover  {
-						border: 1px solid alpha(black, 0.3);
-						background-color: alpha(black, 0.1);
-						background-image: none;
-						box-shadow: none;
-					}
-				}
+				&.close { @extend %close_button; }
 			}
 		}
 	}
diff --git a/gtk-3.0/scss/_notebook.scss b/gtk-3.0/scss/_notebook.scss
new file mode 100644
index 0000000..b16b0d6
--- /dev/null
+++ b/gtk-3.0/scss/_notebook.scss
@@ -0,0 +1,134 @@
+@import "functions";
+@import "global";
+
+/**********
+ ! Notebook
+***********/
+
+.notebook {
+	padding: 0;
+	border-width: 1px 0 0 0;
+	border-style: solid;
+	border-color: border_normal($base_color);
+	border-radius: 0;
+	background-color: $base_color;
+	background-image: none;
+	background-clip: border-box;
+	color: $text_color;
+
+	-GtkNotebook-initial-gap: 0;
+	-GtkNotebook-arrow-spacing: 5;
+	-GtkNotebook-tab-curvature: 0;
+	-GtkNotebook-tab-overlap: 1;
+	-GtkNotebook-has-tab-gap: false;
+
+	&.frame { border-width: 1px; }
+
+	&.header {
+		border-width: 0;
+		background-color: shade($base_color, 0.85);
+
+		&.frame {
+			border-color: shade($base_color, 0.75);
+
+			&.top { border-width: 1px 1px 0 1px; }
+
+			&.right { border-width: 1px 1px 1px 0; }
+
+			&.bottom { border-width: 0 1px 1px 1px; }
+
+			&.left { border-width: 1px 0 1px 1px; }
+		}
+	}
+
+	GtkViewport {
+		border-width: 0;
+		background-color: $base_color;
+		color: $text_color;
+	}
+
+	tab {
+		padding: $spacing ($spacing * 2);
+		border: 1px solid transparent;
+		background-color: transparent;
+		background-image: none;
+
+		&:active {
+			background-color: transparent;
+			background-image: none;
+		}
+
+		&.top {
+			border-bottom-width: 2px;
+			border-bottom-right-radius: 0;
+			border-bottom-left-radius: 0;
+
+			&:hover { border-bottom-color: alpha($selected_bg_color, 0.3); }
+
+			&:active { border-bottom-color: $selected_bg_color; }
+		}
+
+		&.right {
+			border-left-width: 2px;
+			border-bottom-left-radius: 0;
+			border-top-left-radius: 0;
+
+			&:hover { border-left-color: alpha($selected_bg_color, 0.3); }
+
+			&:active { border-left-color: $selected_bg_color; }
+		}
+
+
+		&.bottom {
+			border-top-width: 2px;
+			border-top-right-radius: 0;
+			border-top-left-radius: 0;
+
+			&:hover { border-top-color: alpha($selected_bg_color, 0.3); }
+
+			&:active { border-top-color: $selected_bg_color; }
+		}
+
+		&.left {
+			border-right-width: 2px;
+			border-top-right-radius: 0;
+			border-bottom-right-radius: 0;
+
+			&:hover { border-right-color: alpha($selected_bg_color, 0.3); }
+
+			&:active { border-right-color: $selected_bg_color; }
+		}
+
+		GtkLabel { color: mix($text_color, $base_color, 0.3); }
+
+		/* close button styling */
+		.button { @extend %close_button; }
+	}
+
+	.prelight-page {
+		&, GtkLabel { color: mix($text_color, $base_color, 0.15); }
+	}
+
+	.active-page {
+		&, GtkLabel { color: $text_color; }
+	}
+
+	.reorderable-page {
+		&:hover {
+			background-color: shade($base_color, 0.85);
+			border-left: 0;
+			border-right: 0;
+			/* using box shadows instead of borders due to slanted edges */
+			box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03),
+						inset 1px 0 shade($base_color, 0.7), inset -1px 0 shade($base_color, 0.7);
+		}
+
+		&:active {
+			background-color: shade($base_color, 0.90);
+			border-left: 0;
+			border-right: 0;
+			box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03),
+						inset 1px 0 shade($base_color, 0.75), inset -1px 0 shade($base_color, 0.75);
+		}
+	}
+}
diff --git a/gtk-3.0/scss/_scrollbar.scss b/gtk-3.0/scss/_scrollbar.scss
new file mode 100644
index 0000000..8412d5d
--- /dev/null
+++ b/gtk-3.0/scss/_scrollbar.scss
@@ -0,0 +1,61 @@
+@import "functions";
+@import "global";
+
+/***********
+ ! Scrollbar
+************/
+
+.scrollbar {
+	border: none;
+	padding: 0;
+
+	&.button {
+		&, &:active, &:active:hover {
+			border-width: 0;
+			border-radius: 0;
+			background-color: transparent;
+			background-image: none;
+			color: shade($bg_color, 0.6);
+		}
+	}
+
+	&.slider, &.slider.vertical {
+		border: 1px solid mix(shade($bg_color, 0.87), $fg_color, 0.21);
+		border-radius: 0;
+		background-color: mix($bg_color, $fg_color, 0.21);
+
+		&:hover {
+			border-color: mix(shade($bg_color, 0.87), $fg_color, 0.31);
+			background-color: mix($bg_color, $fg_color, 0.31);
+		}
+
+		&:active {
+			border-color: shade($selected_bg_color, 0.9);
+			background-color: $selected_bg_color;
+		}
+
+		&.fine-tune:prelight:active {
+			border-width: 2px;
+			border-color: transparent;
+		}
+	}
+}
+
+.scrollbars-junction,
+.scrollbar.trough {
+	border: none;
+	border-radius: 0;
+	background-color: $bg_color;
+	background-image: none;
+}
+
+/* overlay scrollbar */
+OsThumb, OsScrollbar {
+	color: shade($bg_color, 0.7);
+
+	&:selected { background-color: $selected_bg_color; }
+
+	&:active { background-color: $selected_bg_color; }
+
+	&:insensitive { background-color: shade($bg_color, 0.9); }
+}
diff --git a/gtk-3.0/scss/_view.scss b/gtk-3.0/scss/_view.scss
index ea99496..e7c0155 100644
--- a/gtk-3.0/scss/_view.scss
+++ b/gtk-3.0/scss/_view.scss
@@ -219,3 +219,49 @@ GtkExpander {
     background-color: $bg_color;
     color: transparent;
 }
+
+
+/****************
+ ! Floating bar *
+*****************/
+
+.floating-bar {
+    border: 1px solid border_normal($bg_color);
+    border-radius: $roundness;
+    background-color: $bg_color;
+    background-image: none;
+    color: $fg_color;
+
+    &.top {
+        border-top-width: 0;
+        border-top-right-radius: 0;
+        border-top-left-radius: 0;
+    }
+
+    &.right {
+        border-right-width: 0;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+    }
+
+    &.bottom {
+        border-bottom-width: 0;
+        border-bottom-right-radius: 0;
+        border-bottom-left-radius: 0;
+    }
+
+    &.left {
+        border-left-width: 0;
+        border-bottom-left-radius: 0;
+        border-top-left-radius: 0;
+    }
+
+    .button {
+        -GtkButton-image-spacing: 0;
+        -GtkButton-inner-border: 0;
+
+        border: none;
+        background-color: transparent;
+        background-image: none;
+    }
+}
diff --git a/gtk-3.0/scss/widgets.scss b/gtk-3.0/scss/widgets.scss
index 423bb4c..c74514b 100755
--- a/gtk-3.0/scss/widgets.scss
+++ b/gtk-3.0/scss/widgets.scss
@@ -14,237 +14,8 @@
 @import "window";
 @import "calendar";
 @import "infobar";
-
-
-/*****************
-* miscellaneous *
-*****************/
-.floating-bar {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade($bg_color, 0.8);
-    border-radius: 2px;
-    background-color: $bg_color;
-    background-image: none;
-    color: $fg_color;
-}
-
-.floating-bar.top {
-    border-top-width: 0;
-    border-top-right-radius: 0;
-    border-top-left-radius: 0;
-}
-
-.floating-bar.right {
-    border-right-width: 0;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-.floating-bar.bottom {
-    border-bottom-width: 0;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-}
-
-.floating-bar.left {
-    border-left-width: 0;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-}
-
-.floating-bar .button {
-    -GtkButton-image-spacing: 0;
-    -GtkButton-inner-border: 0;
-
-    border-style: none;
-    background-color: transparent;
-    background-image: none;
-}
-
-
-
-/************
-* notebook *
-************/
-.notebook {
-    padding: 0;
-    border-width: 1px 0 0 0;
-    border-style: solid;
-    border-color: shade($base_color, 0.7);
-    border-radius: 0;
-    background-color: $base_color;
-    background-image: none;
-    background-clip: border-box;
-
-    -GtkNotebook-initial-gap: 0;
-    -GtkNotebook-arrow-spacing: 5;
-    -GtkNotebook-tab-curvature: 0;
-    -GtkNotebook-tab-overlap: 1;
-    -GtkNotebook-has-tab-gap: false;
-}
-
-.notebook.frame {
-    border-width: 1px;
-}
-
-.notebook.header {
-    border-width: 0;
-    background-color: shade($base_color, 0.85);
-}
-
-.notebook.header.frame {
-    border-color: shade($base_color, 0.75);
-}
-
-.notebook.header.frame.top {
-    border-width: 1px 1px 0 1px;
-}
-
-.notebook.header.frame.right {
-    border-width: 1px 1px 1px 0;
-}
-
-.notebook.header.frame.bottom {
-    border-width: 0 1px 1px 1px;
-}
-
-.notebook.header.frame.left {
-    border-width: 1px 0 1px 1px;
-}
-
-.notebook GtkViewport {
-    border-width: 0;
-    background-color: $base_color;
-    color: $text_color;
-}
-
-.notebook tab {
-    padding: 4px 6px;
-    border-style: solid;
-    border-width: 1px;
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-}
-
-.notebook tab:active {
-    background-color: transparent;
-    background-image: none;
-}
-
-.notebook tab.top {
-    border-bottom-width: 2px;
-    border-bottom-right-radius: 0;
-    border-bottom-left-radius: 0;
-}
-
-.notebook tab.top:hover {
-    border-bottom-color: alpha($selected_bg_color, 0.3);
-}
-
-.notebook tab.top:active {
-    border-bottom-color: $selected_bg_color;
-}
-
-.notebook tab.right {
-    border-left-width: 2px;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-}
-
-.notebook tab.right:hover {
-    border-left-color: alpha($selected_bg_color, 0.3);
-}
-
-.notebook tab.right:active {
-    border-left-color: $selected_bg_color;
-}
-
-.notebook tab.bottom {
-    border-top-width: 2px;
-    border-top-right-radius: 0;
-    border-top-left-radius: 0;
-}
-
-.notebook tab.bottom:hover {
-    border-top-color: alpha($selected_bg_color, 0.3);
-}
-
-.notebook tab.bottom:active {
-    border-top-color: $selected_bg_color;
-}
-
-.notebook tab.left {
-    border-right-width: 2px;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-.notebook tab.left:hover {
-    border-right-color: alpha($selected_bg_color, 0.3);
-}
-
-.notebook tab.left:active {
-    border-right-color: $selected_bg_color;
-}
-
-.notebook tab GtkLabel {
-    color: mix($text_color, $base_color, 0.3);
-}
-
-.notebook .prelight-page,
-.notebook .prelight-page GtkLabel {
-    color: mix($text_color, $base_color, 0.15);
-}
-
-.notebook .active-page,
-.notebook .active-page GtkLabel {
-    color: $text_color;
-}
-
-.notebook tab.reorderable-page:hover {
-    background-color: shade($base_color, 0.85);
-    border-left: 0;
-    border-right: 0;
-    /* using box shadows instead of borders due to slanted edges */
-    box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03),
-        inset 1px 0 shade($base_color, 0.7), inset -1px 0 shade($base_color, 0.7);
-}
-
-.notebook tab.reorderable-page:active {
-    background-color: shade($base_color, 0.90);
-    border-left: 0;
-    border-right: 0;
-    box-shadow: inset 0 3px alpha(black, 0.03), inset 0 2px alpha(black, 0.03), inset 0 1px alpha(black, 0.03),
-        inset 1px 0 shade($base_color, 0.75), inset -1px 0 shade($base_color, 0.75);
-}
-
-/* close button styling */
-.notebook tab .button,
-.notebook tab .button:active,
-.notebook tab .button:hover {
-    padding: 1px;
-    border-width: 1px;
-    border-radius: 2px;
-    border-style: solid;
-    border-color: transparent;
-    background-image: none;
-    background-color: transparent;
-    color: mix($text_color, $base_color, 0.5);
-}
-
-.notebook tab .button:hover {
-    color: $text_color;
-    border-color: shade($base_color, 0.8);
-}
-
-.notebook tab .button:active,
-.notebook tab .button:active:hover {
-    border-color: shade($base_color, 0.7);
-    background-color: shade($base_color, 0.95);
-}
-
+@import "notebook";
+@import "scrollbar";
 
 
 /*************