diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..c92f67d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,20 @@
+SASSC = sassc -t expanded
+
+GTK30_DEPS = gtk-3.0/apps/ gtk-3.0/common/ gtk-3.0/widgets/ common/
+BUILD_DIRS = gnome-shell/ common/ gtk-3.0/
+
+.PHONY: all gtk-3.0/gtk.css gtk-3.0/gtk-dark.css gnome-shell/gnome-shell.css 
+all: gtk-3.0/gtk.css gtk-3.0/gtk-dark.css gnome-shell/gnome-shell.css 
+
+gtk-3.0/gtk.css: gtk-3.0/gtk.scss
+	$(SASSC) $< $@
+
+gtk-3.0/gtk-dark.css: gtk-3.0/gtk-dark.scss
+	$(SASSC) $< $@
+
+gnome-shell/gnome-shell.css: gnome-shell/gnome-shell.scss
+	$(SASSC) $< $@
+
+
+deb-package: debian/ 
+	./build_deb_package.sh
diff --git a/README.md b/README.md
index d003c07..75cab5c 100644
--- a/README.md
+++ b/README.md
@@ -19,10 +19,13 @@ Clone to /usr/share/themes
 In general, make sure to first modify the source css (.scss) files, and then
 regenerate the corresponding .css file, e.g.:
 
-	cd gnome-shell
-	sassc \
-		--style expanded \
-		gnome-shell.scss gnome-shell.css
+```
+$ make all
+sassc -t expanded gtk-3.0/gtk.scss gtk-3.0/gtk.css
+sassc -t expanded gtk-3.0/gtk-dark.scss gtk-3.0/gtk-dark.css
+sassc -t expanded gnome-shell/gnome-shell.scss gnome-shell/gnome-shell.css
+```
+
 
 ### Looking Glass
 
diff --git a/gnome-shell/compile.sh b/gnome-shell/compile.sh
deleted file mode 100755
index 9ca2dd2..0000000
--- a/gnome-shell/compile.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-#    -t, --style NAME        Output style. Can be: nested, expanded, compact, compressed.
-
-sassc \
-	--style expanded \
-	gnome-shell.scss \
-	gnome-shell.css
-	# test.css
diff --git a/gtk-3.0/common/_colors.scss b/gtk-3.0/common/_colors.scss
index 2f4ab17..ae7e566 100644
--- a/gtk-3.0/common/_colors.scss
+++ b/gtk-3.0/common/_colors.scss
@@ -1,3 +1,7 @@
 @define-color text_view_bg #ffffff;
 @define-color theme_text_color #000000;
 
+@define-color theme_fg_color  #000000;
+@define-color theme_bg_color  #ffffff;
+@define-color theme_selected_fg_color #aaaaaa;
+@define-color theme_selected_bg_color #555555;
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index 8a8b9e1..99c6581 100644
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -1,6 +1,10 @@
 /*@import url("resource:///org/gtk/libgtk/theme/HighContrast/gtk-contained.css");*/
 @define-color text_view_bg #ffffff;
 @define-color theme_text_color #000000;
