diff --git a/Paper/gtk-3.0/widgets/header-bar.css b/Paper/gtk-3.0/widgets/header-bar.css
index 71b4620..d20eb93 100644
--- a/Paper/gtk-3.0/widgets/header-bar.css
+++ b/Paper/gtk-3.0/widgets/header-bar.css
@@ -24,7 +24,7 @@
 .header-bar {
     padding:0;
     border: none;
-    border-radius: 0;
+    border-radius: 2px 2px 0 0;
     background-color: @header;
     color: @header_text;
     box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1),
@@ -53,7 +53,7 @@
 .header-bar .title {
     padding-left: 13px;
     padding-right: 13px;
-    font: Bold 11;
+    font: Bold 10;
     color: @header_text;
 }
 
@@ -103,7 +103,6 @@
     background-color: transparent;
     background-image: none;
     box-shadow: none;
-    transition: all 300ms cubic-bezier(0.3, 0.5, 0.5, 0.9);
 }
 
 /* Normal Button */
@@ -141,7 +140,7 @@
 }
 
 .header-bar .text-button:active {
-    font: Bold 11;
+    font: Bold 10;
 }
 
 /* Checked Button */
@@ -161,7 +160,7 @@
 }
 
 .header-bar .text-button:checked {
-    font: Bold 11;
+    font: Bold 10;
 }
 
 /* Focus Button */
@@ -254,7 +253,7 @@
 }
 
 .header-bar .text-button:active:backdrop {
-    font: Bold 11;
+    font: Bold 10;
 }
 
 /* Backdrop:Hover Button */
diff --git a/Paper/gtk-3.0/widgets/message-dialogs.css b/Paper/gtk-3.0/widgets/message-dialogs.css
index 1dda699..5446151 100644
--- a/Paper/gtk-3.0/widgets/message-dialogs.css
+++ b/Paper/gtk-3.0/widgets/message-dialogs.css
@@ -22,7 +22,7 @@
 
 .message-dialog {
     padding: 0px;
-    border-radius: 0px;
+    border-radius: 4px;
     border: none;
     outline: none;
     box-shadow: none;
@@ -32,32 +32,54 @@
     border-bottom-right-radius: 6px;
 }
 
