diff --git a/xfwm4/bottom-active.xpm b/xfwm4/bottom-active.xpm
index e3441eb..e3c2cdc 100644
--- a/xfwm4/bottom-active.xpm
+++ b/xfwm4/bottom-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * bottom_active_xpm[] = {
-"48 12 3 1",
+"48 0 3 1",
 "       c None",
 "#      c #C0C0C0 s active_color_2",
 "@      c #C0C0FF s active_color_2",
diff --git a/xfwm4/bottom-inactive.xpm b/xfwm4/bottom-inactive.xpm
index d34fa58..be01f49 100644
--- a/xfwm4/bottom-inactive.xpm
+++ b/xfwm4/bottom-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * bottom_inactive_xpm[] = {
-"48 12 3 1",
+"48 0 3 1",
 "       c None",
 "#      c #C0C0C0 s inactive_color_2",
 "@      c #C0C0FF s inactive_color_2",
diff --git a/xfwm4/close-active.xpm b/xfwm4/close-active.xpm
index 14898cd..28ec5c1 100644
--- a/xfwm4/close-active.xpm
+++ b/xfwm4/close-active.xpm
@@ -2,10 +2,10 @@
 static char * close_active_xpm[] = {
 "43 58 5 1",
 "       c None",
-"$      c #C0C0FF s active_color_2",
+"$      c #C0C0FF s inactive_color_1",
 "@      c #949594 s active_shadow_2",
-"#      c #000000 s active_text_color",
-".      c #B4BAB4 s active_mid_2",
+"#      c #FF0000",
+".      c #B4BAB4 s inactive_color_1",
 "...........................................",
 "...........................................",
 "...........................................",
diff --git a/xfwm4/close-inactive.xpm b/xfwm4/close-inactive.xpm
index ae9b24d..4e83113 100644
--- a/xfwm4/close-inactive.xpm
+++ b/xfwm4/close-inactive.xpm
@@ -2,7 +2,7 @@
 static char * close_inactive_xpm[] = {
 "43 58 5 1",
 "       c None",
-".      c #C0C0FF s inactive_color_2",
+".      c #C0C0FF s inactive_color_1",
 "@      c #949594 s inactive_shadow_2",
 "#      c #000000 s inactive_text_color",
 "$      c #B4BAB4 s inactive_mid_2",
diff --git a/xfwm4/hide-active.xpm b/xfwm4/hide-active.xpm
index 2a3b1cf..71c15d9 100644
--- a/xfwm4/hide-active.xpm
+++ b/xfwm4/hide-active.xpm
@@ -2,10 +2,10 @@
 static char * hide_active_xpm[] = {
 "43 58 5 1",
 "       c None",
-"$      c #C0C0FF s active_color_2",
+"$      c #C0C0FF s inactive_color_1",
 "@      c #949594 s active_shadow_2",
 "#      c #000000 s active_text_color",
-".      c #B4BAB4 s active_mid_2",
+".      c #B4BAB4 s inactive_color_1",
 "...........................................",
 "...........................................",
 "...........................................",
diff --git a/xfwm4/hide-inactive.xpm b/xfwm4/hide-inactive.xpm
index b8bf9e2..01fff28 100644
--- a/xfwm4/hide-inactive.xpm
+++ b/xfwm4/hide-inactive.xpm
@@ -2,7 +2,7 @@
 static char * hide_inactive_xpm[] = {
 "43 58 5 1",
 "       c None",
-".      c #C0C0FF s inactive_color_2",
+".      c #C0C0FF s inactive_color_1",
 "@      c #949594 s inactive_shadow_2",
 "#      c #000000 s inactive_text_color",
 "$      c #B4BAB4 s inactive_mid_2",
diff --git a/xfwm4/left-active.xpm b/xfwm4/left-active.xpm
index 5c21fd2..e67afbc 100644
--- a/xfwm4/left-active.xpm
+++ b/xfwm4/left-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * left_active_xpm[] = {
-"12 48 3 1",
+"0 48 3 1",
 "       c None",
 "#      c #C0C0C0 s active_color_2",
 "@      c #C0C0FF s active_color_2",
diff --git a/xfwm4/left-inactive.xpm b/xfwm4/left-inactive.xpm
index fa1951c..25df9f7 100644
--- a/xfwm4/left-inactive.xpm
+++ b/xfwm4/left-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * left_inactive_xpm[] = {
-"12 48 3 1",
+"0 48 3 1",
 "       c None",
 "#      c #C0C0C0 s inactive_color_2",
 "@      c #C0C0FF s inactive_color_2",
diff --git a/xfwm4/maximize-active.xpm b/xfwm4/maximize-active.xpm
index 7f54789..03d26bb 100644
--- a/xfwm4/maximize-active.xpm
+++ b/xfwm4/maximize-active.xpm
@@ -2,10 +2,10 @@
 static char * maximize_active_xpm[] = {
 "43 58 5 1",
 "       c None",
-"$      c #C0C0FF s active_color_2",
+"$      c #C0C0FF s inactive_color_1",
 "@      c #949594 s active_shadow_2",
 "#      c #000000 s active_text_color",
-".      c #B4BAB4 s active_mid_2",
+".      c #B4BAB4 s inactive_color_1",
 "...........................................",
 "...........................................",
 "...........................................",
diff --git a/xfwm4/maximize-inactive.xpm b/xfwm4/maximize-inactive.xpm
index e667055..a443363 100644
--- a/xfwm4/maximize-inactive.xpm
+++ b/xfwm4/maximize-inactive.xpm
@@ -2,7 +2,7 @@
 static char * maximize_inactive_xpm[] = {
 "43 58 5 1",
 "       c None",
-".      c #C0C0FF s inactive_color_2",
+".      c #C0C0FF s inactive_color_1",
 "@      c #949594 s inactive_shadow_2",
 "#      c #000000 s inactive_text_color",
 "$      c #B4BAB4 s inactive_mid_2",
diff --git a/xfwm4/maximize-toggled-active.xpm b/xfwm4/maximize-toggled-active.xpm
index 69dcf38..a70308f 100644
--- a/xfwm4/maximize-toggled-active.xpm
+++ b/xfwm4/maximize-toggled-active.xpm
@@ -2,10 +2,10 @@
 static char * maximize_active_xpm[] = {
 "43 58 5 1",
 "       c None",
-"$      c #C0C0FF s active_color_2",
+"$      c #C0C0FF s inactive_color_1",
 "@      c #949594 s active_shadow_2",
 "#      c #000000 s active_text_color",
-".      c #B4BAB4 s active_mid_2",
+".      c #B4BAB4 s inactive_color_1",
 "...........................................",
 "...........................................",
 "...........................................",
diff --git a/xfwm4/maximize-toggled-inactive.xpm b/xfwm4/maximize-toggled-inactive.xpm
index 238c6e7..568a5ff 100644
--- a/xfwm4/maximize-toggled-inactive.xpm
+++ b/xfwm4/maximize-toggled-inactive.xpm
@@ -2,7 +2,7 @@
 static char * maximize_inactive_xpm[] = {
 "43 58 5 1",
 "       c None",
-".      c #C0C0FF s inactive_color_2",
+".      c #C0C0FF s inactive_color_1",
 "@      c #949594 s inactive_shadow_2",
 "#      c #000000 s inactive_text_color",
 "$      c #B4BAB4 s inactive_mid_2",
diff --git a/xfwm4/right-active.xpm b/xfwm4/right-active.xpm
index 926ca79..9897c2d 100644
--- a/xfwm4/right-active.xpm
+++ b/xfwm4/right-active.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * right_active_xpm[] = {
-"12 48 3 1",
+"0 48 3 1",
 "       c None",
 "#      c #C0C0C0 s active_color_2",
 "@      c #C0C0FF s active_color_2",
diff --git a/xfwm4/right-inactive.xpm b/xfwm4/right-inactive.xpm
index faa6e99..a1d9d4e 100644
--- a/xfwm4/right-inactive.xpm
+++ b/xfwm4/right-inactive.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * right_inactive_xpm[] = {
-"12 48 3 1",
+"0 48 3 1",
 "       c None",
 "#      c #C0C0C0 s inactive_color_2",
 "@      c #C0C0FF s inactive_color_2",
diff --git a/xfwm4/themerc b/xfwm4/themerc
index 711f3f5..24ae420 100644
--- a/xfwm4/themerc
+++ b/xfwm4/themerc
@@ -1,3 +1,9 @@
+active_color_1=#4d535d
+inactive_color_1=#4d535d
+active_color_2=#4d535d
+inactive_color_2=#4d535d
+; active_color_2=active_border_color
+; inactive_color_2=inactive_border_color
 active_text_color=active_text_color_2
 active_text_shadow_color=active_hilight_2
 inactive_text_color=inactive_text_color_2
@@ -17,4 +23,4 @@ title_horizontal_offset=2
 title_shadow_active=false
 title_shadow_inactive=false
 title_vertical_offset_active=2
-title_vertical_offset_inactive=2
+title_vertical_offset_inactive=2
\ No newline at end of file
diff --git a/xfwm4/title-1-active.xpm b/xfwm4/title-1-active.xpm
index cc0f670..f7df2a1 100644
--- a/xfwm4/title-1-active.xpm
+++ b/xfwm4/title-1-active.xpm
@@ -2,7 +2,7 @@
 static char * title_active_xpm[] = {
 "8 58 2 1",
 "       c None",
-".      c #FF6600 s active_mid_2",
+".      c #000000 s active_color_1",
 "........",
 "........",
 "........",
diff --git a/xfwm4/title-1-inactive.xpm b/xfwm4/title-1-inactive.xpm
index 977205f..2ebdf4c 100644
--- a/xfwm4/title-1-inactive.xpm
+++ b/xfwm4/title-1-inactive.xpm
@@ -2,7 +2,7 @@
 static char * title_inactive_xpm[] = {
 "8 58 2 1",
 "       c None",
-".      c #C0C0FF s inactive_color_2",
+".      c #C0C0FF s inactive_color_1",
 "........",
 "........",
 "........",
diff --git a/xfwm4/title-2-active.xpm b/xfwm4/title-2-active.xpm
index cc0f670..f7df2a1 100644
--- a/xfwm4/title-2-active.xpm
+++ b/xfwm4/title-2-active.xpm
@@ -2,7 +2,7 @@
 static char * title_active_xpm[] = {
 "8 58 2 1",
 "       c None",
-".      c #FF6600 s active_mid_2",
+".      c #000000 s active_color_1",
 "........",
 "........",
 "........",
diff --git a/xfwm4/title-2-inactive.xpm b/xfwm4/title-2-inactive.xpm
index 977205f..2ebdf4c 100644
--- a/xfwm4/title-2-inactive.xpm
+++ b/xfwm4/title-2-inactive.xpm
@@ -2,7 +2,7 @@
 static char * title_inactive_xpm[] = {
 "8 58 2 1",
 "       c None",
-".      c #C0C0FF s inactive_color_2",
+".      c #C0C0FF s inactive_color_1",
 "........",
 "........",
 "........",
diff --git a/xfwm4/title-3-active.xpm b/xfwm4/title-3-active.xpm
index cc0f670..f7df2a1 100644
--- a/xfwm4/title-3-active.xpm
+++ b/xfwm4/title-3-active.xpm
@@ -2,7 +2,7 @@
 static char * title_active_xpm[] = {
 "8 58 2 1",
 "       c None",
-".      c #FF6600 s active_mid_2",
+".      c #000000 s active_color_1",
 "........",
 "........",
 "........",
diff --git a/xfwm4/title-3-inactive.xpm b/xfwm4/title-3-inactive.xpm
index 977205f..2ebdf4c 100644
--- a/xfwm4/title-3-inactive.xpm
+++ b/xfwm4/title-3-inactive.xpm
@@ -2,7 +2,7 @@
 static char * title_inactive_xpm[] = {
 "8 58 2 1",
 "       c None",
-".      c #C0C0FF s inactive_color_2",
+".      c #C0C0FF s inactive_color_1",
 "........",
 "........",
 "........",
diff --git a/xfwm4/title-4-active.xpm b/xfwm4/title-4-active.xpm
index cc0f670..f7df2a1 100644
--- a/xfwm4/title-4-active.xpm
+++ b/xfwm4/title-4-active.xpm
@@ -2,7 +2,7 @@
 static char * title_active_xpm[] = {
 "8 58 2 1",
 "       c None",
-".      c #FF6600 s active_mid_2",
+".      c #000000 s active_color_1",
 "........",
 "........",
 "........",
diff --git a/xfwm4/title-4-inactive.xpm b/xfwm4/title-4-inactive.xpm
index 977205f..2ebdf4c 100644
--- a/xfwm4/title-4-inactive.xpm
+++ b/xfwm4/title-4-inactive.xpm
@@ -2,7 +2,7 @@
 static char * title_inactive_xpm[] = {
 "8 58 2 1",
 "       c None",
-".      c #C0C0FF s inactive_color_2",
+".      c #C0C0FF s inactive_color_1",
 "........",
 "........",
 "........",
diff --git a/xfwm4/title-5-active.xpm b/xfwm4/title-5-active.xpm
index cc0f670..f7df2a1 100644
--- a/xfwm4/title-5-active.xpm
+++ b/xfwm4/title-5-active.xpm
@@ -2,7 +2,7 @@
 static char * title_active_xpm[] = {
 "8 58 2 1",
 "       c None",
-".      c #FF6600 s active_mid_2",
+".      c #000000 s active_color_1",
 "........",
 "........",
 "........",
diff --git a/xfwm4/title-5-inactive.xpm b/xfwm4/title-5-inactive.xpm
index 977205f..2ebdf4c 100644
--- a/xfwm4/title-5-inactive.xpm
+++ b/xfwm4/title-5-inactive.xpm
@@ -2,7 +2,7 @@
 static char * title_inactive_xpm[] = {
 "8 58 2 1",
 "       c None",
-".      c #C0C0FF s inactive_color_2",
+".      c #C0C0FF s inactive_color_1",
 "........",
 "........",
 "........",
diff --git a/xfwm4/top-left-active.xpm b/xfwm4/top-left-active.xpm
index 1775913..fa5f201 100644
--- a/xfwm4/top-left-active.xpm
+++ b/xfwm4/top-left-active.xpm
@@ -2,7 +2,7 @@
 static char * top_left_active_xpm[] = {
 "16 58 2 1",
 "       c None",
-".      c #C0C0FF s active_mid_2",
+".      c #C0C0FF s active_color_1",
 "        ........",
 "      ..........",
 "    ............",
diff --git a/xfwm4/top-left-inactive.xpm b/xfwm4/top-left-inactive.xpm
index 0ea3721..3974bd9 100644
--- a/xfwm4/top-left-inactive.xpm
+++ b/xfwm4/top-left-inactive.xpm
@@ -2,7 +2,7 @@
 static char * top_left_inactive_xpm[] = {
 "16 58 2 1",
 "       c None",
-".      c #C0C0FF s inactive_color_2",
+".      c #C0C0FF s inactive_color_1",
 "        ........",
 "      ..........",
 "    ............",
diff --git a/xfwm4/top-right-active.xpm b/xfwm4/top-right-active.xpm
index fbb39fb..27477d7 100644
--- a/xfwm4/top-right-active.xpm
+++ b/xfwm4/top-right-active.xpm
@@ -2,7 +2,7 @@
 static char * top_right_active_xpm[] = {
 "16 58 2 1",
 "       c None",
-".      c #C0C0FF s active_mid_2",
+".      c #C0C0FF s active_color_1",
 "........        ",
 "..........      ",
 "............    ",
diff --git a/xfwm4/top-right-inactive.xpm b/xfwm4/top-right-inactive.xpm
index d092b96..8152697 100644
--- a/xfwm4/top-right-inactive.xpm
+++ b/xfwm4/top-right-inactive.xpm
@@ -2,7 +2,7 @@
 static char * top_right_inactive_xpm[] = {
 "16 58 2 1",
 "       c None",
-".      c #C0C0FF s inactive_color_2",
+".      c #C0C0FF s inactive_color_1",
 "........        ",
 "..........      ",
 "............    ",