shiki-colors-openbox: make icons match

6 files changed, 35 insertions, 36 deletions

diff --git a/Shiki-Colors-Openbox/openbox-3/iconify.xbm b/Shiki-Colors-Openbox/openbox-3/iconify.xbm
index 9b7a087..38fecdd 100644
--- a/Shiki-Colors-Openbox/openbox-3/iconify.xbm
+++ b/Shiki-Colors-Openbox/openbox-3/iconify.xbm
@@ -1,4 +1,4 @@
-#define min_width 8
-#define min_height 8
-static unsigned char min_bits[] = {
+#define iconify_width 8
+#define iconify_height 8
+static unsigned char iconify_bits[] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00 };
diff --git a/Shiki-Colors-Openbox/openbox-3/iconify_hover.xbm b/Shiki-Colors-Openbox/openbox-3/iconify_hover.xbm
index 69f9f2a..299e199 100644
--- a/Shiki-Colors-Openbox/openbox-3/iconify_hover.xbm
+++ b/Shiki-Colors-Openbox/openbox-3/iconify_hover.xbm
@@ -1,6 +1,6 @@
-#define iconify_hover_width 16
-#define iconify_hover_height 16
-static unsigned char iconify_hover_bits[] = {
-   0xff, 0xff, 0xff, 0xff, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0,
-   0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xf3, 0xcf, 0xf3, 0xcf, 0x03, 0xc0,
-   0x03, 0xc0, 0x03, 0xc0, 0xff, 0xff, 0xff, 0xff };
+#define iconify_pressed_width 14
+#define iconify_pressed_height 14
+static unsigned char iconify_pressed_bits[] = {
+   0xff, 0x3f, 0x01, 0x20, 0x01, 0x20, 0x01, 0x20, 0x01, 0x20, 0x01, 0x20,
+   0x01, 0x20, 0x01, 0x20, 0xf9, 0x27, 0xf9, 0x27, 0x01, 0x20, 0x01, 0x20,
+   0x01, 0x20, 0xff, 0x3f };
diff --git a/Shiki-Colors-Openbox/openbox-3/iconify_hover_round.xbm b/Shiki-Colors-Openbox/openbox-3/iconify_hover_round.xbm
index 1f1b270..dd7cdaa 100644
--- a/Shiki-Colors-Openbox/openbox-3/iconify_hover_round.xbm
+++ b/Shiki-Colors-Openbox/openbox-3/iconify_hover_round.xbm
@@ -1,6 +1,6 @@
-#define iconify_hover_width 16
-#define iconify_hover_height 16
-static unsigned char iconify_hover_bits[] = {
+#define iconify_hover_round_width 16
+#define iconify_hover_round_height 16
+static unsigned char iconify_hover_round_bits[] = {
    0xc0, 0x03, 0xf8, 0x0f, 0x1c, 0x38, 0x0c, 0x70, 0x06, 0x60, 0x07, 0xc0,
    0x03, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0xf3, 0xcf, 0xf7, 0xef, 0x06, 0x60,
    0x0c, 0x70, 0x1c, 0x38, 0xf0, 0x0f, 0xc0, 0x03 };
diff --git a/Shiki-Colors-Openbox/openbox-3/max_hover.xbm b/Shiki-Colors-Openbox/openbox-3/max_hover.xbm
index 8a2264e..3b67f9a 100644
--- a/Shiki-Colors-Openbox/openbox-3/max_hover.xbm
+++ b/Shiki-Colors-Openbox/openbox-3/max_hover.xbm
@@ -1,6 +1,6 @@
-#define max_hover_width 16
-#define max_hover_height 16
-static unsigned char max_hover_bits[] = {
-   0xff, 0xff, 0xff, 0xff, 0x03, 0xc0, 0x03, 0xc0, 0x83, 0xc1, 0x83, 0xc1,
-   0x83, 0xc1, 0xf3, 0xcf, 0xf3, 0xcf, 0x83, 0xc1, 0x83, 0xc1, 0x83, 0xc1,
-   0x03, 0xc0, 0x03, 0xc0, 0xff, 0xff, 0xff, 0xff };
+#define max_toggled_width 14
+#define max_toggled_height 14
+static unsigned char max_toggled_bits[] = {
+   0xff, 0x3f, 0x01, 0x20, 0x01, 0x20, 0xc1, 0x20, 0xc1, 0x20, 0xc1, 0x20,
+   0xf9, 0x27, 0xf9, 0x27, 0xc1, 0x20, 0xc1, 0x20, 0xc1, 0x20, 0x01, 0x20,
+   0x01, 0x20, 0xff, 0x3f };
diff --git a/Shiki-Colors-Openbox/openbox-3/max_hover_round.xbm b/Shiki-Colors-Openbox/openbox-3/max_hover_round.xbm
index 9cf0fd0..f26dc82 100644
--- a/Shiki-Colors-Openbox/openbox-3/max_hover_round.xbm
+++ b/Shiki-Colors-Openbox/openbox-3/max_hover_round.xbm
@@ -1,6 +1,6 @@
-#define max_hover_width 16
-#define max_hover_height 16
-static unsigned char max_hover_bits[] = {
-   0xc0, 0x03, 0xf8, 0x0f, 0x1c, 0x38, 0x0c, 0x70, 0x86, 0x60, 0x87, 0xc1,
+#define max_hover_round_width 16
+#define max_hover_round_height 16
+static unsigned char max_hover_round_bits[] = {
+   0xc0, 0x03, 0xf8, 0x0f, 0x1c, 0x38, 0x0c, 0x70, 0x86, 0x61, 0x87, 0xc1,
    0x83, 0xc1, 0xf3, 0xcf, 0xf3, 0xcf, 0x83, 0xc1, 0x87, 0xe1, 0x86, 0x61,
    0x0e, 0x70, 0x1c, 0x38, 0xf0, 0x0f, 0xc0, 0x03 };
diff --git a/Shiki-Colors-Openbox/openbox-3/themerc b/Shiki-Colors-Openbox/openbox-3/themerc
index cea5c61..5bb98a5 100755
--- a/Shiki-Colors-Openbox/openbox-3/themerc
+++ b/Shiki-Colors-Openbox/openbox-3/themerc
@@ -1,9 +1,10 @@
-# Shiki-Brave OpenBox3 theme.
+# Shiki-Colors OpenBox3 theme.
 # Author: Arthur Spitzer
+# Modified by Kylie McClain <somasissounds@gmail.com>
 
 # Window geometry
 padding.width: 2
-border.width: 1
+border.width: 2
 window.client.padding.width: 2
 window.client.padding.height: 2
 window.handle.width: 0
@@ -13,13 +14,13 @@ menu.border.width: 0
 menu.overlap: -1
 
 # Border colors
-window.active.border.color: #729fcf
-window.active.title.separator.color: #3c3c3c
-window.inactive.border.color: #9b9b9b
-window.inactive.title.separator.color: #3c3c3c
-menu.border.color: #313131
-window.active.client.color: #3c3c3c
-window.inactive.client.color: #3c3c3c
+window.active.border.color: #1F1F1F
+window.active.title.separator.color: #1f1f1f
+window.inactive.border.color: #1f1f1f
+window.inactive.title.separator.color: #1f1f1f
+menu.border.color: #1f1f1f
+window.active.client.color: #1f1f1f
+window.inactive.client.color: #1f1f1f
 
 # Text shadows
 window.active.label.text.font: shadow=n
@@ -31,11 +32,9 @@ menu.title.text.font: shadow=n
 window.label.text.justify: Center
 
 # Active window
-window.active.title.bg: Gradient SplitVertical Flat
-window.active.title.bg.color: #3c3c3c
-window.active.title.bg.color.splitTo: #515151
-window.active.title.bg.colorTo: #3c3c3c
-window.active.title.bg.colorTo.splitTo: #3c3c3c
+window.active.title.bg: Gradient Vertical Flat
+window.active.title.bg.color: #2C2C2C
+window.active.title.bg.colorTo: #212121
 window.active.label.bg: Parentrelative
 window.active.label.text.color: #ffffff