-.message-dialog.csd.background {
-    background: none;
-    box-shadow: none;
+.window-frame.message-dialog,
+.window-frame.message-dialog:backdrop {
+    border-radius: 4px;
 }
 
-.message-dialog:backdrop {
-    background-color: @backdrop_background;
+.message-dialog.csd  {
+    border-radius: 0 0 4px 4px;
+    background: @background;
+    box-shadow: 0 3px 6px alpha (#000, 0.16),
+                0 3px 6px alpha (#000, 0.23);
+    margin: 0;
 }
 
-
-.message-dialog .titlebar {
-    padding: 0px;
-    border-top-left-radius: 0px;
-    border-top-right-radius: 0px;
+.message-dialog .titlebar,
+.message-dialog .header-bar {
+    padding:0;
     border: none;
-    background-color: @background;
-    color: @text;
+    border-radius: 4px 4px 0 0;
+    background-color: @header;
+    color: @header_text;
+    box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1),
+                inset 0 -1px 0 0 rgba(0,0,0,0.1),
+                inset 0 -3px 3px -4px alpha(#000, 0.4);
 }
 
-.message-dialog .titlebar:backdrop {
-    background-color: @backdrop_background;
+
+.message-dialog .titlebar:backdrop,
+.message-dialog .header-bar:backdrop {
+    background-image: none;
+    background-color: @backdrop_header;
+    color: @backdrop_header_text;
+}
+
+.message-dialog .titlebar:insensitive,
+.message-dialog .header-bar:insensitive {
+    color: @insensitive_header_text;
+}
+
+.message-dialog.csd.background {
+    padding: 0px;
+    margin: 0px;
+    background: @background;
+    box-shadow: none;
 }
 
 .message-dialog .titlebar .title {
     padding: 0px;
-    color: @text;
+    color: @header_text;
 }
 
 .message-dialog .titlebar .title:backdrop {
@@ -66,44 +88,53 @@
 
 
 /* Buttons */
+.message-dialog.csd .dialog-action-area {
+    padding: 0;
+}
+
 .message-dialog .dialog-action-area .button {
     border-radius: 0;
+    padding: 0;
+    font: bold;
     /*padding: 8px;*/
 }
 
 .message-dialog.csd .dialog-action-area .button {
-    padding: 12px;
     border-radius: 0;
-    border: 1px solid @button_border;
-    background-color: @button_background;
+    border: none;
+    background-image: none;
+    background-color: none;
     color: @text;
 }
 
 .message-dialog.csd .dialog-action-area .button:hover {
-    border-color: shade(@selection, 1.2);
-    background-color: shade(@selection, 1.2);
-    color: @selected_foreground;}
+    border: none;
+    background-image: none;
+    background-color: none;
+    color: @selection;
+}
 
 .message-dialog.csd .dialog-action-area .button:active {
-    border-color: @selection;
-    background-color: @selection;
-    color: @selected_foreground;
+    border: none;
+    background-image: none;
+    background-color: none;
+    color: @text;
 }
 
 .message-dialog.csd .dialog-action-area .button:insensitive {
-    border: 1px solid @insensitive_border;
+    border: 0px solid @insensitive_border;
     background-color: @insensitive_background;
     color: @insensitive_text;
 }
 
 .message-dialog.csd .dialog-action-area .button:backdrop {
-    border: 1px solid @backdrop_border;
+    border: 0px solid @backdrop_border;
     background-color: @backdrop_background;
     color: @backdrop_text;
 }
 
 .message-dialog.csd .dialog-action-area .button:backdrop:insensitive {
-    border: 1px solid mix(@insensitive_border, @backdrop_border, 0.5);
+    border: 0px solid mix(@insensitive_border, @backdrop_border, 0.5);
     background-color: mix(@insensitive_background, @backdrop_background, 0.5);
     color: mix(@insensitive_text, @backdrop_text, 0.5);
 }
@@ -118,37 +149,37 @@
 
 /* Suggested Action Button */
 .message-dialog.csd .dialog-action-area .button.suggested-action {
-    border: 1px solid @suggested_action_button;
+    border: 0px solid @suggested_action_button;
     background-color: @suggested_action_button;
     color: @suggested_action_button_foreground;
 }
 
 .message-dialog.csd .dialog-action-area .button.suggested-action:hover {
-    border: 1px solid shade(@suggested_action_button, 1.2);
+    border: 0px solid shade(@suggested_action_button, 1.2);
     background-color: shade(@suggested_action_button, 1.2);
     color: @suggested_action_button_foreground;
 }
 
 .message-dialog.csd .dialog-action-area .button.suggested-action:active {
-    border: 1px solid shade(@suggested_action_button, 1.1);
+    border: 0px solid shade(@suggested_action_button, 1.1);
     background-color: shade(@suggested_action_button, 1.1);
     color: @suggested_action_button_foreground;
 }
 
 .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop {
-    border: 1px solid @backdrop_border;
+    border: 0px solid @backdrop_border;
     background-color: @backdrop_background;
     color: @backdrop_text;
 }
 
 .message-dialog.csd .dialog-action-area .button.suggested-action:insensitive {
-    border: 1px solid @insensitive_border;
+    border: 0px solid @insensitive_border;
     background-color: @insensitive_background;
     color: @insensitive_text;
 }
 
 .message-dialog.csd .dialog-action-area .button.suggested-action:backdrop:insensitive {
-    border: 1px solid mix(@insensitive_border, @backdrop_border, 0.5);
+    border: 0px solid mix(@insensitive_border, @backdrop_border, 0.5);
     background-color: mix(@insensitive_background, @backdrop_background, 0.5);
     color: mix(@insensitive_text, @backdrop_text, 0.5);
 }
@@ -162,37 +193,37 @@
 
 /* Destructive Action Button */
 .message-dialog.csd .dialog-action-area .button.destructive-action {
-    border: 1px solid @destructive_action_button_border;
+    border: 0px solid @destructive_action_button_border;
     background-color: @destructive_action_button;
     color: @destructive_action_button_foreground;
 }
 
 .message-dialog.csd .dialog-action-area .button.destructive-action:hover {
-    border: 1px solid shade(@destructive_action_button_border, 1.1);
+    border: 0px solid shade(@destructive_action_button_border, 1.1);
     background-color: shade(@destructive_action_button, 1.1);
     color: @destructive_action_button_foreground;
 }
 
 .message-dialog.csd .dialog-action-area .button.destructive-action:active {
-    border: 1px solid @destructive_action_button_border;
+    border: 0px solid @destructive_action_button_border;
     background-color: @destructive_action_button;
     color: @destructive_action_button_foreground;
 }
 
 .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop {
-    border: 1px solid @backdrop_border;
+    border: 0px solid @backdrop_border;
     background-color: @backdrop_background;
     color: @backdrop_text;
 }
 
 .message-dialog.csd .dialog-action-area .button.destructive-action:insensitive {
-    border: 1px solid @insensitive_border;
+    border: 0px solid @insensitive_border;
     background-color: @insensitive_background;
     color: @insensitive_text;
 }
 
 .message-dialog.csd .dialog-action-area .button.destructive-action:backdrop:insensitive {
-    border: 1px solid mix(@insensitive_border, @backdrop_border, 0.5);
+    border: 0px solid mix(@insensitive_border, @backdrop_border, 0.5);
     background-color: mix(@insensitive_background, @backdrop_background, 0.5);
     color: mix(@insensitive_text, @backdrop_text, 0.5);
 }
diff --git a/Paper/gtk-3.0/widgets/titlebar.css b/Paper/gtk-3.0/widgets/titlebar.css
index 81e3e3f..e3526aa 100644
--- a/Paper/gtk-3.0/widgets/titlebar.css
+++ b/Paper/gtk-3.0/widgets/titlebar.css
@@ -23,7 +23,7 @@
 .titlebar {
     padding:0;
     border: none;
-    border-radius: 0;
+    border-radius: 2px 2px 0 0;
     background-color: @header;
     color: @header_text;
     box-shadow: inset 0 1px 0 0 rgba(255,255,255,0.1),
@@ -59,7 +59,7 @@
     padding-left: 13px;
     padding-right: 13px;
     color: @header_text;
-    font: Bold 11;
+    font: Bold 10;
 }
 
 /* Subtitle */
@@ -99,7 +99,6 @@
 .titlebar .image-button {
     background-color: transparent;
     background-image: none;
-    transition: all 300ms cubic-bezier(0.3, 0.5, 0.5, 0.9);
 }
 
 /* Normal Button */
@@ -137,7 +136,7 @@
 }
 
 .titlebar .text-button:active {
-    font: Bold 11;
+    font: Bold 10;
 }
 
 /* Checked Button */
@@ -157,7 +156,7 @@
 }
 
 .titlebar .text-button:checked {
-    font: Bold 11;
+    font: Bold 10;
 }
 
 /* Focus Button */
@@ -249,7 +248,7 @@
 }
 
 .titlebar .text-button:active:backdrop {
-    font: Bold 11;
+    font: Bold 10;
 }
 
 /* Backdrop:Hover; Button */
diff --git a/Paper/gtk-3.0/widgets/toolbars.css b/Paper/gtk-3.0/widgets/toolbars.css
index 74c8cce..e76c1cc 100644
--- a/Paper/gtk-3.0/widgets/toolbars.css
+++ b/Paper/gtk-3.0/widgets/toolbars.css
@@ -353,6 +353,7 @@
     border: none;
     border-radius: 0px;
     background-color:@toolbar;
+    box-shadow: none;
     color: @toolbar_text;
 }
 
@@ -369,7 +370,7 @@
 
 .primary-toolbar.toolbar .entry:insensitive {
     border: none;
-    background-color:@insensitive_base;
+    background-color:@toolbar;
     color: @insensitive_toolbar_text;
     border: solid @insensitive_toolbar_text;
     border-bottom-width: 1px;
@@ -377,7 +378,7 @@
 
 .primary-toolbar.toolbar .entry:backdrop {
     border: none;
-    background-color:@backdrop_base;
+    background-color:@toolbar;
     color: @backdrop_toolbar_text;
     border: solid @backdrop_toolbar_text;
     border-bottom-width: 1px;
diff --git a/Paper/gtk-3.0/widgets/windows.css b/Paper/gtk-3.0/widgets/windows.css
index ef77eb8..e105dc6 100644
--- a/Paper/gtk-3.0/widgets/windows.css
+++ b/Paper/gtk-3.0/widgets/windows.css
@@ -25,11 +25,46 @@
 
 .window-frame {
 	border:none;
+    border-radius: 2px;
     box-shadow: 0 2px 5px 1px @window_shadow;
     margin: 10px; /* this is used for the resize cursor area */
 }
 
 .window-frame:backdrop {
-	border-radius: 0px;
+    border-radius: 2px;
     box-shadow: 0 2px 3px 0 @backdrop_window_shadow;
 }
+
+.window-frame.menu.csd,
+.window-frame.popup.csd {
+    border-radius: 2px;
+    box-shadow: 0 3px 6px alpha (#000, 0.16),
+                0 3px 6px alpha (#000, 0.23);
+    margin: 0;
+}
+
+.menu .window-frame.menu.csd,
+.menu .window-frame.popup.csd {
+    box-shadow: 0 10px 20px alpha (#000, 0.19),
+                0 6px 6px alpha (#000, 0.23);
+}
+
+.window-frame.tooltip.csd {
+    border-radius: 2px;
+    box-shadow: none;
+    margin: 0;
+}
+
+.window-frame:backdrop {
+    box-shadow: 0 3px 6px alpha (#000, 0.16),
+                0 3px 6px alpha (#000, 0.23);
+}
+
+GtkDialog.window-frame,
+GtkDialog.window-frame:backdrop,
+.window-frame.dialog,
+.window-frame.dialog:backdrop {
+    border-radius: 2px;
+    box-shadow: 0 10px 20px alpha (#000, 0.19),
+                0 6px 6px alpha (#000, 0.23);
+}
\ No newline at end of file