--- darkmint-gtk-theme-2.0.0.orig/gtk-3.20/gtk.css
+++ darkmint-gtk-theme-2.0.0/gtk-3.20/gtk.css
@@ -1,6 +1,7 @@
 /**
  * DarkMint GTK Theme
  * @author originalseed
+ * @since 2018-06-01
  * 
  * For dev
  * sudo apt-get install gtk-3-examples
@@ -1073,7 +1074,8 @@ scrolledwindow viewport.frame {
  * Buttons *
  ***********/
 
-button {
+button ,
+popover.background button {
     padding: 3px;
     color: @theme_text_color;
 	border: solid;
@@ -1086,7 +1088,8 @@ button {
 
 button:disabled,
 combobox button.combo:disabled,
-toolbar combobox button.combo:disabled {
+toolbar combobox button.combo:disabled,
+popover.background button:disabled {
 border: solid;
     background-image: url("darkelements/column-header.png");
     border-image: url("darkelements/button-normal-border.png") 2 2 2 2 / 2px 2px 2px 2px stretch stretch;
@@ -1249,11 +1252,11 @@ button {
 	background-color: transparent;
 }
 
-/* We want anything inside the buttons to use their background */
+/* We want anything inside the buttons to use their background
 button * {
     background-color: transparent;
 }
-
+*/
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
 GtkMenuToolButton *,
 toolbar.primary-toolbar button,
@@ -1273,7 +1276,8 @@ toolbar.primary-toolbar button:checked,
 toolbar.inline-toolbar button:checked,
 button:checked,
 button:checked:focus,
-button:focus {
+button:focus,
+popover.background button:focus {
     padding: 3px;
     color: @theme_text_color;
 	border: solid;
@@ -1714,7 +1718,8 @@ toolbar .raised button:hover,
 toolbar combobox button.combo:hover,
 toolbar.primary-toolbar button:hover,
 toolbar.primary-toolbar combobox button.combo:hover,
-colorchooser #add-color-button:hover {
+colorchooser #add-color-button:hover,
+popover.background button:hover {
 	border: solid;
     background-image: url("darkelements/button-hover.png");
     border-image: url("darkelements/button-hover-border.png") 2 2 2 2 / 2px 2px 2px 2px stretch stretch;
@@ -2451,7 +2456,7 @@ scrollbar.vertical .slider:hover {
 
 scrollbar.horizontal slider,
 scrollbar.horizontal .slider {
-    min-height: 16px;
+    
     border: solid;
  	border-image: url("darkelements/scrollbars/slider-horiz.png") 8 2 8 2 / 8px 2px 8px 2px stretch stretch;
     border-width: 8px 2px;
@@ -2511,7 +2516,8 @@ treemenu menuitem {
 }
 
 menu,
-.menu {
+.menu, 
+.context-menu {
     background-image: url("darkelements/menu-bg.png"); 
 	border: solid;
     border-image: url("darkelements/menu-border.png") 5 5 5 23 / 5px 5px 5px 23px stretch stretch; 
@@ -3902,13 +3908,9 @@ headerbar {
     padding-left: 5px;
     padding-right: 5px;
 	border-radius: 0;
+	min-height: 40px;
 }
 
-headerbar,
-.titlebar {
-   border-color: shade(@border_color, 1.30);
-    padding: 5px 4px 4px 4px;
-}
 
 /* fix for gedit, .titlebar does not match headerbar selector */
 .background.csd > paned.horizontal.titlebar,
@@ -3955,6 +3957,10 @@ decoration:backdrop {
 /*    box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px*/
     box-shadow: none;
 }
+decoration {
+	border-radius: 0;
+  	border-width: 0;
+}
 
 .tiled decoration {
     border-radius: 0;
@@ -3978,9 +3984,11 @@ decoration:backdrop {
     box-shadow: none;
 }
 
+
 messagedialog.csd decoration {
-    border-radius: 7px;
+    border-radius: 0;
     box-shadow: 0 1px 5px @wm_shadow;
+	background-color: @theme_bg_color;
 }
 
 /**************
@@ -4002,25 +4010,18 @@ popover.background {
   background-clip: initial;
   margin: 10px;
   padding: 2px;
-  border: 1px solid darker(@theme_base_color);
-  border-radius: 3px;
+  border: 1px solid #3D3D3D;
+  border-radius: 0;
   background-color: @theme_bg_color;
   box-shadow: 0 1px 5px #000000;
   text-shadow: none;
   -gtk-icon-shadow: none;
 }
-
-.popover {
-  background-clip: initial;
-  margin: 10px;
-  padding: 2px;
-  border: 1px solid darker(@theme_base_color);
-  border-radius: 3px;
-  background-color: @theme_bg_color;
-  box-shadow: 0 1px 5px #000000;
-  text-shadow: none;
-  -gtk-icon-shadow: none;
+popover.background separator {
+    margin: 3px; 
 }
+
+
 .popover > .list, 
 .popover > .view,
 .popover > .toolbar .popover.osd > .toolbar, 
@@ -4169,6 +4170,11 @@ modelbutton.flat:selected {
     color: @theme_selected_fg_color;
 }
 
+modelbutton:hover {
+	background-color: @selected_bg_color;
+}
+
+
 popover separator {
 	border-image: url("darkelements/line-h.png") 0 0 2 0  stretch ;
 	border-width:  0 0 2px 0;
--- darkmint-gtk-theme-2.0.0.orig/metacity-1/metacity-theme-1.xml
+++ darkmint-gtk-theme-2.0.0/metacity-1/metacity-theme-1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <metacity_theme>
 <info>
-  <name>DarkCold</name>
+  <name>DarkMint</name>
   <author>OriginalSeed</author>
   <copyright>GPL</copyright>
   <date>Jun, 2011</date>
--- darkmint-gtk-theme-2.0.0.orig/metacity-1/metacity-theme-3.xml
+++ darkmint-gtk-theme-2.0.0/metacity-1/metacity-theme-3.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <metacity_theme>
 <info>
-	<name>Arc</name>
-	<author>horst3180</author>
-	<copyright>horst3180</copyright>
+	<name>DarkMint</name>
+	<author>OriginalSeed</author>
+	<copyright>GPL</copyright>
 	<date>2015</date>
-	<description>Arc Metacity theme</description>
+	<description>DarkMint based on Arc Metacity theme</description>
 </info>
 
 <!-- meaningfull constants -->
