Fix installation of a11y and compact themes (Fixes #316) (#318)

Fix installation of a11y and compact themes (#316)
shimmerproject · Mar 23, 2022 · 19ddad5 · 19ddad5
1 parent 39b220a
commit 19ddad5
Show file tree

Hide file tree

Showing 388 changed files with 4 additions and 1,242 deletions.
diff --git a/dark/meson.build b/dark/meson.build
@@ -76,7 +76,7 @@ if not get_option('flatpak')
     install_subdir('gnome-shell', install_dir : theme_path)
     install_subdir('metacity-1', install_dir : theme_path)
     install_subdir('xfwm4', install_dir : theme_path)
-    install_subdir('xfwm4-a11y', install_dir : join_paths (a11y_theme_path, 'xfwm4'))
     install_subdir('plank', install_dir : theme_path)
     install_subdir('unity', install_dir : theme_path)
+    install_subdir('variants/a11y/xfwm4', install_dir : a11y_theme_path)
 endif
diff --git a/dark/xfwm4-a11y/bottom-active.xpm → dark/variants/a11y/xfwm4/bottom-active.xpm b/dark/xfwm4-a11y/bottom-active.xpm → dark/variants/a11y/xfwm4/bottom-active.xpm
diff --git a/dark/xfwm4-a11y/bottom-inactive.xpm → dark/variants/a11y/xfwm4/bottom-inactive.xpm b/dark/xfwm4-a11y/bottom-inactive.xpm → dark/variants/a11y/xfwm4/bottom-inactive.xpm
diff --git a/dark/xfwm4-a11y/bottom-left-active.xpm → ...ariants/a11y/xfwm4/bottom-left-active.xpm b/dark/xfwm4-a11y/bottom-left-active.xpm → ...ariants/a11y/xfwm4/bottom-left-active.xpm
diff --git a/dark/xfwm4-a11y/bottom-left-inactive.xpm → ...iants/a11y/xfwm4/bottom-left-inactive.xpm b/dark/xfwm4-a11y/bottom-left-inactive.xpm → ...iants/a11y/xfwm4/bottom-left-inactive.xpm
diff --git a/dark/xfwm4-a11y/bottom-right-active.xpm → ...riants/a11y/xfwm4/bottom-right-active.xpm b/dark/xfwm4-a11y/bottom-right-active.xpm → ...riants/a11y/xfwm4/bottom-right-active.xpm
diff --git a/dark/xfwm4-a11y/bottom-right-inactive.xpm → ...ants/a11y/xfwm4/bottom-right-inactive.xpm b/dark/xfwm4-a11y/bottom-right-inactive.xpm → ...ants/a11y/xfwm4/bottom-right-inactive.xpm
diff --git a/dark/xfwm4-a11y/close-active.png → dark/variants/a11y/xfwm4/close-active.png b/dark/xfwm4-a11y/close-active.png → dark/variants/a11y/xfwm4/close-active.png
diff --git a/dark/xfwm4-a11y/close-inactive.png → dark/variants/a11y/xfwm4/close-inactive.png b/dark/xfwm4-a11y/close-inactive.png → dark/variants/a11y/xfwm4/close-inactive.png
diff --git a/dark/xfwm4-a11y/close-prelight.png → dark/variants/a11y/xfwm4/close-prelight.png b/dark/xfwm4-a11y/close-prelight.png → dark/variants/a11y/xfwm4/close-prelight.png
diff --git a/dark/xfwm4-a11y/close-pressed.png → dark/variants/a11y/xfwm4/close-pressed.png b/dark/xfwm4-a11y/close-pressed.png → dark/variants/a11y/xfwm4/close-pressed.png
diff --git a/dark/xfwm4-a11y/hide-active.png → dark/variants/a11y/xfwm4/hide-active.png b/dark/xfwm4-a11y/hide-active.png → dark/variants/a11y/xfwm4/hide-active.png
diff --git a/dark/xfwm4-a11y/hide-inactive.png → dark/variants/a11y/xfwm4/hide-inactive.png b/dark/xfwm4-a11y/hide-inactive.png → dark/variants/a11y/xfwm4/hide-inactive.png
diff --git a/dark/xfwm4-a11y/hide-prelight.png → dark/variants/a11y/xfwm4/hide-prelight.png b/dark/xfwm4-a11y/hide-prelight.png → dark/variants/a11y/xfwm4/hide-prelight.png
diff --git a/dark/xfwm4-a11y/hide-pressed.png → dark/variants/a11y/xfwm4/hide-pressed.png b/dark/xfwm4-a11y/hide-pressed.png → dark/variants/a11y/xfwm4/hide-pressed.png
diff --git a/dark/xfwm4-a11y/left-active.xpm → dark/variants/a11y/xfwm4/left-active.xpm b/dark/xfwm4-a11y/left-active.xpm → dark/variants/a11y/xfwm4/left-active.xpm
diff --git a/dark/xfwm4-a11y/left-inactive.xpm → dark/variants/a11y/xfwm4/left-inactive.xpm b/dark/xfwm4-a11y/left-inactive.xpm → dark/variants/a11y/xfwm4/left-inactive.xpm
diff --git a/dark/xfwm4-a11y/maximize-active.png → dark/variants/a11y/xfwm4/maximize-active.png b/dark/xfwm4-a11y/maximize-active.png → dark/variants/a11y/xfwm4/maximize-active.png
diff --git a/dark/xfwm4-a11y/maximize-inactive.png → ...variants/a11y/xfwm4/maximize-inactive.png b/dark/xfwm4-a11y/maximize-inactive.png → ...variants/a11y/xfwm4/maximize-inactive.png
diff --git a/dark/xfwm4-a11y/maximize-prelight.png → ...variants/a11y/xfwm4/maximize-prelight.png b/dark/xfwm4-a11y/maximize-prelight.png → ...variants/a11y/xfwm4/maximize-prelight.png
diff --git a/dark/xfwm4-a11y/maximize-pressed.png → .../variants/a11y/xfwm4/maximize-pressed.png b/dark/xfwm4-a11y/maximize-pressed.png → .../variants/a11y/xfwm4/maximize-pressed.png
diff --git a/dark/xfwm4-a11y/maximize-toggled-active.png → ...ts/a11y/xfwm4/maximize-toggled-active.png b/dark/xfwm4-a11y/maximize-toggled-active.png → ...ts/a11y/xfwm4/maximize-toggled-active.png
diff --git a/.../xfwm4-a11y/maximize-toggled-inactive.png → .../a11y/xfwm4/maximize-toggled-inactive.png b/.../xfwm4-a11y/maximize-toggled-inactive.png → .../a11y/xfwm4/maximize-toggled-inactive.png
diff --git a/.../xfwm4-a11y/maximize-toggled-prelight.png → .../a11y/xfwm4/maximize-toggled-prelight.png b/.../xfwm4-a11y/maximize-toggled-prelight.png → .../a11y/xfwm4/maximize-toggled-prelight.png
diff --git a/dark/xfwm4-a11y/maximize-toggled-pressed.png → ...s/a11y/xfwm4/maximize-toggled-pressed.png b/dark/xfwm4-a11y/maximize-toggled-pressed.png → ...s/a11y/xfwm4/maximize-toggled-pressed.png
diff --git a/dark/xfwm4-a11y/menu-active.png → dark/variants/a11y/xfwm4/menu-active.png b/dark/xfwm4-a11y/menu-active.png → dark/variants/a11y/xfwm4/menu-active.png
diff --git a/dark/xfwm4-a11y/menu-inactive.png → dark/variants/a11y/xfwm4/menu-inactive.png b/dark/xfwm4-a11y/menu-inactive.png → dark/variants/a11y/xfwm4/menu-inactive.png
diff --git a/dark/xfwm4-a11y/menu-prelight.png → dark/variants/a11y/xfwm4/menu-prelight.png b/dark/xfwm4-a11y/menu-prelight.png → dark/variants/a11y/xfwm4/menu-prelight.png
diff --git a/dark/xfwm4-a11y/menu-pressed.png → dark/variants/a11y/xfwm4/menu-pressed.png b/dark/xfwm4-a11y/menu-pressed.png → dark/variants/a11y/xfwm4/menu-pressed.png
diff --git a/dark/xfwm4-a11y/right-active.xpm → dark/variants/a11y/xfwm4/right-active.xpm b/dark/xfwm4-a11y/right-active.xpm → dark/variants/a11y/xfwm4/right-active.xpm
diff --git a/dark/xfwm4-a11y/right-inactive.xpm → dark/variants/a11y/xfwm4/right-inactive.xpm b/dark/xfwm4-a11y/right-inactive.xpm → dark/variants/a11y/xfwm4/right-inactive.xpm
diff --git a/dark/xfwm4-a11y/shade-active.png → dark/variants/a11y/xfwm4/shade-active.png b/dark/xfwm4-a11y/shade-active.png → dark/variants/a11y/xfwm4/shade-active.png
diff --git a/dark/xfwm4-a11y/shade-inactive.png → dark/variants/a11y/xfwm4/shade-inactive.png b/dark/xfwm4-a11y/shade-inactive.png → dark/variants/a11y/xfwm4/shade-inactive.png
diff --git a/dark/xfwm4-a11y/shade-prelight.png → dark/variants/a11y/xfwm4/shade-prelight.png b/dark/xfwm4-a11y/shade-prelight.png → dark/variants/a11y/xfwm4/shade-prelight.png
diff --git a/dark/xfwm4-a11y/shade-pressed.png → dark/variants/a11y/xfwm4/shade-pressed.png b/dark/xfwm4-a11y/shade-pressed.png → dark/variants/a11y/xfwm4/shade-pressed.png
diff --git a/dark/xfwm4-a11y/shade-toggled-active.png → ...iants/a11y/xfwm4/shade-toggled-active.png b/dark/xfwm4-a11y/shade-toggled-active.png → ...iants/a11y/xfwm4/shade-toggled-active.png
diff --git a/dark/xfwm4-a11y/shade-toggled-inactive.png → ...nts/a11y/xfwm4/shade-toggled-inactive.png b/dark/xfwm4-a11y/shade-toggled-inactive.png → ...nts/a11y/xfwm4/shade-toggled-inactive.png
diff --git a/dark/xfwm4-a11y/shade-toggled-prelight.png → ...nts/a11y/xfwm4/shade-toggled-prelight.png b/dark/xfwm4-a11y/shade-toggled-prelight.png → ...nts/a11y/xfwm4/shade-toggled-prelight.png
diff --git a/dark/xfwm4-a11y/shade-toggled-pressed.png → ...ants/a11y/xfwm4/shade-toggled-pressed.png b/dark/xfwm4-a11y/shade-toggled-pressed.png → ...ants/a11y/xfwm4/shade-toggled-pressed.png
diff --git a/dark/xfwm4-a11y/stick-active.png → dark/variants/a11y/xfwm4/stick-active.png b/dark/xfwm4-a11y/stick-active.png → dark/variants/a11y/xfwm4/stick-active.png
diff --git a/dark/xfwm4-a11y/stick-inactive.png → dark/variants/a11y/xfwm4/stick-inactive.png b/dark/xfwm4-a11y/stick-inactive.png → dark/variants/a11y/xfwm4/stick-inactive.png
diff --git a/dark/xfwm4-a11y/stick-prelight.png → dark/variants/a11y/xfwm4/stick-prelight.png b/dark/xfwm4-a11y/stick-prelight.png → dark/variants/a11y/xfwm4/stick-prelight.png
diff --git a/dark/xfwm4-a11y/stick-pressed.png → dark/variants/a11y/xfwm4/stick-pressed.png b/dark/xfwm4-a11y/stick-pressed.png → dark/variants/a11y/xfwm4/stick-pressed.png
diff --git a/dark/xfwm4-a11y/stick-toggled-active.png → ...iants/a11y/xfwm4/stick-toggled-active.png b/dark/xfwm4-a11y/stick-toggled-active.png → ...iants/a11y/xfwm4/stick-toggled-active.png
diff --git a/dark/xfwm4-a11y/stick-toggled-inactive.png → ...nts/a11y/xfwm4/stick-toggled-inactive.png b/dark/xfwm4-a11y/stick-toggled-inactive.png → ...nts/a11y/xfwm4/stick-toggled-inactive.png
diff --git a/dark/xfwm4-a11y/stick-toggled-prelight.png → ...nts/a11y/xfwm4/stick-toggled-prelight.png b/dark/xfwm4-a11y/stick-toggled-prelight.png → ...nts/a11y/xfwm4/stick-toggled-prelight.png
diff --git a/dark/xfwm4-a11y/stick-toggled-pressed.png → ...ants/a11y/xfwm4/stick-toggled-pressed.png b/dark/xfwm4-a11y/stick-toggled-pressed.png → ...ants/a11y/xfwm4/stick-toggled-pressed.png
diff --git a/dark/xfwm4-a11y/themerc → dark/variants/a11y/xfwm4/themerc b/dark/xfwm4-a11y/themerc → dark/variants/a11y/xfwm4/themerc
diff --git a/dark/xfwm4-a11y/title-1-active.xpm → dark/variants/a11y/xfwm4/title-1-active.xpm b/dark/xfwm4-a11y/title-1-active.xpm → dark/variants/a11y/xfwm4/title-1-active.xpm
diff --git a/dark/xfwm4-a11y/title-1-inactive.xpm → .../variants/a11y/xfwm4/title-1-inactive.xpm b/dark/xfwm4-a11y/title-1-inactive.xpm → .../variants/a11y/xfwm4/title-1-inactive.xpm
diff --git a/dark/xfwm4-a11y/title-2-active.xpm → dark/variants/a11y/xfwm4/title-2-active.xpm b/dark/xfwm4-a11y/title-2-active.xpm → dark/variants/a11y/xfwm4/title-2-active.xpm
diff --git a/dark/xfwm4-a11y/title-2-inactive.xpm → .../variants/a11y/xfwm4/title-2-inactive.xpm b/dark/xfwm4-a11y/title-2-inactive.xpm → .../variants/a11y/xfwm4/title-2-inactive.xpm
diff --git a/dark/xfwm4-a11y/title-3-active.xpm → dark/variants/a11y/xfwm4/title-3-active.xpm b/dark/xfwm4-a11y/title-3-active.xpm → dark/variants/a11y/xfwm4/title-3-active.xpm
diff --git a/dark/xfwm4-a11y/title-3-inactive.xpm → .../variants/a11y/xfwm4/title-3-inactive.xpm b/dark/xfwm4-a11y/title-3-inactive.xpm → .../variants/a11y/xfwm4/title-3-inactive.xpm
diff --git a/dark/xfwm4-a11y/title-4-active.xpm → dark/variants/a11y/xfwm4/title-4-active.xpm b/dark/xfwm4-a11y/title-4-active.xpm → dark/variants/a11y/xfwm4/title-4-active.xpm
diff --git a/dark/xfwm4-a11y/title-4-inactive.xpm → .../variants/a11y/xfwm4/title-4-inactive.xpm b/dark/xfwm4-a11y/title-4-inactive.xpm → .../variants/a11y/xfwm4/title-4-inactive.xpm
diff --git a/dark/xfwm4-a11y/title-5-active.xpm → dark/variants/a11y/xfwm4/title-5-active.xpm b/dark/xfwm4-a11y/title-5-active.xpm → dark/variants/a11y/xfwm4/title-5-active.xpm
diff --git a/dark/xfwm4-a11y/title-5-inactive.xpm → .../variants/a11y/xfwm4/title-5-inactive.xpm b/dark/xfwm4-a11y/title-5-inactive.xpm → .../variants/a11y/xfwm4/title-5-inactive.xpm
diff --git a/dark/xfwm4-a11y/top-left-active.xpm → dark/variants/a11y/xfwm4/top-left-active.xpm b/dark/xfwm4-a11y/top-left-active.xpm → dark/variants/a11y/xfwm4/top-left-active.xpm
diff --git a/dark/xfwm4-a11y/top-left-inactive.xpm → ...variants/a11y/xfwm4/top-left-inactive.xpm b/dark/xfwm4-a11y/top-left-inactive.xpm → ...variants/a11y/xfwm4/top-left-inactive.xpm
diff --git a/dark/xfwm4-a11y/top-right-active.xpm → .../variants/a11y/xfwm4/top-right-active.xpm b/dark/xfwm4-a11y/top-right-active.xpm → .../variants/a11y/xfwm4/top-right-active.xpm
diff --git a/dark/xfwm4-a11y/top-right-inactive.xpm → ...ariants/a11y/xfwm4/top-right-inactive.xpm b/dark/xfwm4-a11y/top-right-inactive.xpm → ...ariants/a11y/xfwm4/top-right-inactive.xpm
diff --git a/light/meson.build b/light/meson.build
@@ -15,10 +15,10 @@ if not get_option('flatpak')
     install_subdir('gnome-shell', install_dir : theme_path)
     install_subdir('metacity-1', install_dir : theme_path)
     install_subdir('xfce-notify-4.0', install_dir : theme_path)
-    install_subdir('xfce-notify-4.0_bright', install_dir : bright_theme_path)
     install_subdir('xfwm4', install_dir : theme_path)
-    install_subdir('xfwm4-a11y', install_dir : join_paths (a11y_theme_path, 'xfwm4'))
-    install_subdir('xfwm4-compact', install_dir : join_paths (compact_theme_path, 'xfwm4'))
     install_subdir('plank', install_dir : theme_path)
     install_subdir('unity', install_dir : theme_path)
+    install_subdir('variants/a11y/xfwm4', install_dir : a11y_theme_path)
+    install_subdir('variants/bright/xfce-notify-4.0', install_dir : bright_theme_path)
+    install_subdir('variants/compact/xfwm4', install_dir : compact_theme_path)
 endif
diff --git a/light/xfwm4-a11y/base-inactive.png → light/variants/a11y/xfwm4/base-inactive.png b/light/xfwm4-a11y/base-inactive.png → light/variants/a11y/xfwm4/base-inactive.png
diff --git a/light/xfwm4-a11y/base.png → light/variants/a11y/xfwm4/base.png b/light/xfwm4-a11y/base.png → light/variants/a11y/xfwm4/base.png
diff --git a/light/xfwm4-a11y/bottom-active.xpm → light/variants/a11y/xfwm4/bottom-active.xpm b/light/xfwm4-a11y/bottom-active.xpm → light/variants/a11y/xfwm4/bottom-active.xpm
diff --git a/dark/xfwm4-compact/bottom-inactive.xpm → ...t/variants/a11y/xfwm4/bottom-inactive.xpm b/dark/xfwm4-compact/bottom-inactive.xpm → ...t/variants/a11y/xfwm4/bottom-inactive.xpm
diff --git a/light/xfwm4-a11y/bottom-left-active.xpm → ...ariants/a11y/xfwm4/bottom-left-active.xpm b/light/xfwm4-a11y/bottom-left-active.xpm → ...ariants/a11y/xfwm4/bottom-left-active.xpm
diff --git a/dark/xfwm4-compact/bottom-left-inactive.xpm → ...iants/a11y/xfwm4/bottom-left-inactive.xpm b/dark/xfwm4-compact/bottom-left-inactive.xpm → ...iants/a11y/xfwm4/bottom-left-inactive.xpm
diff --git a/light/xfwm4-a11y/bottom-right-active.xpm → ...riants/a11y/xfwm4/bottom-right-active.xpm b/light/xfwm4-a11y/bottom-right-active.xpm → ...riants/a11y/xfwm4/bottom-right-active.xpm
diff --git a/dark/xfwm4-compact/bottom-right-inactive.xpm → ...ants/a11y/xfwm4/bottom-right-inactive.xpm b/dark/xfwm4-compact/bottom-right-inactive.xpm → ...ants/a11y/xfwm4/bottom-right-inactive.xpm
diff --git a/light/xfwm4-a11y/close-active.png → light/variants/a11y/xfwm4/close-active.png b/light/xfwm4-a11y/close-active.png → light/variants/a11y/xfwm4/close-active.png
diff --git a/light/xfwm4-a11y/close-active.xpm → light/variants/a11y/xfwm4/close-active.xpm b/light/xfwm4-a11y/close-active.xpm → light/variants/a11y/xfwm4/close-active.xpm
diff --git a/light/xfwm4-a11y/close-inactive.png → light/variants/a11y/xfwm4/close-inactive.png b/light/xfwm4-a11y/close-inactive.png → light/variants/a11y/xfwm4/close-inactive.png
diff --git a/light/xfwm4-a11y/close-inactive.xpm → light/variants/a11y/xfwm4/close-inactive.xpm b/light/xfwm4-a11y/close-inactive.xpm → light/variants/a11y/xfwm4/close-inactive.xpm
diff --git a/light/xfwm4-a11y/close-prelight.png → light/variants/a11y/xfwm4/close-prelight.png b/light/xfwm4-a11y/close-prelight.png → light/variants/a11y/xfwm4/close-prelight.png
diff --git a/light/xfwm4-a11y/close-prelight.xpm → light/variants/a11y/xfwm4/close-prelight.xpm b/light/xfwm4-a11y/close-prelight.xpm → light/variants/a11y/xfwm4/close-prelight.xpm
diff --git a/light/xfwm4-a11y/close-pressed.png → light/variants/a11y/xfwm4/close-pressed.png b/light/xfwm4-a11y/close-pressed.png → light/variants/a11y/xfwm4/close-pressed.png
diff --git a/light/xfwm4-a11y/close-pressed.xpm → light/variants/a11y/xfwm4/close-pressed.xpm b/light/xfwm4-a11y/close-pressed.xpm → light/variants/a11y/xfwm4/close-pressed.xpm
diff --git a/light/xfwm4-a11y/hide-active.png → light/variants/a11y/xfwm4/hide-active.png b/light/xfwm4-a11y/hide-active.png → light/variants/a11y/xfwm4/hide-active.png
diff --git a/light/xfwm4-a11y/hide-active.xpm → light/variants/a11y/xfwm4/hide-active.xpm b/light/xfwm4-a11y/hide-active.xpm → light/variants/a11y/xfwm4/hide-active.xpm
diff --git a/light/xfwm4-a11y/hide-inactive.png → light/variants/a11y/xfwm4/hide-inactive.png b/light/xfwm4-a11y/hide-inactive.png → light/variants/a11y/xfwm4/hide-inactive.png
diff --git a/light/xfwm4-a11y/hide-inactive.xpm → light/variants/a11y/xfwm4/hide-inactive.xpm b/light/xfwm4-a11y/hide-inactive.xpm → light/variants/a11y/xfwm4/hide-inactive.xpm
diff --git a/light/xfwm4-a11y/hide-prelight.png → light/variants/a11y/xfwm4/hide-prelight.png b/light/xfwm4-a11y/hide-prelight.png → light/variants/a11y/xfwm4/hide-prelight.png
diff --git a/light/xfwm4-a11y/hide-prelight.xpm → light/variants/a11y/xfwm4/hide-prelight.xpm b/light/xfwm4-a11y/hide-prelight.xpm → light/variants/a11y/xfwm4/hide-prelight.xpm
diff --git a/light/xfwm4-a11y/hide-pressed.png → light/variants/a11y/xfwm4/hide-pressed.png b/light/xfwm4-a11y/hide-pressed.png → light/variants/a11y/xfwm4/hide-pressed.png
diff --git a/light/xfwm4-a11y/hide-pressed.xpm → light/variants/a11y/xfwm4/hide-pressed.xpm b/light/xfwm4-a11y/hide-pressed.xpm → light/variants/a11y/xfwm4/hide-pressed.xpm
diff --git a/light/xfwm4-a11y/left-active.xpm → light/variants/a11y/xfwm4/left-active.xpm b/light/xfwm4-a11y/left-active.xpm → light/variants/a11y/xfwm4/left-active.xpm
diff --git a/dark/xfwm4-compact/left-inactive.xpm → light/variants/a11y/xfwm4/left-inactive.xpm b/dark/xfwm4-compact/left-inactive.xpm → light/variants/a11y/xfwm4/left-inactive.xpm
diff --git a/light/xfwm4-a11y/maximize-active.png → ...t/variants/a11y/xfwm4/maximize-active.png b/light/xfwm4-a11y/maximize-active.png → ...t/variants/a11y/xfwm4/maximize-active.png
diff --git a/light/xfwm4-a11y/maximize-active.xpm → ...t/variants/a11y/xfwm4/maximize-active.xpm b/light/xfwm4-a11y/maximize-active.xpm → ...t/variants/a11y/xfwm4/maximize-active.xpm
diff --git a/light/xfwm4-a11y/maximize-inactive.png → ...variants/a11y/xfwm4/maximize-inactive.png b/light/xfwm4-a11y/maximize-inactive.png → ...variants/a11y/xfwm4/maximize-inactive.png
diff --git a/light/xfwm4-a11y/maximize-inactive.xpm → ...variants/a11y/xfwm4/maximize-inactive.xpm b/light/xfwm4-a11y/maximize-inactive.xpm → ...variants/a11y/xfwm4/maximize-inactive.xpm
diff --git a/light/xfwm4-a11y/maximize-prelight.png → ...variants/a11y/xfwm4/maximize-prelight.png b/light/xfwm4-a11y/maximize-prelight.png → ...variants/a11y/xfwm4/maximize-prelight.png
diff --git a/light/xfwm4-a11y/maximize-prelight.xpm → ...variants/a11y/xfwm4/maximize-prelight.xpm b/light/xfwm4-a11y/maximize-prelight.xpm → ...variants/a11y/xfwm4/maximize-prelight.xpm
diff --git a/light/xfwm4-a11y/maximize-pressed.png → .../variants/a11y/xfwm4/maximize-pressed.png b/light/xfwm4-a11y/maximize-pressed.png → .../variants/a11y/xfwm4/maximize-pressed.png
diff --git a/light/xfwm4-a11y/maximize-pressed.xpm → .../variants/a11y/xfwm4/maximize-pressed.xpm b/light/xfwm4-a11y/maximize-pressed.xpm → .../variants/a11y/xfwm4/maximize-pressed.xpm
diff --git a/light/xfwm4-a11y/maximize-toggled-active.png → ...ts/a11y/xfwm4/maximize-toggled-active.png b/light/xfwm4-a11y/maximize-toggled-active.png → ...ts/a11y/xfwm4/maximize-toggled-active.png
diff --git a/.../xfwm4-a11y/maximize-toggled-inactive.png → .../a11y/xfwm4/maximize-toggled-inactive.png b/.../xfwm4-a11y/maximize-toggled-inactive.png → .../a11y/xfwm4/maximize-toggled-inactive.png
diff --git a/.../xfwm4-a11y/maximize-toggled-prelight.png → .../a11y/xfwm4/maximize-toggled-prelight.png b/.../xfwm4-a11y/maximize-toggled-prelight.png → .../a11y/xfwm4/maximize-toggled-prelight.png
diff --git a/...t/xfwm4-a11y/maximize-toggled-pressed.png → ...s/a11y/xfwm4/maximize-toggled-pressed.png b/...t/xfwm4-a11y/maximize-toggled-pressed.png → ...s/a11y/xfwm4/maximize-toggled-pressed.png
diff --git a/light/xfwm4-a11y/menu-active.png → light/variants/a11y/xfwm4/menu-active.png b/light/xfwm4-a11y/menu-active.png → light/variants/a11y/xfwm4/menu-active.png
diff --git a/light/xfwm4-a11y/menu-active.xpm → light/variants/a11y/xfwm4/menu-active.xpm b/light/xfwm4-a11y/menu-active.xpm → light/variants/a11y/xfwm4/menu-active.xpm
diff --git a/light/xfwm4-a11y/menu-inactive.png → light/variants/a11y/xfwm4/menu-inactive.png b/light/xfwm4-a11y/menu-inactive.png → light/variants/a11y/xfwm4/menu-inactive.png
diff --git a/light/xfwm4-a11y/menu-inactive.xpm → light/variants/a11y/xfwm4/menu-inactive.xpm b/light/xfwm4-a11y/menu-inactive.xpm → light/variants/a11y/xfwm4/menu-inactive.xpm
diff --git a/light/xfwm4-a11y/menu-prelight.png → light/variants/a11y/xfwm4/menu-prelight.png b/light/xfwm4-a11y/menu-prelight.png → light/variants/a11y/xfwm4/menu-prelight.png
diff --git a/light/xfwm4-a11y/menu-prelight.xpm → light/variants/a11y/xfwm4/menu-prelight.xpm b/light/xfwm4-a11y/menu-prelight.xpm → light/variants/a11y/xfwm4/menu-prelight.xpm
diff --git a/light/xfwm4-a11y/menu-pressed.png → light/variants/a11y/xfwm4/menu-pressed.png b/light/xfwm4-a11y/menu-pressed.png → light/variants/a11y/xfwm4/menu-pressed.png
diff --git a/light/xfwm4-a11y/menu-pressed.xpm → light/variants/a11y/xfwm4/menu-pressed.xpm b/light/xfwm4-a11y/menu-pressed.xpm → light/variants/a11y/xfwm4/menu-pressed.xpm
diff --git a/light/xfwm4-a11y/right-active.xpm → light/variants/a11y/xfwm4/right-active.xpm b/light/xfwm4-a11y/right-active.xpm → light/variants/a11y/xfwm4/right-active.xpm
diff --git a/dark/xfwm4-compact/right-inactive.xpm → light/variants/a11y/xfwm4/right-inactive.xpm b/dark/xfwm4-compact/right-inactive.xpm → light/variants/a11y/xfwm4/right-inactive.xpm
diff --git a/light/xfwm4-a11y/shade-active.png → light/variants/a11y/xfwm4/shade-active.png b/light/xfwm4-a11y/shade-active.png → light/variants/a11y/xfwm4/shade-active.png
diff --git a/light/xfwm4-a11y/shade-active.xpm → light/variants/a11y/xfwm4/shade-active.xpm b/light/xfwm4-a11y/shade-active.xpm → light/variants/a11y/xfwm4/shade-active.xpm
diff --git a/light/xfwm4-a11y/shade-inactive.png → light/variants/a11y/xfwm4/shade-inactive.png b/light/xfwm4-a11y/shade-inactive.png → light/variants/a11y/xfwm4/shade-inactive.png
diff --git a/light/xfwm4-a11y/shade-inactive.xpm → light/variants/a11y/xfwm4/shade-inactive.xpm b/light/xfwm4-a11y/shade-inactive.xpm → light/variants/a11y/xfwm4/shade-inactive.xpm
diff --git a/light/xfwm4-a11y/shade-prelight.png → light/variants/a11y/xfwm4/shade-prelight.png b/light/xfwm4-a11y/shade-prelight.png → light/variants/a11y/xfwm4/shade-prelight.png
diff --git a/light/xfwm4-a11y/shade-prelight.xpm → light/variants/a11y/xfwm4/shade-prelight.xpm b/light/xfwm4-a11y/shade-prelight.xpm → light/variants/a11y/xfwm4/shade-prelight.xpm
diff --git a/light/xfwm4-a11y/shade-pressed.png → light/variants/a11y/xfwm4/shade-pressed.png b/light/xfwm4-a11y/shade-pressed.png → light/variants/a11y/xfwm4/shade-pressed.png
diff --git a/light/xfwm4-a11y/shade-pressed.xpm → light/variants/a11y/xfwm4/shade-pressed.xpm b/light/xfwm4-a11y/shade-pressed.xpm → light/variants/a11y/xfwm4/shade-pressed.xpm
diff --git a/light/xfwm4-a11y/shade-toggled-active.png → ...iants/a11y/xfwm4/shade-toggled-active.png b/light/xfwm4-a11y/shade-toggled-active.png → ...iants/a11y/xfwm4/shade-toggled-active.png
diff --git a/light/xfwm4-a11y/shade-toggled-active.xpm → ...iants/a11y/xfwm4/shade-toggled-active.xpm b/light/xfwm4-a11y/shade-toggled-active.xpm → ...iants/a11y/xfwm4/shade-toggled-active.xpm
diff --git a/light/xfwm4-a11y/shade-toggled-inactive.png → ...nts/a11y/xfwm4/shade-toggled-inactive.png b/light/xfwm4-a11y/shade-toggled-inactive.png → ...nts/a11y/xfwm4/shade-toggled-inactive.png
diff --git a/light/xfwm4-a11y/shade-toggled-inactive.xpm → ...nts/a11y/xfwm4/shade-toggled-inactive.xpm b/light/xfwm4-a11y/shade-toggled-inactive.xpm → ...nts/a11y/xfwm4/shade-toggled-inactive.xpm
diff --git a/light/xfwm4-a11y/shade-toggled-prelight.png → ...nts/a11y/xfwm4/shade-toggled-prelight.png b/light/xfwm4-a11y/shade-toggled-prelight.png → ...nts/a11y/xfwm4/shade-toggled-prelight.png
diff --git a/light/xfwm4-a11y/shade-toggled-prelight.xpm → ...nts/a11y/xfwm4/shade-toggled-prelight.xpm b/light/xfwm4-a11y/shade-toggled-prelight.xpm → ...nts/a11y/xfwm4/shade-toggled-prelight.xpm
diff --git a/light/xfwm4-a11y/shade-toggled-pressed.png → ...ants/a11y/xfwm4/shade-toggled-pressed.png b/light/xfwm4-a11y/shade-toggled-pressed.png → ...ants/a11y/xfwm4/shade-toggled-pressed.png
diff --git a/light/xfwm4-a11y/shade-toggled-pressed.xpm → ...ants/a11y/xfwm4/shade-toggled-pressed.xpm b/light/xfwm4-a11y/shade-toggled-pressed.xpm → ...ants/a11y/xfwm4/shade-toggled-pressed.xpm
diff --git a/light/xfwm4-a11y/stick-active.png → light/variants/a11y/xfwm4/stick-active.png b/light/xfwm4-a11y/stick-active.png → light/variants/a11y/xfwm4/stick-active.png
diff --git a/light/xfwm4-a11y/stick-active.xpm → light/variants/a11y/xfwm4/stick-active.xpm b/light/xfwm4-a11y/stick-active.xpm → light/variants/a11y/xfwm4/stick-active.xpm
diff --git a/light/xfwm4-a11y/stick-inactive.png → light/variants/a11y/xfwm4/stick-inactive.png b/light/xfwm4-a11y/stick-inactive.png → light/variants/a11y/xfwm4/stick-inactive.png
diff --git a/light/xfwm4-a11y/stick-inactive.xpm → light/variants/a11y/xfwm4/stick-inactive.xpm b/light/xfwm4-a11y/stick-inactive.xpm → light/variants/a11y/xfwm4/stick-inactive.xpm
diff --git a/light/xfwm4-a11y/stick-prelight.png → light/variants/a11y/xfwm4/stick-prelight.png b/light/xfwm4-a11y/stick-prelight.png → light/variants/a11y/xfwm4/stick-prelight.png
diff --git a/light/xfwm4-a11y/stick-prelight.xpm → light/variants/a11y/xfwm4/stick-prelight.xpm b/light/xfwm4-a11y/stick-prelight.xpm → light/variants/a11y/xfwm4/stick-prelight.xpm
diff --git a/light/xfwm4-a11y/stick-pressed.png → light/variants/a11y/xfwm4/stick-pressed.png b/light/xfwm4-a11y/stick-pressed.png → light/variants/a11y/xfwm4/stick-pressed.png
diff --git a/light/xfwm4-a11y/stick-pressed.xpm → light/variants/a11y/xfwm4/stick-pressed.xpm b/light/xfwm4-a11y/stick-pressed.xpm → light/variants/a11y/xfwm4/stick-pressed.xpm
diff --git a/light/xfwm4-a11y/stick-toggled-active.png → ...iants/a11y/xfwm4/stick-toggled-active.png b/light/xfwm4-a11y/stick-toggled-active.png → ...iants/a11y/xfwm4/stick-toggled-active.png
diff --git a/light/xfwm4-a11y/stick-toggled-active.xpm → ...iants/a11y/xfwm4/stick-toggled-active.xpm b/light/xfwm4-a11y/stick-toggled-active.xpm → ...iants/a11y/xfwm4/stick-toggled-active.xpm
diff --git a/light/xfwm4-a11y/stick-toggled-inactive.png → ...nts/a11y/xfwm4/stick-toggled-inactive.png b/light/xfwm4-a11y/stick-toggled-inactive.png → ...nts/a11y/xfwm4/stick-toggled-inactive.png
diff --git a/light/xfwm4-a11y/stick-toggled-inactive.xpm → ...nts/a11y/xfwm4/stick-toggled-inactive.xpm b/light/xfwm4-a11y/stick-toggled-inactive.xpm → ...nts/a11y/xfwm4/stick-toggled-inactive.xpm
diff --git a/light/xfwm4-a11y/stick-toggled-prelight.png → ...nts/a11y/xfwm4/stick-toggled-prelight.png b/light/xfwm4-a11y/stick-toggled-prelight.png → ...nts/a11y/xfwm4/stick-toggled-prelight.png
diff --git a/light/xfwm4-a11y/stick-toggled-prelight.xpm → ...nts/a11y/xfwm4/stick-toggled-prelight.xpm b/light/xfwm4-a11y/stick-toggled-prelight.xpm → ...nts/a11y/xfwm4/stick-toggled-prelight.xpm
diff --git a/light/xfwm4-a11y/stick-toggled-pressed.png → ...ants/a11y/xfwm4/stick-toggled-pressed.png b/light/xfwm4-a11y/stick-toggled-pressed.png → ...ants/a11y/xfwm4/stick-toggled-pressed.png
diff --git a/light/xfwm4-a11y/stick-toggled-pressed.xpm → ...ants/a11y/xfwm4/stick-toggled-pressed.xpm b/light/xfwm4-a11y/stick-toggled-pressed.xpm → ...ants/a11y/xfwm4/stick-toggled-pressed.xpm
diff --git a/light/xfwm4-a11y/themerc → light/variants/a11y/xfwm4/themerc b/light/xfwm4-a11y/themerc → light/variants/a11y/xfwm4/themerc
diff --git a/light/xfwm4-a11y/title-1-active.png → light/variants/a11y/xfwm4/title-1-active.png b/light/xfwm4-a11y/title-1-active.png → light/variants/a11y/xfwm4/title-1-active.png
diff --git a/light/xfwm4-a11y/title-1-active.xpm → light/variants/a11y/xfwm4/title-1-active.xpm b/light/xfwm4-a11y/title-1-active.xpm → light/variants/a11y/xfwm4/title-1-active.xpm
diff --git a/light/xfwm4-a11y/title-1-inactive.png → .../variants/a11y/xfwm4/title-1-inactive.png b/light/xfwm4-a11y/title-1-inactive.png → .../variants/a11y/xfwm4/title-1-inactive.png
diff --git a/light/xfwm4-a11y/title-1-inactive.xpm → .../variants/a11y/xfwm4/title-1-inactive.xpm b/light/xfwm4-a11y/title-1-inactive.xpm → .../variants/a11y/xfwm4/title-1-inactive.xpm
diff --git a/light/xfwm4-a11y/title-2-active.png → light/variants/a11y/xfwm4/title-2-active.png b/light/xfwm4-a11y/title-2-active.png → light/variants/a11y/xfwm4/title-2-active.png
diff --git a/light/xfwm4-a11y/title-2-active.xpm → light/variants/a11y/xfwm4/title-2-active.xpm b/light/xfwm4-a11y/title-2-active.xpm → light/variants/a11y/xfwm4/title-2-active.xpm
diff --git a/light/xfwm4-a11y/title-2-inactive.png → .../variants/a11y/xfwm4/title-2-inactive.png b/light/xfwm4-a11y/title-2-inactive.png → .../variants/a11y/xfwm4/title-2-inactive.png
diff --git a/light/xfwm4-a11y/title-2-inactive.xpm → .../variants/a11y/xfwm4/title-2-inactive.xpm b/light/xfwm4-a11y/title-2-inactive.xpm → .../variants/a11y/xfwm4/title-2-inactive.xpm
diff --git a/light/xfwm4-a11y/title-3-active.png → light/variants/a11y/xfwm4/title-3-active.png b/light/xfwm4-a11y/title-3-active.png → light/variants/a11y/xfwm4/title-3-active.png
diff --git a/light/xfwm4-a11y/title-3-active.xpm → light/variants/a11y/xfwm4/title-3-active.xpm b/light/xfwm4-a11y/title-3-active.xpm → light/variants/a11y/xfwm4/title-3-active.xpm
diff --git a/light/xfwm4-a11y/title-3-inactive.png → .../variants/a11y/xfwm4/title-3-inactive.png b/light/xfwm4-a11y/title-3-inactive.png → .../variants/a11y/xfwm4/title-3-inactive.png
diff --git a/light/xfwm4-a11y/title-3-inactive.xpm → .../variants/a11y/xfwm4/title-3-inactive.xpm b/light/xfwm4-a11y/title-3-inactive.xpm → .../variants/a11y/xfwm4/title-3-inactive.xpm
diff --git a/light/xfwm4-a11y/title-4-active.png → light/variants/a11y/xfwm4/title-4-active.png b/light/xfwm4-a11y/title-4-active.png → light/variants/a11y/xfwm4/title-4-active.png
diff --git a/light/xfwm4-a11y/title-4-active.xpm → light/variants/a11y/xfwm4/title-4-active.xpm b/light/xfwm4-a11y/title-4-active.xpm → light/variants/a11y/xfwm4/title-4-active.xpm
diff --git a/light/xfwm4-a11y/title-4-inactive.png → .../variants/a11y/xfwm4/title-4-inactive.png b/light/xfwm4-a11y/title-4-inactive.png → .../variants/a11y/xfwm4/title-4-inactive.png
diff --git a/light/xfwm4-a11y/title-4-inactive.xpm → .../variants/a11y/xfwm4/title-4-inactive.xpm b/light/xfwm4-a11y/title-4-inactive.xpm → .../variants/a11y/xfwm4/title-4-inactive.xpm
diff --git a/light/xfwm4-a11y/title-5-active.png → light/variants/a11y/xfwm4/title-5-active.png b/light/xfwm4-a11y/title-5-active.png → light/variants/a11y/xfwm4/title-5-active.png
diff --git a/light/xfwm4-a11y/title-5-active.xpm → light/variants/a11y/xfwm4/title-5-active.xpm b/light/xfwm4-a11y/title-5-active.xpm → light/variants/a11y/xfwm4/title-5-active.xpm
diff --git a/light/xfwm4-a11y/title-5-inactive.png → .../variants/a11y/xfwm4/title-5-inactive.png b/light/xfwm4-a11y/title-5-inactive.png → .../variants/a11y/xfwm4/title-5-inactive.png
diff --git a/light/xfwm4-a11y/title-5-inactive.xpm → .../variants/a11y/xfwm4/title-5-inactive.xpm b/light/xfwm4-a11y/title-5-inactive.xpm → .../variants/a11y/xfwm4/title-5-inactive.xpm
diff --git a/light/xfwm4-a11y/top-left-active.png → ...t/variants/a11y/xfwm4/top-left-active.png b/light/xfwm4-a11y/top-left-active.png → ...t/variants/a11y/xfwm4/top-left-active.png
diff --git a/light/xfwm4-a11y/top-left-active.xpm → ...t/variants/a11y/xfwm4/top-left-active.xpm b/light/xfwm4-a11y/top-left-active.xpm → ...t/variants/a11y/xfwm4/top-left-active.xpm
diff --git a/light/xfwm4-a11y/top-left-inactive.png → ...variants/a11y/xfwm4/top-left-inactive.png b/light/xfwm4-a11y/top-left-inactive.png → ...variants/a11y/xfwm4/top-left-inactive.png
diff --git a/light/xfwm4-a11y/top-left-inactive.xpm → ...variants/a11y/xfwm4/top-left-inactive.xpm b/light/xfwm4-a11y/top-left-inactive.xpm → ...variants/a11y/xfwm4/top-left-inactive.xpm
diff --git a/light/xfwm4-a11y/top-right-active.png → .../variants/a11y/xfwm4/top-right-active.png b/light/xfwm4-a11y/top-right-active.png → .../variants/a11y/xfwm4/top-right-active.png
diff --git a/light/xfwm4-a11y/top-right-active.xpm → .../variants/a11y/xfwm4/top-right-active.xpm b/light/xfwm4-a11y/top-right-active.xpm → .../variants/a11y/xfwm4/top-right-active.xpm
diff --git a/light/xfwm4-a11y/top-right-inactive.png → ...ariants/a11y/xfwm4/top-right-inactive.png b/light/xfwm4-a11y/top-right-inactive.png → ...ariants/a11y/xfwm4/top-right-inactive.png
diff --git a/light/xfwm4-a11y/top-right-inactive.xpm → ...ariants/a11y/xfwm4/top-right-inactive.xpm b/light/xfwm4-a11y/top-right-inactive.xpm → ...ariants/a11y/xfwm4/top-right-inactive.xpm
diff --git a/light/xfce-notify-4.0_bright/gtk.css → ...t/variants/bright/xfce-notify-4.0/gtk.css b/light/xfce-notify-4.0_bright/gtk.css → ...t/variants/bright/xfce-notify-4.0/gtk.css
diff --git a/light/xfce-notify-4.0_bright/gtkrc → light/variants/bright/xfce-notify-4.0/gtkrc b/light/xfce-notify-4.0_bright/gtkrc → light/variants/bright/xfce-notify-4.0/gtkrc
diff --git a/dark/xfwm4-compact/base-inactive.png → .../variants/compact/xfwm4/base-inactive.png b/dark/xfwm4-compact/base-inactive.png → .../variants/compact/xfwm4/base-inactive.png
diff --git a/dark/xfwm4-compact/base.png → light/variants/compact/xfwm4/base.png b/dark/xfwm4-compact/base.png → light/variants/compact/xfwm4/base.png
diff --git a/dark/xfwm4-compact/base_active.png → light/variants/compact/xfwm4/base_active.png b/dark/xfwm4-compact/base_active.png → light/variants/compact/xfwm4/base_active.png
diff --git a/dark/xfwm4-compact/base_inactive.png → .../variants/compact/xfwm4/base_inactive.png b/dark/xfwm4-compact/base_inactive.png → .../variants/compact/xfwm4/base_inactive.png
diff --git a/dark/xfwm4-compact/bottom-active.xpm → .../variants/compact/xfwm4/bottom-active.xpm b/dark/xfwm4-compact/bottom-active.xpm → .../variants/compact/xfwm4/bottom-active.xpm
diff --git a/light/xfwm4-a11y/bottom-inactive.xpm → ...ariants/compact/xfwm4/bottom-inactive.xpm b/light/xfwm4-a11y/bottom-inactive.xpm → ...ariants/compact/xfwm4/bottom-inactive.xpm
diff --git a/dark/xfwm4-compact/bottom-left-active.xpm → ...ants/compact/xfwm4/bottom-left-active.xpm b/dark/xfwm4-compact/bottom-left-active.xpm → ...ants/compact/xfwm4/bottom-left-active.xpm
diff --git a/light/xfwm4-a11y/bottom-left-inactive.xpm → ...ts/compact/xfwm4/bottom-left-inactive.xpm b/light/xfwm4-a11y/bottom-left-inactive.xpm → ...ts/compact/xfwm4/bottom-left-inactive.xpm
diff --git a/dark/xfwm4-compact/bottom-right-active.xpm → ...nts/compact/xfwm4/bottom-right-active.xpm b/dark/xfwm4-compact/bottom-right-active.xpm → ...nts/compact/xfwm4/bottom-right-active.xpm
diff --git a/light/xfwm4-a11y/bottom-right-inactive.xpm → ...s/compact/xfwm4/bottom-right-inactive.xpm b/light/xfwm4-a11y/bottom-right-inactive.xpm → ...s/compact/xfwm4/bottom-right-inactive.xpm
diff --git a/dark/xfwm4-compact/close-active.png → ...t/variants/compact/xfwm4/close-active.png b/dark/xfwm4-compact/close-active.png → ...t/variants/compact/xfwm4/close-active.png
diff --git a/dark/xfwm4-compact/close-active.xpm → ...t/variants/compact/xfwm4/close-active.xpm b/dark/xfwm4-compact/close-active.xpm → ...t/variants/compact/xfwm4/close-active.xpm
diff --git a/dark/xfwm4-compact/close-inactive.png → ...variants/compact/xfwm4/close-inactive.png b/dark/xfwm4-compact/close-inactive.png → ...variants/compact/xfwm4/close-inactive.png
diff --git a/dark/xfwm4-compact/close-inactive.xpm → ...variants/compact/xfwm4/close-inactive.xpm b/dark/xfwm4-compact/close-inactive.xpm → ...variants/compact/xfwm4/close-inactive.xpm
diff --git a/dark/xfwm4-compact/close-prelight.png → ...variants/compact/xfwm4/close-prelight.png b/dark/xfwm4-compact/close-prelight.png → ...variants/compact/xfwm4/close-prelight.png
diff --git a/dark/xfwm4-compact/close-prelight.xpm → ...variants/compact/xfwm4/close-prelight.xpm b/dark/xfwm4-compact/close-prelight.xpm → ...variants/compact/xfwm4/close-prelight.xpm
diff --git a/dark/xfwm4-compact/close-pressed.png → .../variants/compact/xfwm4/close-pressed.png b/dark/xfwm4-compact/close-pressed.png → .../variants/compact/xfwm4/close-pressed.png
diff --git a/dark/xfwm4-compact/close-pressed.xpm → .../variants/compact/xfwm4/close-pressed.xpm b/dark/xfwm4-compact/close-pressed.xpm → .../variants/compact/xfwm4/close-pressed.xpm
diff --git a/dark/xfwm4-compact/hide-active.png → light/variants/compact/xfwm4/hide-active.png b/dark/xfwm4-compact/hide-active.png → light/variants/compact/xfwm4/hide-active.png
diff --git a/dark/xfwm4-compact/hide-active.xpm → light/variants/compact/xfwm4/hide-active.xpm b/dark/xfwm4-compact/hide-active.xpm → light/variants/compact/xfwm4/hide-active.xpm
diff --git a/dark/xfwm4-compact/hide-inactive.png → .../variants/compact/xfwm4/hide-inactive.png b/dark/xfwm4-compact/hide-inactive.png → .../variants/compact/xfwm4/hide-inactive.png
diff --git a/dark/xfwm4-compact/hide-inactive.xpm → .../variants/compact/xfwm4/hide-inactive.xpm b/dark/xfwm4-compact/hide-inactive.xpm → .../variants/compact/xfwm4/hide-inactive.xpm
diff --git a/dark/xfwm4-compact/hide-prelight.png → .../variants/compact/xfwm4/hide-prelight.png b/dark/xfwm4-compact/hide-prelight.png → .../variants/compact/xfwm4/hide-prelight.png
diff --git a/dark/xfwm4-compact/hide-prelight.xpm → .../variants/compact/xfwm4/hide-prelight.xpm b/dark/xfwm4-compact/hide-prelight.xpm → .../variants/compact/xfwm4/hide-prelight.xpm
diff --git a/dark/xfwm4-compact/hide-pressed.png → ...t/variants/compact/xfwm4/hide-pressed.png b/dark/xfwm4-compact/hide-pressed.png → ...t/variants/compact/xfwm4/hide-pressed.png
diff --git a/dark/xfwm4-compact/hide-pressed.xpm → ...t/variants/compact/xfwm4/hide-pressed.xpm b/dark/xfwm4-compact/hide-pressed.xpm → ...t/variants/compact/xfwm4/hide-pressed.xpm
diff --git a/dark/xfwm4-compact/left-active.xpm → light/variants/compact/xfwm4/left-active.xpm b/dark/xfwm4-compact/left-active.xpm → light/variants/compact/xfwm4/left-active.xpm
diff --git a/light/xfwm4-a11y/left-inactive.xpm → .../variants/compact/xfwm4/left-inactive.xpm b/light/xfwm4-a11y/left-inactive.xpm → .../variants/compact/xfwm4/left-inactive.xpm
diff --git a/dark/xfwm4-compact/maximize-active.png → ...ariants/compact/xfwm4/maximize-active.png b/dark/xfwm4-compact/maximize-active.png → ...ariants/compact/xfwm4/maximize-active.png
diff --git a/dark/xfwm4-compact/maximize-active.xpm → ...ariants/compact/xfwm4/maximize-active.xpm b/dark/xfwm4-compact/maximize-active.xpm → ...ariants/compact/xfwm4/maximize-active.xpm
diff --git a/dark/xfwm4-compact/maximize-inactive.png → ...iants/compact/xfwm4/maximize-inactive.png b/dark/xfwm4-compact/maximize-inactive.png → ...iants/compact/xfwm4/maximize-inactive.png
diff --git a/dark/xfwm4-compact/maximize-inactive.xpm → ...iants/compact/xfwm4/maximize-inactive.xpm b/dark/xfwm4-compact/maximize-inactive.xpm → ...iants/compact/xfwm4/maximize-inactive.xpm
diff --git a/dark/xfwm4-compact/maximize-prelight.png → ...iants/compact/xfwm4/maximize-prelight.png b/dark/xfwm4-compact/maximize-prelight.png → ...iants/compact/xfwm4/maximize-prelight.png
diff --git a/dark/xfwm4-compact/maximize-prelight.xpm → ...iants/compact/xfwm4/maximize-prelight.xpm b/dark/xfwm4-compact/maximize-prelight.xpm → ...iants/compact/xfwm4/maximize-prelight.xpm
diff --git a/dark/xfwm4-compact/maximize-pressed.png → ...riants/compact/xfwm4/maximize-pressed.png b/dark/xfwm4-compact/maximize-pressed.png → ...riants/compact/xfwm4/maximize-pressed.png
diff --git a/dark/xfwm4-compact/maximize-pressed.xpm → ...riants/compact/xfwm4/maximize-pressed.xpm b/dark/xfwm4-compact/maximize-pressed.xpm → ...riants/compact/xfwm4/maximize-pressed.xpm
diff --git a/dark/xfwm4-compact/menu-active.png → light/variants/compact/xfwm4/menu-active.png b/dark/xfwm4-compact/menu-active.png → light/variants/compact/xfwm4/menu-active.png
diff --git a/dark/xfwm4-compact/menu-active.xpm → light/variants/compact/xfwm4/menu-active.xpm b/dark/xfwm4-compact/menu-active.xpm → light/variants/compact/xfwm4/menu-active.xpm
diff --git a/dark/xfwm4-compact/menu-inactive.png → .../variants/compact/xfwm4/menu-inactive.png b/dark/xfwm4-compact/menu-inactive.png → .../variants/compact/xfwm4/menu-inactive.png
diff --git a/dark/xfwm4-compact/menu-inactive.xpm → .../variants/compact/xfwm4/menu-inactive.xpm b/dark/xfwm4-compact/menu-inactive.xpm → .../variants/compact/xfwm4/menu-inactive.xpm
diff --git a/dark/xfwm4-compact/menu-prelight.png → .../variants/compact/xfwm4/menu-prelight.png b/dark/xfwm4-compact/menu-prelight.png → .../variants/compact/xfwm4/menu-prelight.png
diff --git a/dark/xfwm4-compact/menu-prelight.xpm → .../variants/compact/xfwm4/menu-prelight.xpm b/dark/xfwm4-compact/menu-prelight.xpm → .../variants/compact/xfwm4/menu-prelight.xpm
diff --git a/dark/xfwm4-compact/menu-pressed.png → ...t/variants/compact/xfwm4/menu-pressed.png b/dark/xfwm4-compact/menu-pressed.png → ...t/variants/compact/xfwm4/menu-pressed.png
diff --git a/dark/xfwm4-compact/menu-pressed.xpm → ...t/variants/compact/xfwm4/menu-pressed.xpm b/dark/xfwm4-compact/menu-pressed.xpm → ...t/variants/compact/xfwm4/menu-pressed.xpm
diff --git a/dark/xfwm4-compact/right-active.xpm → ...t/variants/compact/xfwm4/right-active.xpm b/dark/xfwm4-compact/right-active.xpm → ...t/variants/compact/xfwm4/right-active.xpm
diff --git a/light/xfwm4-a11y/right-inactive.xpm → ...variants/compact/xfwm4/right-inactive.xpm b/light/xfwm4-a11y/right-inactive.xpm → ...variants/compact/xfwm4/right-inactive.xpm
diff --git a/dark/xfwm4-compact/shade-active.png → ...t/variants/compact/xfwm4/shade-active.png b/dark/xfwm4-compact/shade-active.png → ...t/variants/compact/xfwm4/shade-active.png
diff --git a/dark/xfwm4-compact/shade-active.xpm → ...t/variants/compact/xfwm4/shade-active.xpm b/dark/xfwm4-compact/shade-active.xpm → ...t/variants/compact/xfwm4/shade-active.xpm
diff --git a/dark/xfwm4-compact/shade-inactive.png → ...variants/compact/xfwm4/shade-inactive.png b/dark/xfwm4-compact/shade-inactive.png → ...variants/compact/xfwm4/shade-inactive.png
diff --git a/dark/xfwm4-compact/shade-inactive.xpm → ...variants/compact/xfwm4/shade-inactive.xpm b/dark/xfwm4-compact/shade-inactive.xpm → ...variants/compact/xfwm4/shade-inactive.xpm
diff --git a/dark/xfwm4-compact/shade-prelight.png → ...variants/compact/xfwm4/shade-prelight.png b/dark/xfwm4-compact/shade-prelight.png → ...variants/compact/xfwm4/shade-prelight.png
diff --git a/dark/xfwm4-compact/shade-prelight.xpm → ...variants/compact/xfwm4/shade-prelight.xpm b/dark/xfwm4-compact/shade-prelight.xpm → ...variants/compact/xfwm4/shade-prelight.xpm
diff --git a/dark/xfwm4-compact/shade-pressed.png → .../variants/compact/xfwm4/shade-pressed.png b/dark/xfwm4-compact/shade-pressed.png → .../variants/compact/xfwm4/shade-pressed.png
diff --git a/dark/xfwm4-compact/shade-pressed.xpm → .../variants/compact/xfwm4/shade-pressed.xpm b/dark/xfwm4-compact/shade-pressed.xpm → .../variants/compact/xfwm4/shade-pressed.xpm
diff --git a/dark/xfwm4-compact/shade-toggled-active.png → ...ts/compact/xfwm4/shade-toggled-active.png b/dark/xfwm4-compact/shade-toggled-active.png → ...ts/compact/xfwm4/shade-toggled-active.png
diff --git a/dark/xfwm4-compact/shade-toggled-active.xpm → ...ts/compact/xfwm4/shade-toggled-active.xpm b/dark/xfwm4-compact/shade-toggled-active.xpm → ...ts/compact/xfwm4/shade-toggled-active.xpm
diff --git a/.../xfwm4-compact/shade-toggled-inactive.png → .../compact/xfwm4/shade-toggled-inactive.png b/.../xfwm4-compact/shade-toggled-inactive.png → .../compact/xfwm4/shade-toggled-inactive.png
diff --git a/.../xfwm4-compact/shade-toggled-inactive.xpm → .../compact/xfwm4/shade-toggled-inactive.xpm b/.../xfwm4-compact/shade-toggled-inactive.xpm → .../compact/xfwm4/shade-toggled-inactive.xpm
diff --git a/.../xfwm4-compact/shade-toggled-prelight.png → .../compact/xfwm4/shade-toggled-prelight.png b/.../xfwm4-compact/shade-toggled-prelight.png → .../compact/xfwm4/shade-toggled-prelight.png
diff --git a/.../xfwm4-compact/shade-toggled-prelight.xpm → .../compact/xfwm4/shade-toggled-prelight.xpm b/.../xfwm4-compact/shade-toggled-prelight.xpm → .../compact/xfwm4/shade-toggled-prelight.xpm
diff --git a/dark/xfwm4-compact/shade-toggled-pressed.png → ...s/compact/xfwm4/shade-toggled-pressed.png b/dark/xfwm4-compact/shade-toggled-pressed.png → ...s/compact/xfwm4/shade-toggled-pressed.png
diff --git a/dark/xfwm4-compact/shade-toggled-pressed.xpm → ...s/compact/xfwm4/shade-toggled-pressed.xpm b/dark/xfwm4-compact/shade-toggled-pressed.xpm → ...s/compact/xfwm4/shade-toggled-pressed.xpm
diff --git a/dark/xfwm4-compact/stick-active.png → ...t/variants/compact/xfwm4/stick-active.png b/dark/xfwm4-compact/stick-active.png → ...t/variants/compact/xfwm4/stick-active.png
diff --git a/dark/xfwm4-compact/stick-active.xpm → ...t/variants/compact/xfwm4/stick-active.xpm b/dark/xfwm4-compact/stick-active.xpm → ...t/variants/compact/xfwm4/stick-active.xpm
diff --git a/dark/xfwm4-compact/stick-inactive.png → ...variants/compact/xfwm4/stick-inactive.png b/dark/xfwm4-compact/stick-inactive.png → ...variants/compact/xfwm4/stick-inactive.png
diff --git a/dark/xfwm4-compact/stick-inactive.xpm → ...variants/compact/xfwm4/stick-inactive.xpm b/dark/xfwm4-compact/stick-inactive.xpm → ...variants/compact/xfwm4/stick-inactive.xpm
diff --git a/dark/xfwm4-compact/stick-prelight.png → ...variants/compact/xfwm4/stick-prelight.png b/dark/xfwm4-compact/stick-prelight.png → ...variants/compact/xfwm4/stick-prelight.png
diff --git a/dark/xfwm4-compact/stick-prelight.xpm → ...variants/compact/xfwm4/stick-prelight.xpm b/dark/xfwm4-compact/stick-prelight.xpm → ...variants/compact/xfwm4/stick-prelight.xpm
diff --git a/dark/xfwm4-compact/stick-pressed.png → .../variants/compact/xfwm4/stick-pressed.png b/dark/xfwm4-compact/stick-pressed.png → .../variants/compact/xfwm4/stick-pressed.png
diff --git a/dark/xfwm4-compact/stick-pressed.xpm → .../variants/compact/xfwm4/stick-pressed.xpm b/dark/xfwm4-compact/stick-pressed.xpm → .../variants/compact/xfwm4/stick-pressed.xpm
diff --git a/dark/xfwm4-compact/stick-toggled-active.png → ...ts/compact/xfwm4/stick-toggled-active.png b/dark/xfwm4-compact/stick-toggled-active.png → ...ts/compact/xfwm4/stick-toggled-active.png
diff --git a/dark/xfwm4-compact/stick-toggled-active.xpm → ...ts/compact/xfwm4/stick-toggled-active.xpm b/dark/xfwm4-compact/stick-toggled-active.xpm → ...ts/compact/xfwm4/stick-toggled-active.xpm
diff --git a/.../xfwm4-compact/stick-toggled-inactive.png → .../compact/xfwm4/stick-toggled-inactive.png b/.../xfwm4-compact/stick-toggled-inactive.png → .../compact/xfwm4/stick-toggled-inactive.png
diff --git a/.../xfwm4-compact/stick-toggled-inactive.xpm → .../compact/xfwm4/stick-toggled-inactive.xpm b/.../xfwm4-compact/stick-toggled-inactive.xpm → .../compact/xfwm4/stick-toggled-inactive.xpm
diff --git a/.../xfwm4-compact/stick-toggled-prelight.png → .../compact/xfwm4/stick-toggled-prelight.png b/.../xfwm4-compact/stick-toggled-prelight.png → .../compact/xfwm4/stick-toggled-prelight.png
diff --git a/.../xfwm4-compact/stick-toggled-prelight.xpm → .../compact/xfwm4/stick-toggled-prelight.xpm b/.../xfwm4-compact/stick-toggled-prelight.xpm → .../compact/xfwm4/stick-toggled-prelight.xpm
diff --git a/dark/xfwm4-compact/stick-toggled-pressed.png → ...s/compact/xfwm4/stick-toggled-pressed.png b/dark/xfwm4-compact/stick-toggled-pressed.png → ...s/compact/xfwm4/stick-toggled-pressed.png
diff --git a/dark/xfwm4-compact/stick-toggled-pressed.xpm → ...s/compact/xfwm4/stick-toggled-pressed.xpm b/dark/xfwm4-compact/stick-toggled-pressed.xpm → ...s/compact/xfwm4/stick-toggled-pressed.xpm
diff --git a/dark/xfwm4-compact/themerc → light/variants/compact/xfwm4/themerc b/dark/xfwm4-compact/themerc → light/variants/compact/xfwm4/themerc
diff --git a/dark/xfwm4-compact/title-1-active.png → ...variants/compact/xfwm4/title-1-active.png b/dark/xfwm4-compact/title-1-active.png → ...variants/compact/xfwm4/title-1-active.png
diff --git a/dark/xfwm4-compact/title-1-active.xpm → ...variants/compact/xfwm4/title-1-active.xpm b/dark/xfwm4-compact/title-1-active.xpm → ...variants/compact/xfwm4/title-1-active.xpm
diff --git a/dark/xfwm4-compact/title-1-inactive.png → ...riants/compact/xfwm4/title-1-inactive.png b/dark/xfwm4-compact/title-1-inactive.png → ...riants/compact/xfwm4/title-1-inactive.png
diff --git a/dark/xfwm4-compact/title-1-inactive.xpm → ...riants/compact/xfwm4/title-1-inactive.xpm b/dark/xfwm4-compact/title-1-inactive.xpm → ...riants/compact/xfwm4/title-1-inactive.xpm
diff --git a/dark/xfwm4-compact/title-2-active.png → ...variants/compact/xfwm4/title-2-active.png b/dark/xfwm4-compact/title-2-active.png → ...variants/compact/xfwm4/title-2-active.png
diff --git a/dark/xfwm4-compact/title-2-active.xpm → ...variants/compact/xfwm4/title-2-active.xpm b/dark/xfwm4-compact/title-2-active.xpm → ...variants/compact/xfwm4/title-2-active.xpm
diff --git a/dark/xfwm4-compact/title-2-inactive.png → ...riants/compact/xfwm4/title-2-inactive.png b/dark/xfwm4-compact/title-2-inactive.png → ...riants/compact/xfwm4/title-2-inactive.png
diff --git a/dark/xfwm4-compact/title-2-inactive.xpm → ...riants/compact/xfwm4/title-2-inactive.xpm b/dark/xfwm4-compact/title-2-inactive.xpm → ...riants/compact/xfwm4/title-2-inactive.xpm
diff --git a/dark/xfwm4-compact/title-3-active.png → ...variants/compact/xfwm4/title-3-active.png b/dark/xfwm4-compact/title-3-active.png → ...variants/compact/xfwm4/title-3-active.png
diff --git a/dark/xfwm4-compact/title-3-active.xpm → ...variants/compact/xfwm4/title-3-active.xpm b/dark/xfwm4-compact/title-3-active.xpm → ...variants/compact/xfwm4/title-3-active.xpm
diff --git a/dark/xfwm4-compact/title-3-inactive.png → ...riants/compact/xfwm4/title-3-inactive.png b/dark/xfwm4-compact/title-3-inactive.png → ...riants/compact/xfwm4/title-3-inactive.png
diff --git a/dark/xfwm4-compact/title-3-inactive.xpm → ...riants/compact/xfwm4/title-3-inactive.xpm b/dark/xfwm4-compact/title-3-inactive.xpm → ...riants/compact/xfwm4/title-3-inactive.xpm
diff --git a/dark/xfwm4-compact/title-4-active.png → ...variants/compact/xfwm4/title-4-active.png b/dark/xfwm4-compact/title-4-active.png → ...variants/compact/xfwm4/title-4-active.png
diff --git a/dark/xfwm4-compact/title-4-active.xpm → ...variants/compact/xfwm4/title-4-active.xpm b/dark/xfwm4-compact/title-4-active.xpm → ...variants/compact/xfwm4/title-4-active.xpm
diff --git a/dark/xfwm4-compact/title-4-inactive.png → ...riants/compact/xfwm4/title-4-inactive.png b/dark/xfwm4-compact/title-4-inactive.png → ...riants/compact/xfwm4/title-4-inactive.png
diff --git a/dark/xfwm4-compact/title-4-inactive.xpm → ...riants/compact/xfwm4/title-4-inactive.xpm b/dark/xfwm4-compact/title-4-inactive.xpm → ...riants/compact/xfwm4/title-4-inactive.xpm
diff --git a/dark/xfwm4-compact/title-5-active.png → ...variants/compact/xfwm4/title-5-active.png b/dark/xfwm4-compact/title-5-active.png → ...variants/compact/xfwm4/title-5-active.png
diff --git a/dark/xfwm4-compact/title-5-active.xpm → ...variants/compact/xfwm4/title-5-active.xpm b/dark/xfwm4-compact/title-5-active.xpm → ...variants/compact/xfwm4/title-5-active.xpm
diff --git a/dark/xfwm4-compact/title-5-inactive.png → ...riants/compact/xfwm4/title-5-inactive.png b/dark/xfwm4-compact/title-5-inactive.png → ...riants/compact/xfwm4/title-5-inactive.png
diff --git a/dark/xfwm4-compact/title-5-inactive.xpm → ...riants/compact/xfwm4/title-5-inactive.xpm b/dark/xfwm4-compact/title-5-inactive.xpm → ...riants/compact/xfwm4/title-5-inactive.xpm
diff --git a/dark/xfwm4-compact/top-left-active.png → ...ariants/compact/xfwm4/top-left-active.png b/dark/xfwm4-compact/top-left-active.png → ...ariants/compact/xfwm4/top-left-active.png
diff --git a/dark/xfwm4-compact/top-left-active.xpm → ...ariants/compact/xfwm4/top-left-active.xpm b/dark/xfwm4-compact/top-left-active.xpm → ...ariants/compact/xfwm4/top-left-active.xpm
diff --git a/dark/xfwm4-compact/top-left-inactive.png → ...iants/compact/xfwm4/top-left-inactive.png b/dark/xfwm4-compact/top-left-inactive.png → ...iants/compact/xfwm4/top-left-inactive.png
diff --git a/dark/xfwm4-compact/top-left-inactive.xpm → ...iants/compact/xfwm4/top-left-inactive.xpm b/dark/xfwm4-compact/top-left-inactive.xpm → ...iants/compact/xfwm4/top-left-inactive.xpm
diff --git a/dark/xfwm4-compact/top-right-active.png → ...riants/compact/xfwm4/top-right-active.png b/dark/xfwm4-compact/top-right-active.png → ...riants/compact/xfwm4/top-right-active.png
diff --git a/dark/xfwm4-compact/top-right-active.xpm → ...riants/compact/xfwm4/top-right-active.xpm b/dark/xfwm4-compact/top-right-active.xpm → ...riants/compact/xfwm4/top-right-active.xpm
diff --git a/dark/xfwm4-compact/top-right-inactive.png → ...ants/compact/xfwm4/top-right-inactive.png b/dark/xfwm4-compact/top-right-inactive.png → ...ants/compact/xfwm4/top-right-inactive.png
diff --git a/dark/xfwm4-compact/top-right-inactive.xpm → ...ants/compact/xfwm4/top-right-inactive.xpm b/dark/xfwm4-compact/top-right-inactive.xpm → ...ants/compact/xfwm4/top-right-inactive.xpm
diff --git a/light/xfwm4-compact/base-inactive.png b/light/xfwm4-compact/base-inactive.png
diff --git a/light/xfwm4-compact/base.png b/light/xfwm4-compact/base.png
diff --git a/light/xfwm4-compact/base_active.png b/light/xfwm4-compact/base_active.png
diff --git a/light/xfwm4-compact/base_inactive.png b/light/xfwm4-compact/base_inactive.png
diff --git a/light/xfwm4-compact/bottom-active.xpm b/light/xfwm4-compact/bottom-active.xpm
diff --git a/light/xfwm4-compact/bottom-inactive.xpm b/light/xfwm4-compact/bottom-inactive.xpm
diff --git a/light/xfwm4-compact/bottom-left-active.xpm b/light/xfwm4-compact/bottom-left-active.xpm
diff --git a/light/xfwm4-compact/bottom-left-inactive.xpm b/light/xfwm4-compact/bottom-left-inactive.xpm
diff --git a/light/xfwm4-compact/bottom-right-active.xpm b/light/xfwm4-compact/bottom-right-active.xpm
diff --git a/light/xfwm4-compact/bottom-right-inactive.xpm b/light/xfwm4-compact/bottom-right-inactive.xpm
diff --git a/light/xfwm4-compact/close-active.png b/light/xfwm4-compact/close-active.png
diff --git a/light/xfwm4-compact/close-active.xpm b/light/xfwm4-compact/close-active.xpm
diff --git a/light/xfwm4-compact/close-inactive.png b/light/xfwm4-compact/close-inactive.png
diff --git a/light/xfwm4-compact/close-inactive.xpm b/light/xfwm4-compact/close-inactive.xpm
diff --git a/light/xfwm4-compact/close-prelight.png b/light/xfwm4-compact/close-prelight.png
diff --git a/light/xfwm4-compact/close-prelight.xpm b/light/xfwm4-compact/close-prelight.xpm
diff --git a/light/xfwm4-compact/close-pressed.png b/light/xfwm4-compact/close-pressed.png
diff --git a/light/xfwm4-compact/close-pressed.xpm b/light/xfwm4-compact/close-pressed.xpm
diff --git a/light/xfwm4-compact/hide-active.png b/light/xfwm4-compact/hide-active.png