+@define-color theme_fg_color  #000000;
+@define-color theme_bg_color  #ffffff;
+@define-color theme_selected_fg_color #aaaaaa;
+@define-color theme_selected_bg_color #555555;
 window {
   background-color: #ffffff;
   color: #000000;
@@ -24,6 +28,7 @@ headerbar {
   border-radius: 8px 8px 0px 0px;
   padding: 5px;
 }
+
 headerbar separator {
   background-color: rgba(0, 0, 0, 0);
 }
@@ -32,6 +37,7 @@ headerbar separator {
   background-color: #ffffff !important;
   color: #000000;
 }
+
 .titlebar * {
   color: #000000;
 }
@@ -45,10 +51,12 @@ headerbar separator {
   min-width: 18px;
   border-radius: 50%;
 }
+
 .titlebutton:hover {
   background-color: #000000;
   color: #ffffff;
 }
+
 .titlebutton:hover * {
   color: #ffffff;
 }
@@ -63,9 +71,11 @@ switch {
   border-radius: 14px;
   padding: 2px;
 }
+
 switch:hover {
   background-color: unset;
 }
+
 switch > slider {
   background-color: #000000;
   border: 2px solid #000000;
@@ -73,6 +83,7 @@ switch > slider {
   min-width: 18px;
   min-height: 18px;
 }
+
 switch * {
   color: rgba(0, 0, 0, 0);
 }
@@ -104,6 +115,7 @@ popover {
   border: 2px solid #000000;
   border-radius: 5px;
 }
+
 popover contents {
   background-color: #ffffff;
   border: 1px solid #000000;
@@ -149,9 +161,11 @@ button:hover * {
   background-color: #000000;
   color: #ffffff;
 }
+
 .suggested-action * {
   color: #ffffff;
 }
+
 .suggested-action:disabled {
   border: 2px solid #646464;
   background-color: #646464;
@@ -160,12 +174,15 @@ button:hover * {
 buttonbox button {
   border-radius: 0;
 }
+
 buttonbox button:first-child {
   border-radius: 5px 0px 0px 5px;
 }
+
 buttonbox button:last-child {
   border-radius: 0px 5px 5px 0px;
 }
+
 buttonbox button:checked {
   background-color: #000000;
   color: #ffffff;
@@ -226,7 +243,7 @@ scrollbar.vertical slider {
 }
 
 .gtkstyle-fallback {
-  background-color: rgb(255, 255, 255);
+  background-color: white;
   color: #000000;
 }
 
@@ -235,7 +252,7 @@ scrollbar.vertical slider {
 iconview text,
 textview text {
   color: #000000;
-  background-color: rgb(255, 255, 255);
+  background-color: white;
 }
 
 .view text selection {
@@ -276,18 +293,18 @@ row {
   border: 1px solid #ffffff;
 }
 
-row:hover {
+popover:hover, row:hover {
   background-color: #ffffff;
   color: #000000;
 }
 
-row:selected {
+treeview:selected, row:selected {
   border: 1px solid #000000;
   background-color: #000000;
   color: #ffffff;
 }
 
-row:selected * {
+treeview:selected *, row:selected * {
   color: #ffffff;
 }
 
@@ -305,6 +322,23 @@ checkbutton {
   border: none !important;
 }
 
+checkbutton check {
+  border: 2px solid #000000;
+  border-radius: 5px;
+  margin-right: 5px;
+}
+
+spinbutton entry {
+  border: 2px solid #000000;
+  border-radius: 5px;
+  padding: 0 5px;
+  text-align: right;
+}
+
+frame {
+  border: 1px solid #777777;
+}
+
 .background {
   background-color: #ffffff;
 }
@@ -345,6 +379,10 @@ checkbutton {
   border-radius: 5px;
 }
 
+menuitem {
+  margin: 5px;
+}
+
 /* app-specific css */
 .frame {
   border: 1px solid #000000;
@@ -368,5 +406,3 @@ viewswitcher button:checked {
 viewswitcher button:checked * {
   color: #ffffff;
 }
-
-/*# sourceMappingURL=gtk-dark.css.map */
diff --git a/gtk-3.0/gtk-dark.scss b/gtk-3.0/gtk-dark.scss
index 4758f3b..6990e7e 100644
--- a/gtk-3.0/gtk-dark.scss
+++ b/gtk-3.0/gtk-dark.scss
@@ -1 +1 @@
-@import "gtk";
\ No newline at end of file
+@import "gtk.scss";
\ No newline at end of file
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 77493ac..99c6581 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -1,6 +1,10 @@
 /*@import url("resource:///org/gtk/libgtk/theme/HighContrast/gtk-contained.css");*/
 @define-color text_view_bg #ffffff;
 @define-color theme_text_color #000000;
+@define-color theme_fg_color  #000000;
+@define-color theme_bg_color  #ffffff;
+@define-color theme_selected_fg_color #aaaaaa;
+@define-color theme_selected_bg_color #555555;
 window {
   background-color: #ffffff;
   color: #000000;
@@ -24,6 +28,7 @@ headerbar {
   border-radius: 8px 8px 0px 0px;
   padding: 5px;
 }
+
 headerbar separator {
   background-color: rgba(0, 0, 0, 0);
 }
@@ -32,6 +37,7 @@ headerbar separator {
   background-color: #ffffff !important;
   color: #000000;
 }
+
 .titlebar * {
   color: #000000;
 }
@@ -45,10 +51,12 @@ headerbar separator {
   min-width: 18px;
   border-radius: 50%;
 }
+
 .titlebutton:hover {
   background-color: #000000;
   color: #ffffff;
 }
+
 .titlebutton:hover * {
   color: #ffffff;
 }
@@ -63,9 +71,11 @@ switch {
   border-radius: 14px;
   padding: 2px;
 }
+
 switch:hover {
   background-color: unset;
 }
+
 switch > slider {
   background-color: #000000;
   border: 2px solid #000000;
@@ -73,6 +83,7 @@ switch > slider {
   min-width: 18px;
   min-height: 18px;
 }
+
 switch * {
   color: rgba(0, 0, 0, 0);
 }
@@ -104,6 +115,7 @@ popover {
   border: 2px solid #000000;
   border-radius: 5px;
 }
+
 popover contents {
   background-color: #ffffff;
   border: 1px solid #000000;
@@ -149,9 +161,11 @@ button:hover * {
   background-color: #000000;
   color: #ffffff;
 }
+
 .suggested-action * {
   color: #ffffff;
 }
+
 .suggested-action:disabled {
   border: 2px solid #646464;
   background-color: #646464;
@@ -160,12 +174,15 @@ button:hover * {
 buttonbox button {
   border-radius: 0;
 }
+
 buttonbox button:first-child {
   border-radius: 5px 0px 0px 5px;
 }
+
 buttonbox button:last-child {
   border-radius: 0px 5px 5px 0px;
 }
+
 buttonbox button:checked {
   background-color: #000000;
   color: #ffffff;
@@ -226,7 +243,7 @@ scrollbar.vertical slider {
 }
 
 .gtkstyle-fallback {
-  background-color: rgb(255, 255, 255);
+  background-color: white;
   color: #000000;
 }
 
@@ -235,7 +252,7 @@ scrollbar.vertical slider {
 iconview text,
 textview text {
   color: #000000;
-  background-color: rgb(255, 255, 255);
+  background-color: white;
 }
 
 .view text selection {
@@ -276,18 +293,18 @@ row {
   border: 1px solid #ffffff;
 }
 
-row:hover {
+popover:hover, row:hover {
   background-color: #ffffff;
   color: #000000;
 }
 
-row:selected {
+treeview:selected, row:selected {
   border: 1px solid #000000;
   background-color: #000000;
   color: #ffffff;
 }
 
-row:selected * {
+treeview:selected *, row:selected * {
   color: #ffffff;
 }
 
@@ -305,6 +322,23 @@ checkbutton {
   border: none !important;
 }
 
+checkbutton check {
+  border: 2px solid #000000;
+  border-radius: 5px;
+  margin-right: 5px;
+}
+
+spinbutton entry {
+  border: 2px solid #000000;
+  border-radius: 5px;
+  padding: 0 5px;
+  text-align: right;
+}
+
+frame {
+  border: 1px solid #777777;
+}
+
 .background {
   background-color: #ffffff;
 }
@@ -345,6 +379,10 @@ checkbutton {
   border-radius: 5px;
 }
 
+menuitem {
+  margin: 5px;
+}
+
 /* app-specific css */
 .frame {
   border: 1px solid #000000;
@@ -368,5 +406,3 @@ viewswitcher button:checked {
 viewswitcher button:checked * {
   color: #ffffff;
 }
-
-/*# sourceMappingURL=gtk.css.map */
diff --git a/gtk-3.0/gtk.scss b/gtk-3.0/gtk.scss
index 3cb6b13..01984a9 100644
--- a/gtk-3.0/gtk.scss
+++ b/gtk-3.0/gtk.scss
@@ -29,7 +29,6 @@ color: #ffffff;
 }
 
 *{
-
   &::backdrop{
     background-color: unset;
     background-image: unset;
@@ -64,18 +63,18 @@ row{
   border: 1px solid #ffffff;
 }
 
-row:hover{
+popover:hover, row:hover{
   background-color: #ffffff;
   color: #000000;
 }
 
-row:selected{
+treeview:selected, row:selected{
   border: 1px solid #000000;
   background-color: #000000;
   color: #ffffff;
 }
 
-row:selected *{
+treeview:selected *, row:selected *{
   color: #ffffff;
 }
 
@@ -92,6 +91,23 @@ checkbutton{
   border: none !important;
 }
 
+checkbutton check {
+  border: 2px solid #000000;
+  border-radius: 5px;
+  margin-right: 5px;
+}
+
+spinbutton entry {
+  border: 2px solid #000000;
+  border-radius: 5px;
+  padding: 0 5px;
+  text-align: right;
+}
+
+frame {
+  border: 1px solid #777777;
+}
+
 .background{
   background-color: #ffffff;
 }
@@ -132,6 +148,10 @@ checkbutton{
   border-radius: 5px;
 }
 
+menuitem {
+  margin: 5px;
+}
+
 /* app-specific css */
 @import "apps/apps";