diff --git a/Paper/gtk-3.0/apps/fallback.css b/Paper/gtk-3.0/apps/fallback.css
index ab276f2..52f522e 100644
--- a/Paper/gtk-3.0/apps/fallback.css
+++ b/Paper/gtk-3.0/apps/fallback.css
@@ -28,9 +28,9 @@ PanelWidget,
 PanelApplet,
 PanelToplevel {
     padding: 0;
-    background-color: @panel;
+    background-color: #000;
     background-image: none;
-    color: @panel_text;
+    color: #fff;
 }
 
 PanelApplet {
@@ -39,7 +39,6 @@ PanelApplet {
 
 PanelSeparator {
     border-width: 0;
-    background-color: @panel;
     background-image: none;
     color: @base;
 }
diff --git a/Paper/gtk-3.0/apps/geary.css b/Paper/gtk-3.0/apps/geary.css
index fafc969..84a1d47 100644
--- a/Paper/gtk-3.0/apps/geary.css
+++ b/Paper/gtk-3.0/apps/geary.css
@@ -46,3 +46,20 @@ ConversationListView .view:selected:backdrop {
 	background-color: @backdrop_selection;
 	color: @backdrop_selection_foreground;
 }
+
+
+ConversationListView {
+    -GtkWidget-focus-line-width: 1px;
+    -GtkTreeView-grid-line-width: 0;
+}
+ 
+ConversationListView.view.cell {
+    border-style: solid;
+    border-width: 0 0 1px 0;
+    border-color: alpha(#000, 0.2);
+}
+ 
+ConversationListView.view.cell:selected {
+    color: @base;
+    border: 0px solid shade(@selection, 0.8);
+}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/apps/pantheon.css b/Paper/gtk-3.0/apps/pantheon.css
index b74c0af..4a6b2ca 100644
--- a/Paper/gtk-3.0/apps/pantheon.css
+++ b/Paper/gtk-3.0/apps/pantheon.css
@@ -128,25 +128,6 @@ BirdieWidgetsTweetList * {
     color: red;
 }
 
-/********
-* Geary *
-********/
-
-ConversationListView {
-    -GtkWidget-focus-line-width: 1px;
-    -GtkTreeView-grid-line-width: 0;
-}
- 
-ConversationListView.view.cell {
-    border-style: solid;
-    border-width: 0 0 1px 0;
-    border-color: alpha(#000, 0.2);
-}
- 
-ConversationListView.view.cell:selected {
-    color: @base;
-    border: 0px solid shade(@selection, 0.8);
-}
 
 /**********
  * Noise *
@@ -275,72 +256,36 @@ NoiseTopDisplay .seek-bar {
  * Panel *
  ********/
 
-.panel,
-.panel:backdrop {
-    background-color: @panel;
-    color: @panel_text;
-    font-weight: bold;
-}
-
-.panel-shadow {
-    background-image: none;
+.panel {
     background-color: transparent;
+    transition: all 100ms ease-in-out;
 }
 
-.panel .menu {
-    box-shadow: none;
+.panel.maximized {
+    background-color: #000;
 }
 
-.panel .menu .spinner {
-    opacity: 1;
+.panel.translucent {
+    background-color: alpha(#000, 0.5);
 }
 
-.panel .menubar .composited-indicator {
-    padding: 2px 4px;
-    text-shadow:0 1px 2px alpha(@panel, 0.7);
-    icon-shadow:0 1px 2px alpha(@panel, 0.7);
+.composited-indicator > revealer label,
+.composited-indicator > revealer image,
+.composited-indicator > GtkRevealer {
+    color: #fff;
+    font-weight: bold;
+    text-shadow: 0 0 2px alpha (#000, 0.3),
+                 0 1px 2px alpha (#000, 0.6);
+    icon-shadow: 0 0 2px alpha (#000, 0.3),
+                 0 1px 2px alpha (#000, 0.6);
 }
 
-.panel .menubar .composited-indicator:prelight {
-    background-color: alpha(#000, 0.1);
-    box-shadow: none;
-    color: @panel_text;
+.panel.color-light .composited-indicator > revealer label,
+.panel.color-light .composited-indicator > revealer image,
+.panel.color-light .composited-indicator > GtkRevealer {
+    color: alpha (#000, 0.65);
+    text-shadow: 0 0 2px alpha (#fff, 0.3),
+                 0 1px 0 alpha (#fff, 0.25);
+    icon-shadow: 0 0 2px alpha (#fff, 0.3),
+                 0 1px 0 alpha (#fff, 0.25);
 }
-
-.panel .menubar .composited-indicator:backdrop GtkLabel,
-.panel .menubar .composited-indicator:prelight GtkLabel {
-    color: @panel_text;
-}
-
-.panel .composited-indicator .menu .menuitem {
-    padding: 4px 6px;
-    font-weight: normal;
-    text-shadow:none;
-    icon-shadow:none;
-}
-
-.panel .composited-indicator .menu .menuitem GtkImage,
-.panel .composited-indicator .menu .menuitem GtkLabel,
-.panel .composited-indicator .menu .menuitem:backdrop GtkImage,
-.panel .composited-indicator .menu .menuitem:backdrop GtkLabel {
-    color: @text;
-}
-
-.panel .composited-indicator .menu .menuitem:insensitive GtkImage,
-.panel .composited-indicator .menu .menuitem:insensitive GtkLabel {
-    color: @insensitive_text;
-}
-
-.panel .window-frame.menu.csd,
-.panel .window-frame.popup.csd {
-    box-shadow: none;
-}
-
-.panel .menu .window-frame.menu.csd,
-.panel .menu .window-frame.popup.csd {
-    box-shadow: 0 0 0 1px alpha (#000, 0.20),
-                0 10px 20px alpha (#000, 0.19),
-                0 6px 6px alpha (#000, 0.23),
-                inset 0 1px 0 0 rgba(255,255,255,0.1),
-                inset 0 -3px 3px -4px alpha(#000, 0.4);
-}
\ No newline at end of file
diff --git a/Paper/gtk-3.0/gtk-common.css b/Paper/gtk-3.0/gtk-common.css
index ef00c8a..ebc2ea5 100644
--- a/Paper/gtk-3.0/gtk-common.css
+++ b/Paper/gtk-3.0/gtk-common.css
@@ -87,9 +87,6 @@
 @define-color theme_text @foreground;
 @define-color theme_text_color @foreground;
 
-@define-color panel_bg_color @panel;
-@define-color panel_fg_color @panel_text;
-
 
 /*****************
  * Trough Colors *
diff --git a/Paper/gtk-3.0/gtk-dark.css b/Paper/gtk-3.0/gtk-dark.css
index 94c3a02..54b9ed2 100644
--- a/Paper/gtk-3.0/gtk-dark.css
+++ b/Paper/gtk-3.0/gtk-dark.css
@@ -33,9 +33,6 @@
 @define-color selection #90a4ae;/* Selection color */
 @define-color view_background @base;/* View background */
 @define-color inactive_frame @border;/* Inactive frame color */
-@define-color panel shade(@header, 0.8);/* Panel color */
-@define-color panel_text #A1A8AB;/* Panel text color */
-@define-color panel_text_shadow alpha(#000, 0.2);/* Panel text color */
 @define-color text_shadow alpha(white, 0.4);/* Text shadow */
 @define-color icon_shadow @text_shadow;/* Icon shadow */
 @define-color progress_color #90a4ae; /* Progress color */
diff --git a/Paper/gtk-3.0/gtk-widgets-assets-dark.css b/Paper/gtk-3.0/gtk-widgets-assets-dark.css
index 4091859..7ecaf94 100644
--- a/Paper/gtk-3.0/gtk-widgets-assets-dark.css
+++ b/Paper/gtk-3.0/gtk-widgets-assets-dark.css
@@ -278,7 +278,6 @@
  * GtkSwitch *
  *************/
 
-
 GtkSwitch.trough {
     background: -gtk-scaled(url("assets/scalable/switch-off.svg"),url("assets/scalable/switch-off@2.svg"));
     background-repeat: no-repeat;
diff --git a/Paper/gtk-3.0/gtk-widgets.css b/Paper/gtk-3.0/gtk-widgets.css
index 7c87a26..cf1ac4f 100644
--- a/Paper/gtk-3.0/gtk-widgets.css
+++ b/Paper/gtk-3.0/gtk-widgets.css
@@ -40,14 +40,8 @@
     -GtkWindow-resize-grip-width: 0;
     -GtkWindow-resize-grip-height: 0;
 
-    /*padding: 0;*/
     background-color: inherit;
     color: inherit;
-/*    outline-color: rgba(46, 52, 54, 0.3);
-    outline-style: dashed;
-    outline-offset: -3px;
-    outline-width: 1px;
-    outline-radius: 2px;*/
 }
 
 /* Import Widget CSS */
diff --git a/Paper/gtk-3.0/gtk.css b/Paper/gtk-3.0/gtk.css
index 9077cda..29a7e7e 100644
--- a/Paper/gtk-3.0/gtk.css
+++ b/Paper/gtk-3.0/gtk.css
@@ -34,8 +34,6 @@
 @define-color selection #dbdee0;/* Selection color */
 @define-color view_background @base;/* View background */
 @define-color inactive_frame @border;/* Inactive frame color */
-@define-color panel shade(@header, 0.8);/* Panel color */
-@define-color panel_text #E0E2E3;/* Panel text color */
 @define-color text_shadow alpha(white, 0.4);/* Text shadow */
 @define-color icon_shadow @text_shadow;/* Icon shadow */
 @define-color progress_color #9fb0b9; /* Progressbar color */
diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css
index 1578276..0abc8e8 100644
--- a/Paper/gtk-3.0/widgets/header-bar.css
+++ b/Paper/gtk-3.0/widgets/header-bar.css
@@ -110,7 +110,7 @@
     background-image: none;
     box-shadow: none;
     border: none;
-    padding: 13px 15px;
+    padding: 10px 12px;
 }
 
 /* Normal Button */
diff --git a/Paper/gtk-3.0/widgets/linked-buttons.css b/Paper/gtk-3.0/widgets/linked-buttons.css
index 10789fb..2c66a4b 100644
--- a/Paper/gtk-3.0/widgets/linked-buttons.css
+++ b/Paper/gtk-3.0/widgets/linked-buttons.css
@@ -16,737 +16,88 @@
 * with the Paper GTK theme. If not, see http://www.gnu.org/licenses/.
 */
 
-
-/******************
- * Linked Buttons *
- ******************/
+/*********
+* Linked *
+*********/
 
 /* Middle button */
+.linked entry,
+.linked button,
 .linked .entry,
-.linked .button,
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:insensitive {
-    border-right-width: 0;
+.linked .button {
     border-left-width: 0;
     border-radius: 0;
 }
 
 /* Leftmost button */
+.linked entry:first-child,
+.linked button:first-child,
 .linked .entry:first-child,
 .linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:insensitive:first-child {
-    border-right-width: 0;
-    border-left-width: 1px;
+.linked > GtkComboBox:first-child > .button {
+    border-width: 1px;
     border-bottom-right-radius: 0;
     border-top-right-radius: 0;
+    border-bottom-left-radius: 2.5px;
+    border-top-left-radius: 2.5px;
 }
 
 /* Rightmost button */
+.linked entry:last-child,
+.linked button:last-child,
 .linked .entry:last-child,
 .linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:insensitive:last-child {
-    border-right-width: 1px;
+.linked > GtkComboBox:last-child > .button {
     border-left-width: 0;
+    border-bottom-right-radius: 2.5px;
+    border-top-right-radius: 2.5px;
     border-bottom-left-radius: 0;
     border-top-left-radius: 0;
 }
 
 /* Linked single button */
+.linked entry:only-child,
+.linked button:only-child,
 .linked .entry:only-child,
-.linked .button:only-child,
-.linked .button:active:only-child,
-.linked .button:active:hover:only-child,
-.linked .button:insensitive:only-child {
+.linked .button:only-child {
     border-right-width: 1px;
     border-left-width: 1px;
-    border-radius: 0px;
+    border-radius: 2.5px;
 }
 
 /* Middle button (vertical) */
+.linked.vertical entry,
+.linked.vertical button,
 .linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:insensitive {
-    border-top-width: 0;
+.linked.vertical .button {
+    border-left-width: 1px;
     border-bottom-width: 0;
     border-radius: 0;
 }
 
 /* Top button (vertical) */
+.linked.vertical entry:first-child,
+.linked.vertical button:first-child,
 .linked.vertical .entry:first-child,
-.linked.vertical .button:first-child,
-.linked.vertical .button:active:first-child,
-.linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:insensitive:first-child {
-    border-bottom-width: 0;
-    border-radius: 3px 3px 0 0;
+.linked.vertical .button:first-child {
+    border-radius: 2.5px 2.5px 0 0;
 }
 
 /* Bottom button (vertical) */
+.linked.vertical entry:last-child,
+.linked.vertical button:last-child,
 .linked.vertical .entry:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:insensitive:last-child {
-    border-top-width: 0;
-    border-radius: 0 0 3px 3px;
+.linked.vertical .button:last-child {
+    border-bottom-width: 1px;
+    border-radius: 0 0 2.5px 2.5px;
 }
 
 /* Linked single button (vertical) */
+.linked.vertical entry:only-child,
+.linked.vertical button:only-child,
 .linked.vertical .entry:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:active:only-child,
-.linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:insensitive:only-child {
+.linked.vertical .button:only-child {
     border-top-width: 1px;
     border-bottom-width: 1px;
-    border-radius: 0px;
-}
-
-
-/* Images */
-.linked.button GtkImage {
-    color: @text;
-}
-
-.linked.button:active GtkImage,
-.linked.button:focus GtkImage,
-.linked.button:hover GtkImage {
-    color: @selected_foreground;
-}
-
-.linked.button:backdrop GtkImage,
-.linked.button:backdrop:hover GtkImage,
-.linked.button:active:backdrop GtkImage {
-    color: @backdrop_text;
-    -gtk-image-effect: dim;
-}
-
-.linked.button:insensitive GtkImage {
-    color: @insensitive_text;
-    -gtk-image-effect: dim;
-}
-
-.linked.button:insensitive:backdrop GtkImage {
-    color: mix(@backdrop_text, @insensitive_text, 0.5);
-    -gtk-image-effect: dim;
-}
-
-/* Labels */
-.linked.button GtkLabel {
-    color: @text;
-}
-
-.linked.button:active GtkLabel,
-.linked.button:focus GtkLabel,
-.linked.button:hover GtkLabel {
-    color: @selected_foreground;
-}
-
-.linked.button:backdrop GtkLabel,
-.linked.button:backdrop:hover GtkLabel,
-.linked.button:active:backdrop GtkLabel {
-    color: @backdrop_text;
-}
-
-.linked.button:insensitive GtkLabel {
-    color: @insensitive_text;
-}
-
-.linked.button:insensitive:backdrop GtkLabel {
-    color: mix(@backdrop_text, @insensitive_text, 0.5);
-}
-
-/* Labels */
-.linked.text-button GtkLabel {
-    color: @text;
-}
-
-.linked.text-button:focus GtkLabel {
-    /*color: shade(@text, 2.0);*/
-    color: @text;
-}
-
-.linked.text-button:active GtkLabel,
-.linked.text-button:hover GtkLabel {
-    color: alpha(#000, 0.5);
-    /*color: @text;*/
-}
-
-.linked.text-button:backdrop GtkLabel,
-.linked.text-button:backdrop:hover GtkLabel,
-.linked.text-button:active:backdrop GtkLabel {
-    color: @backdrop_text;
-}
-
-.linked.text-button:insensitive GtkLabel {
-    color: @insensitive_text;
-}
-
-.linked.text-button:insensitive:backdrop GtkLabel {
-    color: mix(@backdrop_text, @insensitive_text, 0.5);
-}
-
-
-/* Images */
-.linked.image-button GtkImage {
-    color: @text;
-}
-
-.linked.image-button:focus GtkImage {
-    /*color: shade(@text, 2.0);*/
-    color: @text;
-}
-
-.linked.image-button:active GtkImage,
-.linked.image-button:hover GtkImage {
-    color: alpha(#000, 0.5);
-    /*color: @text;*/
-}
-
-.linked.image-button:backdrop GtkImage,
-.linked.image-button:backdrop:hover GtkImage,
-.linked.image-button:active:backdrop GtkImage {
-    color: @backdrop_text;
-}
-
-.linked.image-button:insensitive GtkImage {
-    color: @insensitive_text;
-}
-
-.linked.image-button:insensitive:backdrop GtkImage {
-    color: mix(@backdrop_text, @insensitive_text, 0.5);
-}
-
-/* Linked buttons on primary toolbars */
-
-/* Middle button */
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .button.raised.linked:backdrop,
-.primary-toolbar .button.raised.linked:active:backdrop,
-.primary-toolbar .button.raised.linked:focus:backdrop,
-.primary-toolbar .button.raised.linked:hover,
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:insensitive,
-.primary-toolbar .linked .button:backdrop,
-.primary-toolbar .linked .button:active:backdrop,
-.primary-toolbar .linked .button:focus:backdrop,
-.primary-toolbar .linked .button:hover,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar .button:backdrop,
-.inline-toolbar.toolbar .button:hover,
-.inline-toolbar.toolbar .button:active:backdrop,
-.inline-toolbar.toolbar .button:backdrop:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button:backdrop,
-.inline-toolbar.toolbar GtkToolButton > .button:backdrop:active,
-.inline-toolbar.toolbar GtkToolButton > .button:backdrop:insensitive {
-    border-right-width: 0;
-    border-left-width: 0;
-    border-radius: 0;
-}
-
-/* Leftmost button */
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
-.primary-toolbar .button.raised.linked:backdrop:first-child,
-.primary-toolbar .linked .entry:first-child,
-.primary-toolbar .linked .button:first-child,
-.primary-toolbar .linked .button:active:first-child,
-.primary-toolbar .linked .button:insensitive:first-child,
-.primary-toolbar .linked .button:backdrop:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:insensitive:first-child,
-.inline-toolbar.toolbar .button:backdrop:first-child,
-.inline-toolbar.toolbar .button:backdrop:active:first-child,
-.inline-toolbar.toolbar .button:backdrop:insensitive:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:active,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:backdrop,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:backdrop:active,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:backdrop:insensitive {
-    border-left-width: 2px;
-    border-right-width: 0;
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .button.raised.linked:backdrop:last-child,
-.primary-toolbar .linked .entry:last-child,
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .linked .button:active:last-child,
-.primary-toolbar .linked .button:insensitive:last-child,
-.primary-toolbar .linked .button:backdrop:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:backdrop:last-child,
-.inline-toolbar.toolbar .button:backdrop:active:last-child,
-.inline-toolbar.toolbar .button:backdrop:insensitive:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:backdrop,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:backdrop:active,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:backdrop:insensitive {
-    border-left-width: 0;
-    border-right-width: 2px;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-}
-
-/* Single button */
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:insensitive:only-child,
-.inline-toolbar.toolbar .button:backdrop:only-child,
-.inline-toolbar.toolbar .button:backdrop:active:only-child,
-.inline-toolbar.toolbar .button:backdrop:insensitive:only-child,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:active,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:backdrop,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:backdrop:active,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:backdrop:insensitive {
-    border-right-width: 2px;
-    border-left-width: 2px;
-    border-radius: 3px;
-}
-
-/* Special-case GtkMenuToolButton, since it's a GtkToolButton, but it
- * has a box inside to pack the button and the actual menu */
-.inline-toolbar.toolbar GtkMenuToolButton .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:backdrop:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:backdrop:insensitive:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:backdrop:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:backdrop:insensitive:last-child {
-    border-right-width: 0;
-    border-left-width: 0;
-    border-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:backdrop:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:backdrop:insensitive:first-child {
-    border-left-width: 2px;
-    border-right-width: 0;
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:insensitive:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:backdrop:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:backdrop:insensitive:last-child {
-    border-left-width: 0;
-    border-right-width: 2px;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-}
-
-/* Vertical inline toolbars */
-
-/* Middle button */
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:backdrop,
-.inline-toolbar.toolbar.vertical .button:backdrop:active,
-.inline-toolbar.toolbar.vertical .button:backdrop:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:backdrop,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:backdrop:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:backdrop:insensitive {
-    border-bottom-width: 0;
-    border-top-width: 0;
-    border-radius: 0;
-}
-
-/* Topmost button */
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:active:first-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:first-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:first-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:active:first-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:insensitive:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:backdrop,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:backdrop:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:backdrop:insensitive {
-    border-width: 1px 1px 0 1px;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-/* Bottommost button */
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:active:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:last-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:active:last-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:insensitive:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:backdrop,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:backdrop:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:backdrop:insensitive {
-    border-width: 0 1px 2px 1px;
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-}
-
-/* Single button */
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical .button:active:only-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:only-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:only-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:active:only-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:insensitive:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:backdrop,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:backdrop:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:backdrop:insensitive {
-    border-top-width: 1px;
-    border-bottom-width: 2px;
-    border-radius: 3px;
-}
-
-/* Middle button */
-.linked .entry,
-.linked .button,
-.linked .button:active,
-.linked .button:backdrop,
-.linked .button:active:hover,
-.linked .button:insensitive {
-    border-right-width: 0;
-    border-left-width: 0;
-    border-radius: 0;
-}
-
-/* Leftmost button */
-.linked .entry:first-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:insensitive:first-child {
-    border-right-width: 0;
-    border-left-width: 1px;
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.linked .entry:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:insensitive:last-child {
-    border-right-width: 1px;
-    border-left-width: 0;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-}
-
-/* Linked single button */
-.linked .entry:only-child,
-.linked .button:only-child,
-.linked .button:active:only-child,
-.linked .button:active:hover:only-child,
-.linked .button:insensitive:only-child {
-    border-right-width: 1px;
-    border-left-width: 1px;
-    border-radius: 0px;
-}
-
-/* Middle button (vertical) */
-.linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:insensitive {
-    border-top-width: 0;
-    border-bottom-width: 0;
-    border-radius: 0;
-}
-
-/* Top button (vertical) */
-.linked.vertical .entry:first-child,
-.linked.vertical .button:first-child,
-.linked.vertical .button:active:first-child,
-.linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:insensitive:first-child {
-    border-bottom-width: 0;
-    border-radius: 3px 3px 0 0;
-}
-
-/* Bottom button (vertical) */
-.linked.vertical .entry:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:insensitive:last-child {
-    border-top-width: 0;
-    border-radius: 0 0 3px 3px;
-}
-
-/* Linked single button (vertical) */
-.linked.vertical .entry:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:active:only-child,
-.linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:insensitive:only-child {
-    border-top-width: 1px;
-    border-bottom-width: 1px;
-    border-radius: 0px;
-}
-/* Linked buttons on primary toolbars */
-
-/* Middle button */
-.primary-toolbar .button.raised.linked,
-.primary-toolbar .button.raised.linked:active,
-.primary-toolbar .button.raised.linked:insensitive,
-.primary-toolbar .button.raised.linked:backdrop,
-.primary-toolbar .linked .entry,
-.primary-toolbar .linked .button,
-.primary-toolbar .linked .button:active,
-.primary-toolbar .linked .button:insensitive,
-.primary-toolbar .linked .button:backdrop,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar .button:backdrop,
-.inline-toolbar.toolbar .button:backdrop:active,
-.inline-toolbar.toolbar .button:backdrop:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton > .button:backdrop,
-.inline-toolbar.toolbar GtkToolButton > .button:backdrop:active,
-.inline-toolbar.toolbar GtkToolButton > .button:backdrop:insensitive {
-    border-right-width: 0;
-    border-left-width: 0;
-    border-radius: 0;
-}
-
-/* Leftmost button */
-.primary-toolbar .button.raised.linked:first-child,
-.primary-toolbar .button.raised.linked:active:first-child,
-.primary-toolbar .button.raised.linked:insensitive:first-child,
-.primary-toolbar .button.raised.linked:backdrop:first-child,
-.primary-toolbar .linked .entry:first-child,
-.primary-toolbar .linked .button:first-child,
-.primary-toolbar .linked .button:active:first-child,
-.primary-toolbar .linked .button:insensitive:first-child,
-.primary-toolbar .linked .button:backdrop:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar .button:active:first-child,
-.inline-toolbar.toolbar .button:insensitive:first-child,
-.inline-toolbar.toolbar .button:backdrop:first-child,
-.inline-toolbar.toolbar .button:backdrop:active:first-child,
-.inline-toolbar.toolbar .button:backdrop:insensitive:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:active,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:backdrop,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:backdrop:active,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button:backdrop:insensitive {
-    border-left-width: 2px;
-    border-right-width: 0;
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
-}
-
-/* Rightmost button */
-.primary-toolbar .button.raised.linked:last-child,
-.primary-toolbar .button.raised.linked:active:last-child,
-.primary-toolbar .button.raised.linked:insensitive:last-child,
-.primary-toolbar .button.raised.linked:backdrop:last-child,
-.primary-toolbar .linked .entry:last-child,
-.primary-toolbar .linked .button:last-child,
-.primary-toolbar .linked .button:active:last-child,
-.primary-toolbar .linked .button:insensitive:last-child,
-.primary-toolbar .linked .button:backdrop:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar .button:active:last-child,
-.inline-toolbar.toolbar .button:insensitive:last-child,
-.inline-toolbar.toolbar .button:backdrop:last-child,
-.inline-toolbar.toolbar .button:backdrop:active:last-child,
-.inline-toolbar.toolbar .button:backdrop:insensitive:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:backdrop,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:backdrop:active,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:backdrop:insensitive {
-    border-left-width: 0;
-    border-right-width: 2px;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-}
-
-/* Single button */
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar .button:active:only-child,
-.inline-toolbar.toolbar .button:insensitive:only-child,
-.inline-toolbar.toolbar .button:backdrop:only-child,
-.inline-toolbar.toolbar .button:backdrop:active:only-child,
-.inline-toolbar.toolbar .button:backdrop:insensitive:only-child,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:active,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:backdrop,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:backdrop:active,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button:backdrop:insensitive {
-    border-right-width: 2px;
-    border-left-width: 2px;
-    border-radius: 3px;
-}
-
-/* Special-case GtkMenuToolButton, since it's a GtkToolButton, but it
- * has a box inside to pack the button and the actual menu */
-.inline-toolbar.toolbar GtkMenuToolButton .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:backdrop:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:backdrop:insensitive:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:backdrop:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton .button:backdrop:insensitive:last-child {
-    border-right-width: 0;
-    border-left-width: 0;
-    border-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:active:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:insensitive:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:backdrop:first-child,
-.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:backdrop:insensitive:first-child {
-    border-left-width: 2px;
-    border-right-width: 0;
-    border-bottom-right-radius: 0;
-    border-top-right-radius: 0;
-}
-
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:active:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:insensitive:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:backdrop:last-child,
-.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:backdrop:insensitive:last-child {
-    border-left-width: 0;
-    border-right-width: 2px;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
-}
-
-/* Vertical inline toolbars */
-
-/* Middle button */
-.inline-toolbar.toolbar.vertical .button,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:insensitive,
-.inline-toolbar.toolbar.vertical .button:backdrop,
-.inline-toolbar.toolbar.vertical .button:backdrop:active,
-.inline-toolbar.toolbar.vertical .button:backdrop:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:backdrop,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:backdrop:active,
-.inline-toolbar.toolbar.vertical GtkToolButton > .button:backdrop:insensitive {
-    border-bottom-width: 0;
-    border-top-width: 0;
-    border-radius: 0;
-}
-
-/* Topmost button */
-.inline-toolbar.toolbar.vertical .button:first-child,
-.inline-toolbar.toolbar.vertical .button:active:first-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:first-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:first-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:active:first-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:insensitive:first-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:backdrop,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:backdrop:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:backdrop:insensitive {
-    border-width: 1px 1px 0 1px;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-/* Bottommost button */
-.inline-toolbar.toolbar.vertical .button:last-child,
-.inline-toolbar.toolbar.vertical .button:active:last-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:last-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:last-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:active:last-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:insensitive:last-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:backdrop,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:backdrop:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:backdrop:insensitive {
-    border-width: 0 1px 2px 1px;
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-}
-
-/* Single button */
-.inline-toolbar.toolbar.vertical .button:only-child,
-.inline-toolbar.toolbar.vertical .button:active:only-child,
-.inline-toolbar.toolbar.vertical .button:insensitive:only-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:only-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:active:only-child,
-.inline-toolbar.toolbar.vertical .button:backdrop:insensitive:only-child,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:backdrop,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:backdrop:active,
-.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:backdrop:insensitive {
-    border-top-width: 1px;
-    border-bottom-width: 2px;
-    border-radius: 3px;
+    border-radius: 2.5px;
 }
\ No newline at end of file
diff --git a/Paper/gtk-3.0/widgets/notebook.css b/Paper/gtk-3.0/widgets/notebook.css
index c8f7b46..91f4d75 100644
--- a/Paper/gtk-3.0/widgets/notebook.css
+++ b/Paper/gtk-3.0/widgets/notebook.css
@@ -175,17 +175,12 @@
 }
 
 /* Hover */
-.notebook tab.top:hover {
-    box-shadow:inset 0 -3px 0 0 @border;
-}
-.notebook tab.bottom:hover {
-    box-shadow:inset 0 3px 0 0 @border;
-}
-.notebook tab.left:hover {
-    box-shadow:inset -3px 0 0 0 @border;
-}
+.notebook tab.top:hover,
+.notebook tab.bottom:hover,
+.notebook tab.left:hover,
 .notebook tab.right:hover {
-    box-shadow:inset 3px 0 0 0 @border;
+    box-shadow: none;
+    background: shade(@background, 0.95);
 }
 
 /* Active */
diff --git a/Paper/gtk-3.0/widgets/popovers.css b/Paper/gtk-3.0/widgets/popovers.css
index 1b1a572..d32e144 100644
--- a/Paper/gtk-3.0/widgets/popovers.css
+++ b/Paper/gtk-3.0/widgets/popovers.css
@@ -26,7 +26,7 @@ GtkPopover {
     border-radius: 6px;
     background-clip: border-box;
     background-color: @background;
-    border: 1px solid alpha(#000, 0.1);
+    border: 1px solid alpha(#000, 0.3);
     box-shadow: 0 2px 3px 2px @menu_shadow;
     margin: 10px;
     color: @text;
diff --git a/src/render-gnome-shell-assets.py b/src/render-gnome-shell-assets.py
index ea682df..b6ee96a 100755
--- a/src/render-gnome-shell-assets.py
+++ b/src/render-gnome-shell-assets.py
@@ -9,7 +9,7 @@ import subprocess
 
 INKSCAPE = '/usr/bin/inkscape'
 OPTIPNG = '/usr/bin/optipng'
-MAINDIR = 'Paper'
+MAINDIR = '../Paper'
 SRC = os.path.join('.', 'gnome-shell')
 
 inkscape_process = None
diff --git a/src/render-gtk3-assets-hidpi.py b/src/render-gtk3-assets-hidpi.py
index 73068ae..c192073 100755
--- a/src/render-gtk3-assets-hidpi.py
+++ b/src/render-gtk3-assets-hidpi.py
@@ -9,6 +9,7 @@ import subprocess
 
 INKSCAPE = '/usr/bin/inkscape'
 OPTIPNG = '/usr/bin/optipng'
+MAINDIR = '../Paper'
 SRC = os.path.join('.', 'gtk3')
 
 inkscape_process = None
@@ -134,7 +135,7 @@ class ContentHandler(xml.sax.ContentHandler):
                 height = rect['height']
                 id = rect['id']
 
-                dir = os.path.join("Paper", "gtk-3.0", self.context)
+                dir = os.path.join(MAINDIR, "gtk-3.0", self.context)
                 outfile = os.path.join(dir, self.icon_name+'@2'+'.png')
                 if not os.path.exists(dir):
                     os.makedirs(dir)
@@ -158,8 +159,8 @@ class ContentHandler(xml.sax.ContentHandler):
         self.chars += chars.strip()
 
 if len(sys.argv) == 1:
-    if not os.path.exists('Paper'):
-        os.mkdir('Paper')
+    if not os.path.exists(MAINDIR):
+        os.mkdir(MAINDIR)
     print ('Rendering from SVGs in', SRC)
     for file in os.listdir(SRC):
         if file[-4:] == '.svg':
diff --git a/src/render-gtk3-assets.py b/src/render-gtk3-assets.py
index 76e7c00..1ab6f9f 100755
--- a/src/render-gtk3-assets.py
+++ b/src/render-gtk3-assets.py
@@ -9,6 +9,7 @@ import subprocess
 
 INKSCAPE = '/usr/bin/inkscape'
 OPTIPNG = '/usr/bin/optipng'
+MAINDIR = '../Paper'
 SRC = os.path.join('.', 'gtk3')
 
 inkscape_process = None
@@ -133,7 +134,7 @@ class ContentHandler(xml.sax.ContentHandler):
                 height = rect['height']
                 id = rect['id']
 
-                dir = os.path.join("Paper", "gtk-3.0", self.context)
+                dir = os.path.join(MAINDIR, "gtk-3.0", self.context)
                 outfile = os.path.join(dir, self.icon_name+'.png')
                 if not os.path.exists(dir):
                     os.makedirs(dir)
@@ -157,8 +158,8 @@ class ContentHandler(xml.sax.ContentHandler):
         self.chars += chars.strip()
 
 if len(sys.argv) == 1:
-    if not os.path.exists('Paper'):
-        os.mkdir('Paper')
+    if not os.path.exists(MAINDIR):
+        os.mkdir(MAINDIR)
     print ('Rendering from SVGs in', SRC)
     for file in os.listdir(SRC):
         if file[-4:] == '.svg':
diff --git a/src/render-wm-assets-hidpi.py b/src/render-wm-assets-hidpi.py
index 0c2f797..2984765 100755
--- a/src/render-wm-assets-hidpi.py
+++ b/src/render-wm-assets-hidpi.py
@@ -9,6 +9,7 @@ import subprocess
 
 INKSCAPE = '/usr/bin/inkscape'
 OPTIPNG = '/usr/bin/optipng'
+MAINDIR = '../Paper'
 SRC = os.path.join('.', 'wm')
 
 inkscape_process = None
@@ -133,7 +134,7 @@ class ContentHandler(xml.sax.ContentHandler):
                 height = rect['height']
                 id = rect['id']
 
-                dir = os.path.join("Paper", self.context)
+                dir = os.path.join(MAINDIR, self.context)
                 outfile = os.path.join(dir, self.icon_name+'.png')
                 if not os.path.exists(dir):
                     os.makedirs(dir)
@@ -157,8 +158,8 @@ class ContentHandler(xml.sax.ContentHandler):
         self.chars += chars.strip()
 
 if len(sys.argv) == 1:
-    if not os.path.exists('Paper'):
-        os.mkdir('Paper')
+    if not os.path.exists(MAINDIR):
+        os.mkdir(MAINDIR)
     print ('Rendering from SVGs in', SRC)
     for file in os.listdir(SRC):
         if file[-4:] == '.svg':
diff --git a/src/render-wm-assets.py b/src/render-wm-assets.py
index e7a9f17..488437e 100755
--- a/src/render-wm-assets.py
+++ b/src/render-wm-assets.py
@@ -9,6 +9,7 @@ import subprocess
 
 INKSCAPE = '/usr/bin/inkscape'
 OPTIPNG = '/usr/bin/optipng'
+MAINDIR = '../Paper'
 SRC = os.path.join('.', 'wm')
 
 inkscape_process = None
@@ -133,7 +134,7 @@ class ContentHandler(xml.sax.ContentHandler):
                 height = rect['height']
                 id = rect['id']
 
-                dir = os.path.join("Paper", self.context)
+                dir = os.path.join(MAINDIR, self.context)
                 outfile = os.path.join(dir, self.icon_name+'.png')
                 if not os.path.exists(dir):
                     os.makedirs(dir)
@@ -157,8 +158,8 @@ class ContentHandler(xml.sax.ContentHandler):
         self.chars += chars.strip()
 
 if len(sys.argv) == 1:
-    if not os.path.exists('Paper'):
-        os.mkdir('Paper')
+    if not os.path.exists(MAINDIR):
+        os.mkdir(MAINDIR)
     print ('Rendering from SVGs in', SRC)
     for file in os.listdir(SRC):
         if file[-4:] == '.svg':