diff --git a/Paper/metacity-1/close.png b/Paper/metacity-1/close.png
index bab9008..23dd3b0 100644
Binary files a/Paper/metacity-1/close.png and b/Paper/metacity-1/close.png differ
diff --git a/Paper/metacity-1/close_focused.png b/Paper/metacity-1/close_focused.png
index bab9008..23dd3b0 100644
Binary files a/Paper/metacity-1/close_focused.png and b/Paper/metacity-1/close_focused.png differ
diff --git a/Paper/metacity-1/close_focused_normal.png b/Paper/metacity-1/close_focused_normal.png
index bab9008..23dd3b0 100644
Binary files a/Paper/metacity-1/close_focused_normal.png and b/Paper/metacity-1/close_focused_normal.png differ
diff --git a/Paper/metacity-1/close_focused_prelight.png b/Paper/metacity-1/close_focused_prelight.png
index 1f5915e..13b5a1e 100644
Binary files a/Paper/metacity-1/close_focused_prelight.png and b/Paper/metacity-1/close_focused_prelight.png differ
diff --git a/Paper/metacity-1/close_focused_pressed.png b/Paper/metacity-1/close_focused_pressed.png
index c6adbc3..9813f77 100644
Binary files a/Paper/metacity-1/close_focused_pressed.png and b/Paper/metacity-1/close_focused_pressed.png differ
diff --git a/Paper/metacity-1/close_unfocused.png b/Paper/metacity-1/close_unfocused.png
index 22e0d8e..c47188c 100644
Binary files a/Paper/metacity-1/close_unfocused.png and b/Paper/metacity-1/close_unfocused.png differ
diff --git a/Paper/metacity-1/close_unfocused_prelight.png b/Paper/metacity-1/close_unfocused_prelight.png
index cc669bb..22f7569 100644
Binary files a/Paper/metacity-1/close_unfocused_prelight.png and b/Paper/metacity-1/close_unfocused_prelight.png differ
diff --git a/Paper/metacity-1/close_unfocused_pressed.png b/Paper/metacity-1/close_unfocused_pressed.png
index e9c29c8..40d15ed 100644
Binary files a/Paper/metacity-1/close_unfocused_pressed.png and b/Paper/metacity-1/close_unfocused_pressed.png differ
diff --git a/Paper/metacity-1/maximize.png b/Paper/metacity-1/maximize.png
index 954f34d..0d50b74 100644
Binary files a/Paper/metacity-1/maximize.png and b/Paper/metacity-1/maximize.png differ
diff --git a/Paper/metacity-1/maximize_focused.png b/Paper/metacity-1/maximize_focused.png
index 954f34d..0d50b74 100644
Binary files a/Paper/metacity-1/maximize_focused.png and b/Paper/metacity-1/maximize_focused.png differ
diff --git a/Paper/metacity-1/maximize_focused_normal.png b/Paper/metacity-1/maximize_focused_normal.png
index 954f34d..0d50b74 100644
Binary files a/Paper/metacity-1/maximize_focused_normal.png and b/Paper/metacity-1/maximize_focused_normal.png differ
diff --git a/Paper/metacity-1/maximize_focused_prelight.png b/Paper/metacity-1/maximize_focused_prelight.png
index 0c3d53b..626d45b 100644
Binary files a/Paper/metacity-1/maximize_focused_prelight.png and b/Paper/metacity-1/maximize_focused_prelight.png differ
diff --git a/Paper/metacity-1/maximize_focused_pressed.png b/Paper/metacity-1/maximize_focused_pressed.png
index 4862313..122db3d 100644
Binary files a/Paper/metacity-1/maximize_focused_pressed.png and b/Paper/metacity-1/maximize_focused_pressed.png differ
diff --git a/Paper/metacity-1/maximize_unfocused.png b/Paper/metacity-1/maximize_unfocused.png
index 6db02e3..7204306 100644
Binary files a/Paper/metacity-1/maximize_unfocused.png and b/Paper/metacity-1/maximize_unfocused.png differ
diff --git a/Paper/metacity-1/maximize_unfocused_prelight.png b/Paper/metacity-1/maximize_unfocused_prelight.png
index 917d36e..30a1242 100644
Binary files a/Paper/metacity-1/maximize_unfocused_prelight.png and b/Paper/metacity-1/maximize_unfocused_prelight.png differ
diff --git a/Paper/metacity-1/maximize_unfocused_pressed.png b/Paper/metacity-1/maximize_unfocused_pressed.png
index 97a5a40..f4e58a6 100644
Binary files a/Paper/metacity-1/maximize_unfocused_pressed.png and b/Paper/metacity-1/maximize_unfocused_pressed.png differ
diff --git a/Paper/metacity-1/menu.png b/Paper/metacity-1/menu.png
index ada26d6..c4848fa 100644
Binary files a/Paper/metacity-1/menu.png and b/Paper/metacity-1/menu.png differ
diff --git a/Paper/metacity-1/menu_focused.png b/Paper/metacity-1/menu_focused.png
index ada26d6..c4848fa 100644
Binary files a/Paper/metacity-1/menu_focused.png and b/Paper/metacity-1/menu_focused.png differ
diff --git a/Paper/metacity-1/menu_focused_normal.png b/Paper/metacity-1/menu_focused_normal.png
index ada26d6..c4848fa 100644
Binary files a/Paper/metacity-1/menu_focused_normal.png and b/Paper/metacity-1/menu_focused_normal.png differ
diff --git a/Paper/metacity-1/menu_focused_prelight.png b/Paper/metacity-1/menu_focused_prelight.png
index 2e204fa..789bea7 100644
Binary files a/Paper/metacity-1/menu_focused_prelight.png and b/Paper/metacity-1/menu_focused_prelight.png differ
diff --git a/Paper/metacity-1/menu_focused_pressed.png b/Paper/metacity-1/menu_focused_pressed.png
index 4094365..9fa63cf 100644
Binary files a/Paper/metacity-1/menu_focused_pressed.png and b/Paper/metacity-1/menu_focused_pressed.png differ
diff --git a/Paper/metacity-1/menu_unfocused.png b/Paper/metacity-1/menu_unfocused.png
index d779cdb..69010ce 100644
Binary files a/Paper/metacity-1/menu_unfocused.png and b/Paper/metacity-1/menu_unfocused.png differ
diff --git a/Paper/metacity-1/menu_unfocused_prelight.png b/Paper/metacity-1/menu_unfocused_prelight.png
index 556a1d3..aad62fc 100644
Binary files a/Paper/metacity-1/menu_unfocused_prelight.png and b/Paper/metacity-1/menu_unfocused_prelight.png differ
diff --git a/Paper/metacity-1/menu_unfocused_pressed.png b/Paper/metacity-1/menu_unfocused_pressed.png
index 18186f0..a916103 100644
Binary files a/Paper/metacity-1/menu_unfocused_pressed.png and b/Paper/metacity-1/menu_unfocused_pressed.png differ
diff --git a/Paper/metacity-1/minimize.png b/Paper/metacity-1/minimize.png
index 5867365..d12e3b8 100644
Binary files a/Paper/metacity-1/minimize.png and b/Paper/metacity-1/minimize.png differ
diff --git a/Paper/metacity-1/minimize_focused.png b/Paper/metacity-1/minimize_focused.png
index 5867365..d12e3b8 100644
Binary files a/Paper/metacity-1/minimize_focused.png and b/Paper/metacity-1/minimize_focused.png differ
diff --git a/Paper/metacity-1/minimize_focused_normal.png b/Paper/metacity-1/minimize_focused_normal.png
index 5867365..d12e3b8 100644
Binary files a/Paper/metacity-1/minimize_focused_normal.png and b/Paper/metacity-1/minimize_focused_normal.png differ
diff --git a/Paper/metacity-1/minimize_focused_prelight.png b/Paper/metacity-1/minimize_focused_prelight.png
index d7bc7c7..ee9eb34 100644
Binary files a/Paper/metacity-1/minimize_focused_prelight.png and b/Paper/metacity-1/minimize_focused_prelight.png differ
diff --git a/Paper/metacity-1/minimize_focused_pressed.png b/Paper/metacity-1/minimize_focused_pressed.png
index 2e06d53..f9fb3b6 100644
Binary files a/Paper/metacity-1/minimize_focused_pressed.png and b/Paper/metacity-1/minimize_focused_pressed.png differ
diff --git a/Paper/metacity-1/minimize_unfocused.png b/Paper/metacity-1/minimize_unfocused.png
index 0d1d214..aa28202 100644
Binary files a/Paper/metacity-1/minimize_unfocused.png and b/Paper/metacity-1/minimize_unfocused.png differ
diff --git a/Paper/metacity-1/minimize_unfocused_prelight.png b/Paper/metacity-1/minimize_unfocused_prelight.png
index 6797442..88dd100 100644
Binary files a/Paper/metacity-1/minimize_unfocused_prelight.png and b/Paper/metacity-1/minimize_unfocused_prelight.png differ
diff --git a/Paper/metacity-1/minimize_unfocused_pressed.png b/Paper/metacity-1/minimize_unfocused_pressed.png
index ca72a63..e741187 100644
Binary files a/Paper/metacity-1/minimize_unfocused_pressed.png and b/Paper/metacity-1/minimize_unfocused_pressed.png differ
diff --git a/Paper/metacity-1/shade.png b/Paper/metacity-1/shade.png
index cd43312..6fcfdd2 100644
Binary files a/Paper/metacity-1/shade.png and b/Paper/metacity-1/shade.png differ
diff --git a/Paper/metacity-1/shade_focused.png b/Paper/metacity-1/shade_focused.png
index cd43312..6fcfdd2 100644
Binary files a/Paper/metacity-1/shade_focused.png and b/Paper/metacity-1/shade_focused.png differ
diff --git a/Paper/metacity-1/shade_focused_normal.png b/Paper/metacity-1/shade_focused_normal.png
index cd43312..6fcfdd2 100644
Binary files a/Paper/metacity-1/shade_focused_normal.png and b/Paper/metacity-1/shade_focused_normal.png differ
diff --git a/Paper/metacity-1/shade_focused_prelight.png b/Paper/metacity-1/shade_focused_prelight.png
index 546a482..1d68f07 100644
Binary files a/Paper/metacity-1/shade_focused_prelight.png and b/Paper/metacity-1/shade_focused_prelight.png differ
diff --git a/Paper/metacity-1/shade_focused_pressed.png b/Paper/metacity-1/shade_focused_pressed.png
index 49bb143..48fead8 100644
Binary files a/Paper/metacity-1/shade_focused_pressed.png and b/Paper/metacity-1/shade_focused_pressed.png differ
diff --git a/Paper/metacity-1/shade_unfocused.png b/Paper/metacity-1/shade_unfocused.png
index 252a3a2..1e80edc 100644
Binary files a/Paper/metacity-1/shade_unfocused.png and b/Paper/metacity-1/shade_unfocused.png differ
diff --git a/Paper/metacity-1/shade_unfocused_prelight.png b/Paper/metacity-1/shade_unfocused_prelight.png
index a933370..23c44ca 100644
Binary files a/Paper/metacity-1/shade_unfocused_prelight.png and b/Paper/metacity-1/shade_unfocused_prelight.png differ
diff --git a/Paper/metacity-1/shade_unfocused_pressed.png b/Paper/metacity-1/shade_unfocused_pressed.png
index c5154ed..e0403f0 100644
Binary files a/Paper/metacity-1/shade_unfocused_pressed.png and b/Paper/metacity-1/shade_unfocused_pressed.png differ
diff --git a/Paper/metacity-1/unmaximize.png b/Paper/metacity-1/unmaximize.png
index 17e8609..33ff66f 100644
Binary files a/Paper/metacity-1/unmaximize.png and b/Paper/metacity-1/unmaximize.png differ
diff --git a/Paper/metacity-1/unmaximize_focused.png b/Paper/metacity-1/unmaximize_focused.png
index 17e8609..33ff66f 100644
Binary files a/Paper/metacity-1/unmaximize_focused.png and b/Paper/metacity-1/unmaximize_focused.png differ
diff --git a/Paper/metacity-1/unmaximize_focused_normal.png b/Paper/metacity-1/unmaximize_focused_normal.png
index 17e8609..33ff66f 100644
Binary files a/Paper/metacity-1/unmaximize_focused_normal.png and b/Paper/metacity-1/unmaximize_focused_normal.png differ
diff --git a/Paper/metacity-1/unmaximize_focused_prelight.png b/Paper/metacity-1/unmaximize_focused_prelight.png
index abf338a..37094d8 100644
Binary files a/Paper/metacity-1/unmaximize_focused_prelight.png and b/Paper/metacity-1/unmaximize_focused_prelight.png differ
diff --git a/Paper/metacity-1/unmaximize_focused_pressed.png b/Paper/metacity-1/unmaximize_focused_pressed.png
index 7c1c851..031d038 100644
Binary files a/Paper/metacity-1/unmaximize_focused_pressed.png and b/Paper/metacity-1/unmaximize_focused_pressed.png differ
diff --git a/Paper/metacity-1/unmaximize_unfocused.png b/Paper/metacity-1/unmaximize_unfocused.png
index b83db48..ed19165 100644
Binary files a/Paper/metacity-1/unmaximize_unfocused.png and b/Paper/metacity-1/unmaximize_unfocused.png differ
diff --git a/Paper/metacity-1/unmaximize_unfocused_prelight.png b/Paper/metacity-1/unmaximize_unfocused_prelight.png
index 3803e48..5ac09a3 100644
Binary files a/Paper/metacity-1/unmaximize_unfocused_prelight.png and b/Paper/metacity-1/unmaximize_unfocused_prelight.png differ
diff --git a/Paper/metacity-1/unmaximize_unfocused_pressed.png b/Paper/metacity-1/unmaximize_unfocused_pressed.png
index bb55fac..97be89d 100644
Binary files a/Paper/metacity-1/unmaximize_unfocused_pressed.png and b/Paper/metacity-1/unmaximize_unfocused_pressed.png differ
diff --git a/Paper/metacity-1/unshade.png b/Paper/metacity-1/unshade.png
index 81a1237..e76cda5 100644
Binary files a/Paper/metacity-1/unshade.png and b/Paper/metacity-1/unshade.png differ
diff --git a/Paper/metacity-1/unshade_focused.png b/Paper/metacity-1/unshade_focused.png
index 81a1237..e76cda5 100644
Binary files a/Paper/metacity-1/unshade_focused.png and b/Paper/metacity-1/unshade_focused.png differ
diff --git a/Paper/metacity-1/unshade_focused_normal.png b/Paper/metacity-1/unshade_focused_normal.png
index 81a1237..e76cda5 100644
Binary files a/Paper/metacity-1/unshade_focused_normal.png and b/Paper/metacity-1/unshade_focused_normal.png differ
diff --git a/Paper/metacity-1/unshade_focused_prelight.png b/Paper/metacity-1/unshade_focused_prelight.png
index 90084ec..50574ab 100644
Binary files a/Paper/metacity-1/unshade_focused_prelight.png and b/Paper/metacity-1/unshade_focused_prelight.png differ
diff --git a/Paper/metacity-1/unshade_focused_pressed.png b/Paper/metacity-1/unshade_focused_pressed.png
index 65441ba..e71d304 100644
Binary files a/Paper/metacity-1/unshade_focused_pressed.png and b/Paper/metacity-1/unshade_focused_pressed.png differ
diff --git a/Paper/metacity-1/unshade_unfocused.png b/Paper/metacity-1/unshade_unfocused.png
index ac466de..020f278 100644
Binary files a/Paper/metacity-1/unshade_unfocused.png and b/Paper/metacity-1/unshade_unfocused.png differ
diff --git a/Paper/metacity-1/unshade_unfocused_prelight.png b/Paper/metacity-1/unshade_unfocused_prelight.png
index fb4f184..0ac6a14 100644
Binary files a/Paper/metacity-1/unshade_unfocused_prelight.png and b/Paper/metacity-1/unshade_unfocused_prelight.png differ
diff --git a/Paper/metacity-1/unshade_unfocused_pressed.png b/Paper/metacity-1/unshade_unfocused_pressed.png
index 8d2fbe2..ef71340 100644
Binary files a/Paper/metacity-1/unshade_unfocused_pressed.png and b/Paper/metacity-1/unshade_unfocused_pressed.png differ
diff --git a/Paper/unity/close.png b/Paper/unity/close.png
index bab9008..23dd3b0 100644
Binary files a/Paper/unity/close.png and b/Paper/unity/close.png differ
diff --git a/Paper/unity/close_focused.png b/Paper/unity/close_focused.png
index bab9008..23dd3b0 100644
Binary files a/Paper/unity/close_focused.png and b/Paper/unity/close_focused.png differ
diff --git a/Paper/unity/close_focused_normal.png b/Paper/unity/close_focused_normal.png
index bab9008..23dd3b0 100644
Binary files a/Paper/unity/close_focused_normal.png and b/Paper/unity/close_focused_normal.png differ
diff --git a/Paper/unity/close_focused_prelight.png b/Paper/unity/close_focused_prelight.png
index 1f5915e..13b5a1e 100644
Binary files a/Paper/unity/close_focused_prelight.png and b/Paper/unity/close_focused_prelight.png differ
diff --git a/Paper/unity/close_focused_pressed.png b/Paper/unity/close_focused_pressed.png
index c6adbc3..9813f77 100644
Binary files a/Paper/unity/close_focused_pressed.png and b/Paper/unity/close_focused_pressed.png differ
diff --git a/Paper/unity/close_unfocused.png b/Paper/unity/close_unfocused.png
index 22e0d8e..c47188c 100644
Binary files a/Paper/unity/close_unfocused.png and b/Paper/unity/close_unfocused.png differ
diff --git a/Paper/unity/close_unfocused_prelight.png b/Paper/unity/close_unfocused_prelight.png
index cc669bb..22f7569 100644
Binary files a/Paper/unity/close_unfocused_prelight.png and b/Paper/unity/close_unfocused_prelight.png differ
diff --git a/Paper/unity/close_unfocused_pressed.png b/Paper/unity/close_unfocused_pressed.png
index e9c29c8..40d15ed 100644
Binary files a/Paper/unity/close_unfocused_pressed.png and b/Paper/unity/close_unfocused_pressed.png differ
diff --git a/Paper/unity/maximize.png b/Paper/unity/maximize.png
index 954f34d..0d50b74 100644
Binary files a/Paper/unity/maximize.png and b/Paper/unity/maximize.png differ
diff --git a/Paper/unity/maximize_focused.png b/Paper/unity/maximize_focused.png
index 954f34d..0d50b74 100644
Binary files a/Paper/unity/maximize_focused.png and b/Paper/unity/maximize_focused.png differ
diff --git a/Paper/unity/maximize_focused_normal.png b/Paper/unity/maximize_focused_normal.png
index 954f34d..0d50b74 100644
Binary files a/Paper/unity/maximize_focused_normal.png and b/Paper/unity/maximize_focused_normal.png differ
diff --git a/Paper/unity/maximize_focused_prelight.png b/Paper/unity/maximize_focused_prelight.png
index 0c3d53b..626d45b 100644
Binary files a/Paper/unity/maximize_focused_prelight.png and b/Paper/unity/maximize_focused_prelight.png differ
diff --git a/Paper/unity/maximize_focused_pressed.png b/Paper/unity/maximize_focused_pressed.png
index 4862313..122db3d 100644
Binary files a/Paper/unity/maximize_focused_pressed.png and b/Paper/unity/maximize_focused_pressed.png differ
diff --git a/Paper/unity/maximize_unfocused.png b/Paper/unity/maximize_unfocused.png
index 6db02e3..7204306 100644
Binary files a/Paper/unity/maximize_unfocused.png and b/Paper/unity/maximize_unfocused.png differ
diff --git a/Paper/unity/maximize_unfocused_prelight.png b/Paper/unity/maximize_unfocused_prelight.png
index 917d36e..30a1242 100644
Binary files a/Paper/unity/maximize_unfocused_prelight.png and b/Paper/unity/maximize_unfocused_prelight.png differ
diff --git a/Paper/unity/maximize_unfocused_pressed.png b/Paper/unity/maximize_unfocused_pressed.png
index 97a5a40..f4e58a6 100644
Binary files a/Paper/unity/maximize_unfocused_pressed.png and b/Paper/unity/maximize_unfocused_pressed.png differ
diff --git a/Paper/unity/menu.png b/Paper/unity/menu.png
index ada26d6..c4848fa 100644
Binary files a/Paper/unity/menu.png and b/Paper/unity/menu.png differ
diff --git a/Paper/unity/menu_focused.png b/Paper/unity/menu_focused.png
new file mode 100644
index 0000000..c4848fa
Binary files /dev/null and b/Paper/unity/menu_focused.png differ
diff --git a/Paper/unity/menu_focused_normal.png b/Paper/unity/menu_focused_normal.png
new file mode 100644
index 0000000..c4848fa
Binary files /dev/null and b/Paper/unity/menu_focused_normal.png differ
diff --git a/Paper/unity/menu_focused_prelight.png b/Paper/unity/menu_focused_prelight.png
new file mode 100644
index 0000000..789bea7
Binary files /dev/null and b/Paper/unity/menu_focused_prelight.png differ
diff --git a/Paper/unity/menu_focused_pressed.png b/Paper/unity/menu_focused_pressed.png
new file mode 100644
index 0000000..9fa63cf
Binary files /dev/null and b/Paper/unity/menu_focused_pressed.png differ
diff --git a/Paper/unity/menu_unfocused.png b/Paper/unity/menu_unfocused.png
new file mode 100644
index 0000000..69010ce
Binary files /dev/null and b/Paper/unity/menu_unfocused.png differ
diff --git a/Paper/unity/menu_unfocused_prelight.png b/Paper/unity/menu_unfocused_prelight.png
new file mode 100644
index 0000000..aad62fc
Binary files /dev/null and b/Paper/unity/menu_unfocused_prelight.png differ
diff --git a/Paper/unity/menu_unfocused_pressed.png b/Paper/unity/menu_unfocused_pressed.png
new file mode 100644
index 0000000..a916103
Binary files /dev/null and b/Paper/unity/menu_unfocused_pressed.png differ
diff --git a/Paper/unity/minimize.png b/Paper/unity/minimize.png
index 5867365..d12e3b8 100644
Binary files a/Paper/unity/minimize.png and b/Paper/unity/minimize.png differ
diff --git a/Paper/unity/minimize_focused.png b/Paper/unity/minimize_focused.png
index 5867365..d12e3b8 100644
Binary files a/Paper/unity/minimize_focused.png and b/Paper/unity/minimize_focused.png differ
diff --git a/Paper/unity/minimize_focused_normal.png b/Paper/unity/minimize_focused_normal.png
index 5867365..d12e3b8 100644
Binary files a/Paper/unity/minimize_focused_normal.png and b/Paper/unity/minimize_focused_normal.png differ
diff --git a/Paper/unity/minimize_focused_prelight.png b/Paper/unity/minimize_focused_prelight.png
index d7bc7c7..ee9eb34 100644
Binary files a/Paper/unity/minimize_focused_prelight.png and b/Paper/unity/minimize_focused_prelight.png differ
diff --git a/Paper/unity/minimize_focused_pressed.png b/Paper/unity/minimize_focused_pressed.png
index 2e06d53..f9fb3b6 100644
Binary files a/Paper/unity/minimize_focused_pressed.png and b/Paper/unity/minimize_focused_pressed.png differ
diff --git a/Paper/unity/minimize_unfocused.png b/Paper/unity/minimize_unfocused.png
index 0d1d214..aa28202 100644
Binary files a/Paper/unity/minimize_unfocused.png and b/Paper/unity/minimize_unfocused.png differ
diff --git a/Paper/unity/minimize_unfocused_prelight.png b/Paper/unity/minimize_unfocused_prelight.png
index 6797442..88dd100 100644
Binary files a/Paper/unity/minimize_unfocused_prelight.png and b/Paper/unity/minimize_unfocused_prelight.png differ
diff --git a/Paper/unity/minimize_unfocused_pressed.png b/Paper/unity/minimize_unfocused_pressed.png
index ca72a63..e741187 100644
Binary files a/Paper/unity/minimize_unfocused_pressed.png and b/Paper/unity/minimize_unfocused_pressed.png differ
diff --git a/Paper/unity/shade.png b/Paper/unity/shade.png
new file mode 100644
index 0000000..6fcfdd2
Binary files /dev/null and b/Paper/unity/shade.png differ
diff --git a/Paper/unity/shade_focused.png b/Paper/unity/shade_focused.png
new file mode 100644
index 0000000..6fcfdd2
Binary files /dev/null and b/Paper/unity/shade_focused.png differ
diff --git a/Paper/unity/shade_focused_normal.png b/Paper/unity/shade_focused_normal.png
new file mode 100644
index 0000000..6fcfdd2
Binary files /dev/null and b/Paper/unity/shade_focused_normal.png differ
diff --git a/Paper/unity/shade_focused_prelight.png b/Paper/unity/shade_focused_prelight.png
new file mode 100644
index 0000000..1d68f07
Binary files /dev/null and b/Paper/unity/shade_focused_prelight.png differ
diff --git a/Paper/unity/shade_focused_pressed.png b/Paper/unity/shade_focused_pressed.png
new file mode 100644
index 0000000..48fead8
Binary files /dev/null and b/Paper/unity/shade_focused_pressed.png differ
diff --git a/Paper/unity/shade_unfocused.png b/Paper/unity/shade_unfocused.png
new file mode 100644
index 0000000..1e80edc
Binary files /dev/null and b/Paper/unity/shade_unfocused.png differ
diff --git a/Paper/unity/shade_unfocused_prelight.png b/Paper/unity/shade_unfocused_prelight.png
new file mode 100644
index 0000000..23c44ca
Binary files /dev/null and b/Paper/unity/shade_unfocused_prelight.png differ
diff --git a/Paper/unity/shade_unfocused_pressed.png b/Paper/unity/shade_unfocused_pressed.png
new file mode 100644
index 0000000..e0403f0
Binary files /dev/null and b/Paper/unity/shade_unfocused_pressed.png differ
diff --git a/Paper/unity/unmaximize.png b/Paper/unity/unmaximize.png
index 17e8609..33ff66f 100644
Binary files a/Paper/unity/unmaximize.png and b/Paper/unity/unmaximize.png differ
diff --git a/Paper/unity/unmaximize_focused.png b/Paper/unity/unmaximize_focused.png
index 17e8609..33ff66f 100644
Binary files a/Paper/unity/unmaximize_focused.png and b/Paper/unity/unmaximize_focused.png differ
diff --git a/Paper/unity/unmaximize_focused_normal.png b/Paper/unity/unmaximize_focused_normal.png
index 17e8609..33ff66f 100644
Binary files a/Paper/unity/unmaximize_focused_normal.png and b/Paper/unity/unmaximize_focused_normal.png differ
diff --git a/Paper/unity/unmaximize_focused_prelight.png b/Paper/unity/unmaximize_focused_prelight.png
index abf338a..37094d8 100644
Binary files a/Paper/unity/unmaximize_focused_prelight.png and b/Paper/unity/unmaximize_focused_prelight.png differ
diff --git a/Paper/unity/unmaximize_focused_pressed.png b/Paper/unity/unmaximize_focused_pressed.png
index 7c1c851..031d038 100644
Binary files a/Paper/unity/unmaximize_focused_pressed.png and b/Paper/unity/unmaximize_focused_pressed.png differ
diff --git a/Paper/unity/unmaximize_unfocused.png b/Paper/unity/unmaximize_unfocused.png
index b83db48..ed19165 100644
Binary files a/Paper/unity/unmaximize_unfocused.png and b/Paper/unity/unmaximize_unfocused.png differ
diff --git a/Paper/unity/unmaximize_unfocused_prelight.png b/Paper/unity/unmaximize_unfocused_prelight.png
index 3803e48..5ac09a3 100644
Binary files a/Paper/unity/unmaximize_unfocused_prelight.png and b/Paper/unity/unmaximize_unfocused_prelight.png differ
diff --git a/Paper/unity/unmaximize_unfocused_pressed.png b/Paper/unity/unmaximize_unfocused_pressed.png
index bb55fac..97be89d 100644
Binary files a/Paper/unity/unmaximize_unfocused_pressed.png and b/Paper/unity/unmaximize_unfocused_pressed.png differ
diff --git a/Paper/unity/unshade.png b/Paper/unity/unshade.png
new file mode 100644
index 0000000..e76cda5
Binary files /dev/null and b/Paper/unity/unshade.png differ
diff --git a/Paper/unity/unshade_focused.png b/Paper/unity/unshade_focused.png
new file mode 100644
index 0000000..e76cda5
Binary files /dev/null and b/Paper/unity/unshade_focused.png differ
diff --git a/Paper/unity/unshade_focused_normal.png b/Paper/unity/unshade_focused_normal.png
new file mode 100644
index 0000000..e76cda5
Binary files /dev/null and b/Paper/unity/unshade_focused_normal.png differ
diff --git a/Paper/unity/unshade_focused_prelight.png b/Paper/unity/unshade_focused_prelight.png
new file mode 100644
index 0000000..50574ab
Binary files /dev/null and b/Paper/unity/unshade_focused_prelight.png differ
diff --git a/Paper/unity/unshade_focused_pressed.png b/Paper/unity/unshade_focused_pressed.png
new file mode 100644
index 0000000..e71d304
Binary files /dev/null and b/Paper/unity/unshade_focused_pressed.png differ
diff --git a/Paper/unity/unshade_unfocused.png b/Paper/unity/unshade_unfocused.png
new file mode 100644
index 0000000..020f278
Binary files /dev/null and b/Paper/unity/unshade_unfocused.png differ
diff --git a/Paper/unity/unshade_unfocused_prelight.png b/Paper/unity/unshade_unfocused_prelight.png
new file mode 100644
index 0000000..0ac6a14
Binary files /dev/null and b/Paper/unity/unshade_unfocused_prelight.png differ
diff --git a/Paper/unity/unshade_unfocused_pressed.png b/Paper/unity/unshade_unfocused_pressed.png
new file mode 100644
index 0000000..ef71340
Binary files /dev/null and b/Paper/unity/unshade_unfocused_pressed.png differ
diff --git a/render-unity-assets.py b/render-unity-assets.py
deleted file mode 100755
index 7635ed8..0000000
--- a/render-unity-assets.py
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/usr/bin/python3
-
-# Thanks to the GNOME theme nerds for the original source of this script
-
-import os
-import sys
-import xml.sax
-import subprocess
-
-INKSCAPE = '/usr/bin/inkscape'
-OPTIPNG = '/usr/bin/optipng'
-SRC = os.path.join('.', 'src/unity')
-
-inkscape_process = None
-
-
-def optimize_png(png_file):
- if os.path.exists(OPTIPNG):
- process = subprocess.Popen([OPTIPNG, '-quiet', '-o7', png_file])
- process.wait()
-
-
-def wait_for_prompt(process, command=None):
- if command is not None:
- process.stdin.write((command+'\n').encode('utf-8'))
-
- # This is kinda ugly ...
- # Wait for just a '>', or '\n>' if some other char appearead first
- output = process.stdout.read(1)
- if output == b'>':
- return
-
- output += process.stdout.read(1)
- while output != b'\n>':
- output += process.stdout.read(1)
- output = output[1:]
-
-
-def start_inkscape():
- process = subprocess.Popen(
- [INKSCAPE, '--shell'],
- bufsize=0, stdin=subprocess.PIPE, stdout=subprocess.PIPE
- )
- wait_for_prompt(process)
- return process
-
-
-def inkscape_render_rect(icon_file, rect, output_file):
- global inkscape_process
- if inkscape_process is None:
- inkscape_process = start_inkscape()
- wait_for_prompt(inkscape_process,
- '%s -i %s -e %s' % (icon_file, rect, output_file)
- )
- optimize_png(output_file)
-
-
-class ContentHandler(xml.sax.ContentHandler):
- ROOT = 0
- SVG = 1
- LAYER = 2
- OTHER = 3
- TEXT = 4
-
- def __init__(self, path, force=False, filter=None):
- self.stack = [self.ROOT]
- self.inside = [self.ROOT]
- self.path = path
- self.rects = []
- self.state = self.ROOT
- self.chars = ""
- self.force = force
- self.filter = filter
-
- def endDocument(self):
- pass
-
- def startElement(self, name, attrs):
- if self.inside[-1] == self.ROOT:
- if name == "svg":
- self.stack.append(self.SVG)
- self.inside.append(self.SVG)
- return
- elif self.inside[-1] == self.SVG:
- if (name == "g" and ('inkscape:groupmode' in attrs) and ('inkscape:label' in attrs)
- and attrs['inkscape:groupmode'] == 'layer' and attrs['inkscape:label'].startswith('Baseplate')):
- self.stack.append(self.LAYER)
- self.inside.append(self.LAYER)
- self.context = None
- self.icon_name = None
- self.rects = []
- return
- elif self.inside[-1] == self.LAYER:
- if name == "text" and ('inkscape:label' in attrs) and attrs['inkscape:label'] == 'context':
- self.stack.append(self.TEXT)
- self.inside.append(self.TEXT)
- self.text = 'context'
- self.chars = ""
- return
- elif name == "text" and ('inkscape:label' in attrs) and attrs['inkscape:label'] == 'icon-name':
- self.stack.append(self.TEXT)
- self.inside.append(self.TEXT)
- self.text = 'icon-name'
- self.chars = ""
- return
- elif name == "rect":
- self.rects.append(attrs)
-
- self.stack.append(self.OTHER)
-
- def endElement(self, name):
- stacked = self.stack.pop()
- if self.inside[-1] == stacked:
- self.inside.pop()
-
- if stacked == self.TEXT and self.text is not None:
- assert self.text in ['context', 'icon-name']
- if self.text == 'context':
- self.context = self.chars
- elif self.text == 'icon-name':
- self.icon_name = self.chars
- self.text = None
- elif stacked == self.LAYER:
- assert self.icon_name
- assert self.context
-
- if self.filter is not None and not self.icon_name in self.filter:
- return
-
- print (self.context, self.icon_name)
- for rect in self.rects:
- width = rect['width']
- height = rect['height']
- id = rect['id']
-
- dir = os.path.join("Paper", self.context)
- outfile = os.path.join(dir, self.icon_name+'.png')
- if not os.path.exists(dir):
- os.makedirs(dir)
- # Do a time based check!
- if self.force or not os.path.exists(outfile):
- inkscape_render_rect(self.path, id, outfile)
- sys.stdout.write('.')
- else:
- stat_in = os.stat(self.path)
- stat_out = os.stat(outfile)
- if stat_in.st_mtime > stat_out.st_mtime:
- inkscape_render_rect(self.path, id, outfile)
- sys.stdout.write('.')
- else:
- sys.stdout.write('-')
- sys.stdout.flush()
- sys.stdout.write('\n')
- sys.stdout.flush()
-
- def characters(self, chars):
- self.chars += chars.strip()
-
-if len(sys.argv) == 1:
- if not os.path.exists('Paper'):
- os.mkdir('Paper')
- print ('Rendering from SVGs in', SRC)
- for file in os.listdir(SRC):
- if file[-4:] == '.svg':
- file = os.path.join(SRC, file)
- handler = ContentHandler(file)
- xml.sax.parse(open(file), handler)
-else:
- file = os.path.join(SRC, sys.argv[1] + '.svg')
- if len(sys.argv) > 2:
- icons = sys.argv[2:]
- else:
- icons = None
- if os.path.exists(os.path.join(file)):
- handler = ContentHandler(file, True, filter=icons)
- xml.sax.parse(open(file), handler)
- else:
- print ("Error: No such file", file)
- sys.exit(1)
diff --git a/src/metacity/metacity-assets.svg b/src/metacity/metacity-assets.svg
index df23251..d8934ae 100644
--- a/src/metacity/metacity-assets.svg
+++ b/src/metacity/metacity-assets.svg
@@ -16,7 +16,7 @@
height="300"
id="svg11300"
sodipodi:version="0.32"
- inkscape:version="0.48.4 r9939"
+ inkscape:version="0.91 r13725"
sodipodi:docname="metacity-assets.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.0"
@@ -28,23 +28,23 @@
stroke="#ef2929"
fill="#f57900"
id="base"
- pagecolor="#349F8C"
+ pagecolor="#454d50"
bordercolor="#666666"
borderopacity="0.25490196"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:zoom="1"
- inkscape:cx="81.807613"
- inkscape:cy="85.008299"
+ inkscape:cx="107.08177"
+ inkscape:cy="136.0677"
inkscape:current-layer="layer6"
showgrid="false"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:showpageshadow="false"
- inkscape:window-width="1364"
- inkscape:window-height="709"
+ inkscape:window-width="1366"
+ inkscape:window-height="699"
inkscape:window-x="0"
- inkscape:window-y="28"
+ inkscape:window-y="27"
width="400px"
height="300px"
inkscape:snap-nodes="true"
@@ -786,76 +786,166 @@
inkscape:label="Symbols"
style="display:inline">
+ style="opacity:0.75;fill:#ffffff;fill-opacity:1;stroke:none"
+ d="m 56,146 0,8 8,0 0,-8 z m 2,2 4,0 0,4 -4,0 z"
+ id="path4706"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccc" />
+
+
+
+
+
+
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.88161469;marker:none;enable-background:accumulate"
+ d="m 30,232 c -4.418278,0 -8,3.58172 -8,8 0,4.41828 3.581722,8 8,8 4.418278,0 8,-3.58172 8,-8 0,-4.41828 -3.581722,-8 -8,-8 z m -4,4 1,0 c 0.276142,0 0.537786,0.10028 0.71875,0.28125 L 30,238.5625 32.28125,236.28125 C 32.462214,236.10028 32.723858,236 33,236 l 1,0 0,1 c 0.03655,0.27371 -0.100286,0.53778 -0.28125,0.71875 L 31.4375,240 l 2.28125,2.28125 C 33.899714,242.46222 34,242.72386 34,243 l 0,1 -1,0 c -0.276142,0 -0.537786,-0.10028 -0.71875,-0.28125 L 30,241.4375 27.71875,243.71875 C 27.537786,243.89972 27.276142,244 27,244 l -1,0 0,-1 c 0,-0.27614 0.100286,-0.53778 0.28125,-0.71875 L 28.5625,240 26.28125,237.71875 C 26.100286,237.53778 26,237.27614 26,237 Z"
+ id="path3531"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ssssscscccscccccscscccscscccsc" />
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.88161469;marker:none;enable-background:accumulate"
+ d="m 90,232 c -4.418272,0 -8,3.58173 -8,8 0,4.41827 3.581728,8 8,8 4.418272,0 8,-3.58173 8,-8 0,-4.41827 -3.581728,-8 -8,-8 z m -3,5 5,0 1,0 0,6 -6,0 z m 2,2 0,2 2,0 0,-2 z"
+ id="path4948-3"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssssccccccccccc" />
+ d="m 60,202 c -4.418278,0 -8,3.58172 -8,8 0,4.41828 3.581722,8 8,8 4.418278,0 8,-3.58172 8,-8 0,-4.41828 -3.581722,-8 -8,-8 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.88161469;stroke-opacity:1;marker:none;enable-background:accumulate"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
+ d="m 30,202 c -4.418278,0 -8,3.58172 -8,8 0,4.41828 3.581722,8 8,8 4.418278,0 8,-3.58172 8,-8 0,-4.41828 -3.581722,-8 -8,-8 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.88161469;stroke-opacity:1;marker:none;enable-background:accumulate"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
+ d="m 90,202 c -4.418272,0 -8,3.58173 -8,8 0,4.41827 3.581728,8 8,8 4.418272,0 8,-3.58173 8,-8 0,-4.41827 -3.581728,-8 -8,-8 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.88161469;stroke-opacity:1;marker:none;enable-background:accumulate"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.88161469;marker:none;enable-background:accumulate"
+ d="M 60 112 C 55.581722 112 52 115.58172 52 120 C 52 124.41828 55.581722 128 60 128 C 64.418278 128 68 124.41828 68 120 C 68 115.58172 64.418278 112 60 112 z M 56 116 L 64 116 L 64 124 L 56 124 L 56 116 z M 58 118 L 58 122 L 62 122 L 62 118 L 58 118 z "
+ id="path3555" />
+
+
+
+
+
+
+
+
@@ -1190,41 +1280,12 @@
style="display:inline"
inkscape:label="Background"
id="g4295"
- inkscape:groupmode="layer">
-
-
+ inkscape:groupmode="layer" />
-
-
-
-
-
+ inkscape:groupmode="layer" />
-
-
+ style="display:inline" />
-
-
-
-
-
+ style="display:inline" />
-
-
+ d="m 120,202 c -4.41827,0 -8,3.58173 -8,8 0,4.41827 3.58173,8 8,8 4.41827,0 8,-3.58173 8,-8 0,-4.41827 -3.58173,-8 -8,-8 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.88161469;stroke-opacity:1;marker:none;enable-background:accumulate"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
+
+
-
-
-
-
-
+ style="display:inline" />
+ d="m 150,202 c -4.41828,0 -8,3.58172 -8,8 0,4.41828 3.58172,8 8,8 4.41828,0 8,-3.58172 8,-8 0,-4.41828 -3.58172,-8 -8,-8 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.88161469;stroke-opacity:1;marker:none;enable-background:accumulate"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
+ d="m 180,202 c -4.41828,0 -8,3.58172 -8,8 0,4.41828 3.58172,8 8,8 4.41828,0 8,-3.58172 8,-8 0,-4.41828 -3.58172,-8 -8,-8 z"
+ style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.88161469;stroke-opacity:1;marker:none;enable-background:accumulate"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
+
+
-
-
+ style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+ d="m 210,266 c -2.20914,0 -4,1.79086 -4,4 0,2.20914 1.79086,4 4,4 2.20914,0 4,-1.79086 4,-4 0,-2.20914 -1.79086,-4 -4,-4 z"
+ id="path4526"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
-
-
+ d="m 210,146 c -2.20914,0 -4,1.79086 -4,4 0,2.20914 1.79086,4 4,4 2.20914,0 4,-1.79086 4,-4 0,-2.20914 -1.79086,-4 -4,-4 z"
+ style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0.75;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="sssss" />
+
+
-
-
-