diff --git a/dark/meson.build b/dark/meson.build
index 15812638..5f39174d 100644
--- 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 b/dark/variants/a11y/xfwm4/bottom-active.xpm
similarity index 100%
rename from dark/xfwm4-a11y/bottom-active.xpm
rename to dark/variants/a11y/xfwm4/bottom-active.xpm
diff --git a/dark/xfwm4-a11y/bottom-inactive.xpm b/dark/variants/a11y/xfwm4/bottom-inactive.xpm
similarity index 100%
rename from dark/xfwm4-a11y/bottom-inactive.xpm
rename to dark/variants/a11y/xfwm4/bottom-inactive.xpm
diff --git a/dark/xfwm4-a11y/bottom-left-active.xpm b/dark/variants/a11y/xfwm4/bottom-left-active.xpm
similarity index 100%
rename from dark/xfwm4-a11y/bottom-left-active.xpm
rename to dark/variants/a11y/xfwm4/bottom-left-active.xpm
diff --git a/dark/xfwm4-a11y/bottom-left-inactive.xpm b/dark/variants/a11y/xfwm4/bottom-left-inactive.xpm
similarity index 100%
rename from dark/xfwm4-a11y/bottom-left-inactive.xpm
rename to dark/variants/a11y/xfwm4/bottom-left-inactive.xpm
diff --git a/dark/xfwm4-a11y/bottom-right-active.xpm b/dark/variants/a11y/xfwm4/bottom-right-active.xpm
similarity index 100%
rename from dark/xfwm4-a11y/bottom-right-active.xpm
rename to dark/variants/a11y/xfwm4/bottom-right-active.xpm
diff --git a/dark/xfwm4-a11y/bottom-right-inactive.xpm b/dark/variants/a11y/xfwm4/bottom-right-inactive.xpm
similarity index 100%
rename from dark/xfwm4-a11y/bottom-right-inactive.xpm
rename to dark/variants/a11y/xfwm4/bottom-right-inactive.xpm
diff --git a/dark/xfwm4-a11y/close-active.png b/dark/variants/a11y/xfwm4/close-active.png
similarity index 100%
rename from dark/xfwm4-a11y/close-active.png
rename to dark/variants/a11y/xfwm4/close-active.png
diff --git a/dark/xfwm4-a11y/close-inactive.png b/dark/variants/a11y/xfwm4/close-inactive.png
similarity index 100%
rename from dark/xfwm4-a11y/close-inactive.png
rename to dark/variants/a11y/xfwm4/close-inactive.png
diff --git a/dark/xfwm4-a11y/close-prelight.png b/dark/variants/a11y/xfwm4/close-prelight.png
similarity index 100%
rename from dark/xfwm4-a11y/close-prelight.png
rename to dark/variants/a11y/xfwm4/close-prelight.png
diff --git a/dark/xfwm4-a11y/close-pressed.png b/dark/variants/a11y/xfwm4/close-pressed.png
similarity index 100%
rename from dark/xfwm4-a11y/close-pressed.png
rename to dark/variants/a11y/xfwm4/close-pressed.png
diff --git a/dark/xfwm4-a11y/hide-active.png b/dark/variants/a11y/xfwm4/hide-active.png
similarity index 100%
rename from dark/xfwm4-a11y/hide-active.png
rename to dark/variants/a11y/xfwm4/hide-active.png
diff --git a/dark/xfwm4-a11y/hide-inactive.png b/dark/variants/a11y/xfwm4/hide-inactive.png
similarity index 100%
rename from dark/xfwm4-a11y/hide-inactive.png
rename to dark/variants/a11y/xfwm4/hide-inactive.png
diff --git a/dark/xfwm4-a11y/hide-prelight.png b/dark/variants/a11y/xfwm4/hide-prelight.png
similarity index 100%
rename from dark/xfwm4-a11y/hide-prelight.png
rename to dark/variants/a11y/xfwm4/hide-prelight.png
diff --git a/dark/xfwm4-a11y/hide-pressed.png b/dark/variants/a11y/xfwm4/hide-pressed.png
similarity index 100%
rename from dark/xfwm4-a11y/hide-pressed.png
rename to dark/variants/a11y/xfwm4/hide-pressed.png
diff --git a/dark/xfwm4-a11y/left-active.xpm b/dark/variants/a11y/xfwm4/left-active.xpm
similarity index 100%
rename from dark/xfwm4-a11y/left-active.xpm
rename to dark/variants/a11y/xfwm4/left-active.xpm
diff --git a/dark/xfwm4-a11y/left-inactive.xpm b/dark/variants/a11y/xfwm4/left-inactive.xpm
similarity index 100%
rename from dark/xfwm4-a11y/left-inactive.xpm
rename to dark/variants/a11y/xfwm4/left-inactive.xpm
diff --git a/dark/xfwm4-a11y/maximize-active.png b/dark/variants/a11y/xfwm4/maximize-active.png
similarity index 100%
rename from dark/xfwm4-a11y/maximize-active.png
rename to dark/variants/a11y/xfwm4/maximize-active.png
diff --git a/dark/xfwm4-a11y/maximize-inactive.png b/dark/variants/a11y/xfwm4/maximize-inactive.png
similarity index 100%
rename from dark/xfwm4-a11y/maximize-inactive.png
rename to dark/variants/a11y/xfwm4/maximize-inactive.png
diff --git a/dark/xfwm4-a11y/maximize-prelight.png b/dark/variants/a11y/xfwm4/maximize-prelight.png
similarity index 100%
rename from dark/xfwm4-a11y/maximize-prelight.png
rename to dark/variants/a11y/xfwm4/maximize-prelight.png
diff --git a/dark/xfwm4-a11y/maximize-pressed.png b/dark/variants/a11y/xfwm4/maximize-pressed.png
similarity index 100%
rename from dark/xfwm4-a11y/maximize-pressed.png
rename to dark/variants/a11y/xfwm4/maximize-pressed.png
diff --git a/dark/xfwm4-a11y/maximize-toggled-active.png b/dark/variants/a11y/xfwm4/maximize-toggled-active.png
similarity index 100%
rename from dark/xfwm4-a11y/maximize-toggled-active.png
rename to dark/variants/a11y/xfwm4/maximize-toggled-active.png
diff --git a/dark/xfwm4-a11y/maximize-toggled-inactive.png b/dark/variants/a11y/xfwm4/maximize-toggled-inactive.png
similarity index 100%
rename from dark/xfwm4-a11y/maximize-toggled-inactive.png
rename to dark/variants/a11y/xfwm4/maximize-toggled-inactive.png
diff --git a/dark/xfwm4-a11y/maximize-toggled-prelight.png b/dark/variants/a11y/xfwm4/maximize-toggled-prelight.png
similarity index 100%
rename from dark/xfwm4-a11y/maximize-toggled-prelight.png
rename to dark/variants/a11y/xfwm4/maximize-toggled-prelight.png
diff --git a/dark/xfwm4-a11y/maximize-toggled-pressed.png b/dark/variants/a11y/xfwm4/maximize-toggled-pressed.png
similarity index 100%
rename from dark/xfwm4-a11y/maximize-toggled-pressed.png
rename to dark/variants/a11y/xfwm4/maximize-toggled-pressed.png
diff --git a/dark/xfwm4-a11y/menu-active.png b/dark/variants/a11y/xfwm4/menu-active.png
similarity index 100%
rename from dark/xfwm4-a11y/menu-active.png
rename to dark/variants/a11y/xfwm4/menu-active.png
diff --git a/dark/xfwm4-a11y/menu-inactive.png b/dark/variants/a11y/xfwm4/menu-inactive.png
similarity index 100%
rename from dark/xfwm4-a11y/menu-inactive.png
rename to dark/variants/a11y/xfwm4/menu-inactive.png
diff --git a/dark/xfwm4-a11y/menu-prelight.png b/dark/variants/a11y/xfwm4/menu-prelight.png
similarity index 100%
rename from dark/xfwm4-a11y/menu-prelight.png
rename to dark/variants/a11y/xfwm4/menu-prelight.png
diff --git a/dark/xfwm4-a11y/menu-pressed.png b/dark/variants/a11y/xfwm4/menu-pressed.png
similarity index 100%
rename from dark/xfwm4-a11y/menu-pressed.png
rename to dark/variants/a11y/xfwm4/menu-pressed.png
diff --git a/dark/xfwm4-a11y/right-active.xpm b/dark/variants/a11y/xfwm4/right-active.xpm
similarity index 100%
rename from dark/xfwm4-a11y/right-active.xpm
rename to dark/variants/a11y/xfwm4/right-active.xpm
diff --git a/dark/xfwm4-a11y/right-inactive.xpm b/dark/variants/a11y/xfwm4/right-inactive.xpm
similarity index 100%
rename from dark/xfwm4-a11y/right-inactive.xpm
rename to dark/variants/a11y/xfwm4/right-inactive.xpm
diff --git a/dark/xfwm4-a11y/shade-active.png b/dark/variants/a11y/xfwm4/shade-active.png
similarity index 100%
rename from dark/xfwm4-a11y/shade-active.png
rename to dark/variants/a11y/xfwm4/shade-active.png
diff --git a/dark/xfwm4-a11y/shade-inactive.png b/dark/variants/a11y/xfwm4/shade-inactive.png
similarity index 100%
rename from dark/xfwm4-a11y/shade-inactive.png
rename to dark/variants/a11y/xfwm4/shade-inactive.png
diff --git a/dark/xfwm4-a11y/shade-prelight.png b/dark/variants/a11y/xfwm4/shade-prelight.png
similarity index 100%
rename from dark/xfwm4-a11y/shade-prelight.png
rename to dark/variants/a11y/xfwm4/shade-prelight.png
diff --git a/dark/xfwm4-a11y/shade-pressed.png b/dark/variants/a11y/xfwm4/shade-pressed.png
similarity index 100%
rename from dark/xfwm4-a11y/shade-pressed.png
rename to dark/variants/a11y/xfwm4/shade-pressed.png
diff --git a/dark/xfwm4-a11y/shade-toggled-active.png b/dark/variants/a11y/xfwm4/shade-toggled-active.png
similarity index 100%
rename from dark/xfwm4-a11y/shade-toggled-active.png
rename to dark/variants/a11y/xfwm4/shade-toggled-active.png
diff --git a/dark/xfwm4-a11y/shade-toggled-inactive.png b/dark/variants/a11y/xfwm4/shade-toggled-inactive.png
similarity index 100%
rename from dark/xfwm4-a11y/shade-toggled-inactive.png
rename to dark/variants/a11y/xfwm4/shade-toggled-inactive.png
diff --git a/dark/xfwm4-a11y/shade-toggled-prelight.png b/dark/variants/a11y/xfwm4/shade-toggled-prelight.png
similarity index 100%
rename from dark/xfwm4-a11y/shade-toggled-prelight.png
rename to dark/variants/a11y/xfwm4/shade-toggled-prelight.png
diff --git a/dark/xfwm4-a11y/shade-toggled-pressed.png b/dark/variants/a11y/xfwm4/shade-toggled-pressed.png
similarity index 100%
rename from dark/xfwm4-a11y/shade-toggled-pressed.png
rename to dark/variants/a11y/xfwm4/shade-toggled-pressed.png
diff --git a/dark/xfwm4-a11y/stick-active.png b/dark/variants/a11y/xfwm4/stick-active.png
similarity index 100%
rename from dark/xfwm4-a11y/stick-active.png
rename to dark/variants/a11y/xfwm4/stick-active.png
diff --git a/dark/xfwm4-a11y/stick-inactive.png b/dark/variants/a11y/xfwm4/stick-inactive.png
similarity index 100%
rename from dark/xfwm4-a11y/stick-inactive.png
rename to dark/variants/a11y/xfwm4/stick-inactive.png
diff --git a/dark/xfwm4-a11y/stick-prelight.png b/dark/variants/a11y/xfwm4/stick-prelight.png
similarity index 100%
rename from dark/xfwm4-a11y/stick-prelight.png
rename to dark/variants/a11y/xfwm4/stick-prelight.png
diff --git a/dark/xfwm4-a11y/stick-pressed.png b/dark/variants/a11y/xfwm4/stick-pressed.png
similarity index 100%
rename from dark/xfwm4-a11y/stick-pressed.png
rename to dark/variants/a11y/xfwm4/stick-pressed.png
diff --git a/dark/xfwm4-a11y/stick-toggled-active.png b/dark/variants/a11y/xfwm4/stick-toggled-active.png
similarity index 100%
rename from dark/xfwm4-a11y/stick-toggled-active.png
rename to dark/variants/a11y/xfwm4/stick-toggled-active.png
diff --git a/dark/xfwm4-a11y/stick-toggled-inactive.png b/dark/variants/a11y/xfwm4/stick-toggled-inactive.png
similarity index 100%
rename from dark/xfwm4-a11y/stick-toggled-inactive.png
rename to dark/variants/a11y/xfwm4/stick-toggled-inactive.png
diff --git a/dark/xfwm4-a11y/stick-toggled-prelight.png b/dark/variants/a11y/xfwm4/stick-toggled-prelight.png
similarity index 100%
rename from dark/xfwm4-a11y/stick-toggled-prelight.png
rename to dark/variants/a11y/xfwm4/stick-toggled-prelight.png
diff --git a/dark/xfwm4-a11y/stick-toggled-pressed.png b/dark/variants/a11y/xfwm4/stick-toggled-pressed.png
similarity index 100%
rename from dark/xfwm4-a11y/stick-toggled-pressed.png
rename to dark/variants/a11y/xfwm4/stick-toggled-pressed.png
diff --git a/dark/xfwm4-a11y/themerc b/dark/variants/a11y/xfwm4/themerc
similarity index 100%
rename from dark/xfwm4-a11y/themerc
rename to dark/variants/a11y/xfwm4/themerc
diff --git a/dark/xfwm4-a11y/title-1-active.xpm b/dark/variants/a11y/xfwm4/title-1-active.xpm
similarity index 100%
rename from dark/xfwm4-a11y/title-1-active.xpm
rename to dark/variants/a11y/xfwm4/title-1-active.xpm
diff --git a/dark/xfwm4-a11y/title-1-inactive.xpm b/dark/variants/a11y/xfwm4/title-1-inactive.xpm
similarity index 100%
rename from dark/xfwm4-a11y/title-1-inactive.xpm
rename to dark/variants/a11y/xfwm4/title-1-inactive.xpm
diff --git a/dark/xfwm4-a11y/title-2-active.xpm b/dark/variants/a11y/xfwm4/title-2-active.xpm
similarity index 100%
rename from dark/xfwm4-a11y/title-2-active.xpm
rename to dark/variants/a11y/xfwm4/title-2-active.xpm
diff --git a/dark/xfwm4-a11y/title-2-inactive.xpm b/dark/variants/a11y/xfwm4/title-2-inactive.xpm
similarity index 100%
rename from dark/xfwm4-a11y/title-2-inactive.xpm
rename to dark/variants/a11y/xfwm4/title-2-inactive.xpm
diff --git a/dark/xfwm4-a11y/title-3-active.xpm b/dark/variants/a11y/xfwm4/title-3-active.xpm
similarity index 100%
rename from dark/xfwm4-a11y/title-3-active.xpm
rename to dark/variants/a11y/xfwm4/title-3-active.xpm
diff --git a/dark/xfwm4-a11y/title-3-inactive.xpm b/dark/variants/a11y/xfwm4/title-3-inactive.xpm
similarity index 100%
rename from dark/xfwm4-a11y/title-3-inactive.xpm
rename to dark/variants/a11y/xfwm4/title-3-inactive.xpm
diff --git a/dark/xfwm4-a11y/title-4-active.xpm b/dark/variants/a11y/xfwm4/title-4-active.xpm
similarity index 100%
rename from dark/xfwm4-a11y/title-4-active.xpm
rename to dark/variants/a11y/xfwm4/title-4-active.xpm
diff --git a/dark/xfwm4-a11y/title-4-inactive.xpm b/dark/variants/a11y/xfwm4/title-4-inactive.xpm
similarity index 100%
rename from dark/xfwm4-a11y/title-4-inactive.xpm
rename to dark/variants/a11y/xfwm4/title-4-inactive.xpm
diff --git a/dark/xfwm4-a11y/title-5-active.xpm b/dark/variants/a11y/xfwm4/title-5-active.xpm
similarity index 100%
rename from dark/xfwm4-a11y/title-5-active.xpm
rename to dark/variants/a11y/xfwm4/title-5-active.xpm
diff --git a/dark/xfwm4-a11y/title-5-inactive.xpm b/dark/variants/a11y/xfwm4/title-5-inactive.xpm
similarity index 100%
rename from dark/xfwm4-a11y/title-5-inactive.xpm
rename to dark/variants/a11y/xfwm4/title-5-inactive.xpm
diff --git a/dark/xfwm4-a11y/top-left-active.xpm b/dark/variants/a11y/xfwm4/top-left-active.xpm
similarity index 100%
rename from dark/xfwm4-a11y/top-left-active.xpm
rename to dark/variants/a11y/xfwm4/top-left-active.xpm
diff --git a/dark/xfwm4-a11y/top-left-inactive.xpm b/dark/variants/a11y/xfwm4/top-left-inactive.xpm
similarity index 100%
rename from dark/xfwm4-a11y/top-left-inactive.xpm
rename to dark/variants/a11y/xfwm4/top-left-inactive.xpm
diff --git a/dark/xfwm4-a11y/top-right-active.xpm b/dark/variants/a11y/xfwm4/top-right-active.xpm
similarity index 100%
rename from dark/xfwm4-a11y/top-right-active.xpm
rename to dark/variants/a11y/xfwm4/top-right-active.xpm
diff --git a/dark/xfwm4-a11y/top-right-inactive.xpm b/dark/variants/a11y/xfwm4/top-right-inactive.xpm
similarity index 100%
rename from dark/xfwm4-a11y/top-right-inactive.xpm
rename to dark/variants/a11y/xfwm4/top-right-inactive.xpm
diff --git a/light/meson.build b/light/meson.build
index 39078e8f..5931ec5b 100644
--- 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 b/light/variants/a11y/xfwm4/base-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/base-inactive.png
rename to light/variants/a11y/xfwm4/base-inactive.png
diff --git a/light/xfwm4-a11y/base.png b/light/variants/a11y/xfwm4/base.png
similarity index 100%
rename from light/xfwm4-a11y/base.png
rename to light/variants/a11y/xfwm4/base.png
diff --git a/light/xfwm4-a11y/bottom-active.xpm b/light/variants/a11y/xfwm4/bottom-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/bottom-active.xpm
rename to light/variants/a11y/xfwm4/bottom-active.xpm
diff --git a/dark/xfwm4-compact/bottom-inactive.xpm b/light/variants/a11y/xfwm4/bottom-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/bottom-inactive.xpm
rename to light/variants/a11y/xfwm4/bottom-inactive.xpm
diff --git a/light/xfwm4-a11y/bottom-left-active.xpm b/light/variants/a11y/xfwm4/bottom-left-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/bottom-left-active.xpm
rename to light/variants/a11y/xfwm4/bottom-left-active.xpm
diff --git a/dark/xfwm4-compact/bottom-left-inactive.xpm b/light/variants/a11y/xfwm4/bottom-left-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/bottom-left-inactive.xpm
rename to light/variants/a11y/xfwm4/bottom-left-inactive.xpm
diff --git a/light/xfwm4-a11y/bottom-right-active.xpm b/light/variants/a11y/xfwm4/bottom-right-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/bottom-right-active.xpm
rename to light/variants/a11y/xfwm4/bottom-right-active.xpm
diff --git a/dark/xfwm4-compact/bottom-right-inactive.xpm b/light/variants/a11y/xfwm4/bottom-right-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/bottom-right-inactive.xpm
rename to light/variants/a11y/xfwm4/bottom-right-inactive.xpm
diff --git a/light/xfwm4-a11y/close-active.png b/light/variants/a11y/xfwm4/close-active.png
similarity index 100%
rename from light/xfwm4-a11y/close-active.png
rename to light/variants/a11y/xfwm4/close-active.png
diff --git a/light/xfwm4-a11y/close-active.xpm b/light/variants/a11y/xfwm4/close-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/close-active.xpm
rename to light/variants/a11y/xfwm4/close-active.xpm
diff --git a/light/xfwm4-a11y/close-inactive.png b/light/variants/a11y/xfwm4/close-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/close-inactive.png
rename to light/variants/a11y/xfwm4/close-inactive.png
diff --git a/light/xfwm4-a11y/close-inactive.xpm b/light/variants/a11y/xfwm4/close-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/close-inactive.xpm
rename to light/variants/a11y/xfwm4/close-inactive.xpm
diff --git a/light/xfwm4-a11y/close-prelight.png b/light/variants/a11y/xfwm4/close-prelight.png
similarity index 100%
rename from light/xfwm4-a11y/close-prelight.png
rename to light/variants/a11y/xfwm4/close-prelight.png
diff --git a/light/xfwm4-a11y/close-prelight.xpm b/light/variants/a11y/xfwm4/close-prelight.xpm
similarity index 100%
rename from light/xfwm4-a11y/close-prelight.xpm
rename to light/variants/a11y/xfwm4/close-prelight.xpm
diff --git a/light/xfwm4-a11y/close-pressed.png b/light/variants/a11y/xfwm4/close-pressed.png
similarity index 100%
rename from light/xfwm4-a11y/close-pressed.png
rename to light/variants/a11y/xfwm4/close-pressed.png
diff --git a/light/xfwm4-a11y/close-pressed.xpm b/light/variants/a11y/xfwm4/close-pressed.xpm
similarity index 100%
rename from light/xfwm4-a11y/close-pressed.xpm
rename to light/variants/a11y/xfwm4/close-pressed.xpm
diff --git a/light/xfwm4-a11y/hide-active.png b/light/variants/a11y/xfwm4/hide-active.png
similarity index 100%
rename from light/xfwm4-a11y/hide-active.png
rename to light/variants/a11y/xfwm4/hide-active.png
diff --git a/light/xfwm4-a11y/hide-active.xpm b/light/variants/a11y/xfwm4/hide-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/hide-active.xpm
rename to light/variants/a11y/xfwm4/hide-active.xpm
diff --git a/light/xfwm4-a11y/hide-inactive.png b/light/variants/a11y/xfwm4/hide-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/hide-inactive.png
rename to light/variants/a11y/xfwm4/hide-inactive.png
diff --git a/light/xfwm4-a11y/hide-inactive.xpm b/light/variants/a11y/xfwm4/hide-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/hide-inactive.xpm
rename to light/variants/a11y/xfwm4/hide-inactive.xpm
diff --git a/light/xfwm4-a11y/hide-prelight.png b/light/variants/a11y/xfwm4/hide-prelight.png
similarity index 100%
rename from light/xfwm4-a11y/hide-prelight.png
rename to light/variants/a11y/xfwm4/hide-prelight.png
diff --git a/light/xfwm4-a11y/hide-prelight.xpm b/light/variants/a11y/xfwm4/hide-prelight.xpm
similarity index 100%
rename from light/xfwm4-a11y/hide-prelight.xpm
rename to light/variants/a11y/xfwm4/hide-prelight.xpm
diff --git a/light/xfwm4-a11y/hide-pressed.png b/light/variants/a11y/xfwm4/hide-pressed.png
similarity index 100%
rename from light/xfwm4-a11y/hide-pressed.png
rename to light/variants/a11y/xfwm4/hide-pressed.png
diff --git a/light/xfwm4-a11y/hide-pressed.xpm b/light/variants/a11y/xfwm4/hide-pressed.xpm
similarity index 100%
rename from light/xfwm4-a11y/hide-pressed.xpm
rename to light/variants/a11y/xfwm4/hide-pressed.xpm
diff --git a/light/xfwm4-a11y/left-active.xpm b/light/variants/a11y/xfwm4/left-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/left-active.xpm
rename to light/variants/a11y/xfwm4/left-active.xpm
diff --git a/dark/xfwm4-compact/left-inactive.xpm b/light/variants/a11y/xfwm4/left-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/left-inactive.xpm
rename to light/variants/a11y/xfwm4/left-inactive.xpm
diff --git a/light/xfwm4-a11y/maximize-active.png b/light/variants/a11y/xfwm4/maximize-active.png
similarity index 100%
rename from light/xfwm4-a11y/maximize-active.png
rename to light/variants/a11y/xfwm4/maximize-active.png
diff --git a/light/xfwm4-a11y/maximize-active.xpm b/light/variants/a11y/xfwm4/maximize-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/maximize-active.xpm
rename to light/variants/a11y/xfwm4/maximize-active.xpm
diff --git a/light/xfwm4-a11y/maximize-inactive.png b/light/variants/a11y/xfwm4/maximize-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/maximize-inactive.png
rename to light/variants/a11y/xfwm4/maximize-inactive.png
diff --git a/light/xfwm4-a11y/maximize-inactive.xpm b/light/variants/a11y/xfwm4/maximize-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/maximize-inactive.xpm
rename to light/variants/a11y/xfwm4/maximize-inactive.xpm
diff --git a/light/xfwm4-a11y/maximize-prelight.png b/light/variants/a11y/xfwm4/maximize-prelight.png
similarity index 100%
rename from light/xfwm4-a11y/maximize-prelight.png
rename to light/variants/a11y/xfwm4/maximize-prelight.png
diff --git a/light/xfwm4-a11y/maximize-prelight.xpm b/light/variants/a11y/xfwm4/maximize-prelight.xpm
similarity index 100%
rename from light/xfwm4-a11y/maximize-prelight.xpm
rename to light/variants/a11y/xfwm4/maximize-prelight.xpm
diff --git a/light/xfwm4-a11y/maximize-pressed.png b/light/variants/a11y/xfwm4/maximize-pressed.png
similarity index 100%
rename from light/xfwm4-a11y/maximize-pressed.png
rename to light/variants/a11y/xfwm4/maximize-pressed.png
diff --git a/light/xfwm4-a11y/maximize-pressed.xpm b/light/variants/a11y/xfwm4/maximize-pressed.xpm
similarity index 100%
rename from light/xfwm4-a11y/maximize-pressed.xpm
rename to light/variants/a11y/xfwm4/maximize-pressed.xpm
diff --git a/light/xfwm4-a11y/maximize-toggled-active.png b/light/variants/a11y/xfwm4/maximize-toggled-active.png
similarity index 100%
rename from light/xfwm4-a11y/maximize-toggled-active.png
rename to light/variants/a11y/xfwm4/maximize-toggled-active.png
diff --git a/light/xfwm4-a11y/maximize-toggled-inactive.png b/light/variants/a11y/xfwm4/maximize-toggled-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/maximize-toggled-inactive.png
rename to light/variants/a11y/xfwm4/maximize-toggled-inactive.png
diff --git a/light/xfwm4-a11y/maximize-toggled-prelight.png b/light/variants/a11y/xfwm4/maximize-toggled-prelight.png
similarity index 100%
rename from light/xfwm4-a11y/maximize-toggled-prelight.png
rename to light/variants/a11y/xfwm4/maximize-toggled-prelight.png
diff --git a/light/xfwm4-a11y/maximize-toggled-pressed.png b/light/variants/a11y/xfwm4/maximize-toggled-pressed.png
similarity index 100%
rename from light/xfwm4-a11y/maximize-toggled-pressed.png
rename to light/variants/a11y/xfwm4/maximize-toggled-pressed.png
diff --git a/light/xfwm4-a11y/menu-active.png b/light/variants/a11y/xfwm4/menu-active.png
similarity index 100%
rename from light/xfwm4-a11y/menu-active.png
rename to light/variants/a11y/xfwm4/menu-active.png
diff --git a/light/xfwm4-a11y/menu-active.xpm b/light/variants/a11y/xfwm4/menu-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/menu-active.xpm
rename to light/variants/a11y/xfwm4/menu-active.xpm
diff --git a/light/xfwm4-a11y/menu-inactive.png b/light/variants/a11y/xfwm4/menu-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/menu-inactive.png
rename to light/variants/a11y/xfwm4/menu-inactive.png
diff --git a/light/xfwm4-a11y/menu-inactive.xpm b/light/variants/a11y/xfwm4/menu-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/menu-inactive.xpm
rename to light/variants/a11y/xfwm4/menu-inactive.xpm
diff --git a/light/xfwm4-a11y/menu-prelight.png b/light/variants/a11y/xfwm4/menu-prelight.png
similarity index 100%
rename from light/xfwm4-a11y/menu-prelight.png
rename to light/variants/a11y/xfwm4/menu-prelight.png
diff --git a/light/xfwm4-a11y/menu-prelight.xpm b/light/variants/a11y/xfwm4/menu-prelight.xpm
similarity index 100%
rename from light/xfwm4-a11y/menu-prelight.xpm
rename to light/variants/a11y/xfwm4/menu-prelight.xpm
diff --git a/light/xfwm4-a11y/menu-pressed.png b/light/variants/a11y/xfwm4/menu-pressed.png
similarity index 100%
rename from light/xfwm4-a11y/menu-pressed.png
rename to light/variants/a11y/xfwm4/menu-pressed.png
diff --git a/light/xfwm4-a11y/menu-pressed.xpm b/light/variants/a11y/xfwm4/menu-pressed.xpm
similarity index 100%
rename from light/xfwm4-a11y/menu-pressed.xpm
rename to light/variants/a11y/xfwm4/menu-pressed.xpm
diff --git a/light/xfwm4-a11y/right-active.xpm b/light/variants/a11y/xfwm4/right-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/right-active.xpm
rename to light/variants/a11y/xfwm4/right-active.xpm
diff --git a/dark/xfwm4-compact/right-inactive.xpm b/light/variants/a11y/xfwm4/right-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/right-inactive.xpm
rename to light/variants/a11y/xfwm4/right-inactive.xpm
diff --git a/light/xfwm4-a11y/shade-active.png b/light/variants/a11y/xfwm4/shade-active.png
similarity index 100%
rename from light/xfwm4-a11y/shade-active.png
rename to light/variants/a11y/xfwm4/shade-active.png
diff --git a/light/xfwm4-a11y/shade-active.xpm b/light/variants/a11y/xfwm4/shade-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/shade-active.xpm
rename to light/variants/a11y/xfwm4/shade-active.xpm
diff --git a/light/xfwm4-a11y/shade-inactive.png b/light/variants/a11y/xfwm4/shade-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/shade-inactive.png
rename to light/variants/a11y/xfwm4/shade-inactive.png
diff --git a/light/xfwm4-a11y/shade-inactive.xpm b/light/variants/a11y/xfwm4/shade-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/shade-inactive.xpm
rename to light/variants/a11y/xfwm4/shade-inactive.xpm
diff --git a/light/xfwm4-a11y/shade-prelight.png b/light/variants/a11y/xfwm4/shade-prelight.png
similarity index 100%
rename from light/xfwm4-a11y/shade-prelight.png
rename to light/variants/a11y/xfwm4/shade-prelight.png
diff --git a/light/xfwm4-a11y/shade-prelight.xpm b/light/variants/a11y/xfwm4/shade-prelight.xpm
similarity index 100%
rename from light/xfwm4-a11y/shade-prelight.xpm
rename to light/variants/a11y/xfwm4/shade-prelight.xpm
diff --git a/light/xfwm4-a11y/shade-pressed.png b/light/variants/a11y/xfwm4/shade-pressed.png
similarity index 100%
rename from light/xfwm4-a11y/shade-pressed.png
rename to light/variants/a11y/xfwm4/shade-pressed.png
diff --git a/light/xfwm4-a11y/shade-pressed.xpm b/light/variants/a11y/xfwm4/shade-pressed.xpm
similarity index 100%
rename from light/xfwm4-a11y/shade-pressed.xpm
rename to light/variants/a11y/xfwm4/shade-pressed.xpm
diff --git a/light/xfwm4-a11y/shade-toggled-active.png b/light/variants/a11y/xfwm4/shade-toggled-active.png
similarity index 100%
rename from light/xfwm4-a11y/shade-toggled-active.png
rename to light/variants/a11y/xfwm4/shade-toggled-active.png
diff --git a/light/xfwm4-a11y/shade-toggled-active.xpm b/light/variants/a11y/xfwm4/shade-toggled-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/shade-toggled-active.xpm
rename to light/variants/a11y/xfwm4/shade-toggled-active.xpm
diff --git a/light/xfwm4-a11y/shade-toggled-inactive.png b/light/variants/a11y/xfwm4/shade-toggled-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/shade-toggled-inactive.png
rename to light/variants/a11y/xfwm4/shade-toggled-inactive.png
diff --git a/light/xfwm4-a11y/shade-toggled-inactive.xpm b/light/variants/a11y/xfwm4/shade-toggled-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/shade-toggled-inactive.xpm
rename to light/variants/a11y/xfwm4/shade-toggled-inactive.xpm
diff --git a/light/xfwm4-a11y/shade-toggled-prelight.png b/light/variants/a11y/xfwm4/shade-toggled-prelight.png
similarity index 100%
rename from light/xfwm4-a11y/shade-toggled-prelight.png
rename to light/variants/a11y/xfwm4/shade-toggled-prelight.png
diff --git a/light/xfwm4-a11y/shade-toggled-prelight.xpm b/light/variants/a11y/xfwm4/shade-toggled-prelight.xpm
similarity index 100%
rename from light/xfwm4-a11y/shade-toggled-prelight.xpm
rename to light/variants/a11y/xfwm4/shade-toggled-prelight.xpm
diff --git a/light/xfwm4-a11y/shade-toggled-pressed.png b/light/variants/a11y/xfwm4/shade-toggled-pressed.png
similarity index 100%
rename from light/xfwm4-a11y/shade-toggled-pressed.png
rename to light/variants/a11y/xfwm4/shade-toggled-pressed.png
diff --git a/light/xfwm4-a11y/shade-toggled-pressed.xpm b/light/variants/a11y/xfwm4/shade-toggled-pressed.xpm
similarity index 100%
rename from light/xfwm4-a11y/shade-toggled-pressed.xpm
rename to light/variants/a11y/xfwm4/shade-toggled-pressed.xpm
diff --git a/light/xfwm4-a11y/stick-active.png b/light/variants/a11y/xfwm4/stick-active.png
similarity index 100%
rename from light/xfwm4-a11y/stick-active.png
rename to light/variants/a11y/xfwm4/stick-active.png
diff --git a/light/xfwm4-a11y/stick-active.xpm b/light/variants/a11y/xfwm4/stick-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/stick-active.xpm
rename to light/variants/a11y/xfwm4/stick-active.xpm
diff --git a/light/xfwm4-a11y/stick-inactive.png b/light/variants/a11y/xfwm4/stick-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/stick-inactive.png
rename to light/variants/a11y/xfwm4/stick-inactive.png
diff --git a/light/xfwm4-a11y/stick-inactive.xpm b/light/variants/a11y/xfwm4/stick-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/stick-inactive.xpm
rename to light/variants/a11y/xfwm4/stick-inactive.xpm
diff --git a/light/xfwm4-a11y/stick-prelight.png b/light/variants/a11y/xfwm4/stick-prelight.png
similarity index 100%
rename from light/xfwm4-a11y/stick-prelight.png
rename to light/variants/a11y/xfwm4/stick-prelight.png
diff --git a/light/xfwm4-a11y/stick-prelight.xpm b/light/variants/a11y/xfwm4/stick-prelight.xpm
similarity index 100%
rename from light/xfwm4-a11y/stick-prelight.xpm
rename to light/variants/a11y/xfwm4/stick-prelight.xpm
diff --git a/light/xfwm4-a11y/stick-pressed.png b/light/variants/a11y/xfwm4/stick-pressed.png
similarity index 100%
rename from light/xfwm4-a11y/stick-pressed.png
rename to light/variants/a11y/xfwm4/stick-pressed.png
diff --git a/light/xfwm4-a11y/stick-pressed.xpm b/light/variants/a11y/xfwm4/stick-pressed.xpm
similarity index 100%
rename from light/xfwm4-a11y/stick-pressed.xpm
rename to light/variants/a11y/xfwm4/stick-pressed.xpm
diff --git a/light/xfwm4-a11y/stick-toggled-active.png b/light/variants/a11y/xfwm4/stick-toggled-active.png
similarity index 100%
rename from light/xfwm4-a11y/stick-toggled-active.png
rename to light/variants/a11y/xfwm4/stick-toggled-active.png
diff --git a/light/xfwm4-a11y/stick-toggled-active.xpm b/light/variants/a11y/xfwm4/stick-toggled-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/stick-toggled-active.xpm
rename to light/variants/a11y/xfwm4/stick-toggled-active.xpm
diff --git a/light/xfwm4-a11y/stick-toggled-inactive.png b/light/variants/a11y/xfwm4/stick-toggled-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/stick-toggled-inactive.png
rename to light/variants/a11y/xfwm4/stick-toggled-inactive.png
diff --git a/light/xfwm4-a11y/stick-toggled-inactive.xpm b/light/variants/a11y/xfwm4/stick-toggled-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/stick-toggled-inactive.xpm
rename to light/variants/a11y/xfwm4/stick-toggled-inactive.xpm
diff --git a/light/xfwm4-a11y/stick-toggled-prelight.png b/light/variants/a11y/xfwm4/stick-toggled-prelight.png
similarity index 100%
rename from light/xfwm4-a11y/stick-toggled-prelight.png
rename to light/variants/a11y/xfwm4/stick-toggled-prelight.png
diff --git a/light/xfwm4-a11y/stick-toggled-prelight.xpm b/light/variants/a11y/xfwm4/stick-toggled-prelight.xpm
similarity index 100%
rename from light/xfwm4-a11y/stick-toggled-prelight.xpm
rename to light/variants/a11y/xfwm4/stick-toggled-prelight.xpm
diff --git a/light/xfwm4-a11y/stick-toggled-pressed.png b/light/variants/a11y/xfwm4/stick-toggled-pressed.png
similarity index 100%
rename from light/xfwm4-a11y/stick-toggled-pressed.png
rename to light/variants/a11y/xfwm4/stick-toggled-pressed.png
diff --git a/light/xfwm4-a11y/stick-toggled-pressed.xpm b/light/variants/a11y/xfwm4/stick-toggled-pressed.xpm
similarity index 100%
rename from light/xfwm4-a11y/stick-toggled-pressed.xpm
rename to light/variants/a11y/xfwm4/stick-toggled-pressed.xpm
diff --git a/light/xfwm4-a11y/themerc b/light/variants/a11y/xfwm4/themerc
similarity index 100%
rename from light/xfwm4-a11y/themerc
rename to light/variants/a11y/xfwm4/themerc
diff --git a/light/xfwm4-a11y/title-1-active.png b/light/variants/a11y/xfwm4/title-1-active.png
similarity index 100%
rename from light/xfwm4-a11y/title-1-active.png
rename to light/variants/a11y/xfwm4/title-1-active.png
diff --git a/light/xfwm4-a11y/title-1-active.xpm b/light/variants/a11y/xfwm4/title-1-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/title-1-active.xpm
rename to light/variants/a11y/xfwm4/title-1-active.xpm
diff --git a/light/xfwm4-a11y/title-1-inactive.png b/light/variants/a11y/xfwm4/title-1-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/title-1-inactive.png
rename to light/variants/a11y/xfwm4/title-1-inactive.png
diff --git a/light/xfwm4-a11y/title-1-inactive.xpm b/light/variants/a11y/xfwm4/title-1-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/title-1-inactive.xpm
rename to light/variants/a11y/xfwm4/title-1-inactive.xpm
diff --git a/light/xfwm4-a11y/title-2-active.png b/light/variants/a11y/xfwm4/title-2-active.png
similarity index 100%
rename from light/xfwm4-a11y/title-2-active.png
rename to light/variants/a11y/xfwm4/title-2-active.png
diff --git a/light/xfwm4-a11y/title-2-active.xpm b/light/variants/a11y/xfwm4/title-2-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/title-2-active.xpm
rename to light/variants/a11y/xfwm4/title-2-active.xpm
diff --git a/light/xfwm4-a11y/title-2-inactive.png b/light/variants/a11y/xfwm4/title-2-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/title-2-inactive.png
rename to light/variants/a11y/xfwm4/title-2-inactive.png
diff --git a/light/xfwm4-a11y/title-2-inactive.xpm b/light/variants/a11y/xfwm4/title-2-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/title-2-inactive.xpm
rename to light/variants/a11y/xfwm4/title-2-inactive.xpm
diff --git a/light/xfwm4-a11y/title-3-active.png b/light/variants/a11y/xfwm4/title-3-active.png
similarity index 100%
rename from light/xfwm4-a11y/title-3-active.png
rename to light/variants/a11y/xfwm4/title-3-active.png
diff --git a/light/xfwm4-a11y/title-3-active.xpm b/light/variants/a11y/xfwm4/title-3-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/title-3-active.xpm
rename to light/variants/a11y/xfwm4/title-3-active.xpm
diff --git a/light/xfwm4-a11y/title-3-inactive.png b/light/variants/a11y/xfwm4/title-3-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/title-3-inactive.png
rename to light/variants/a11y/xfwm4/title-3-inactive.png
diff --git a/light/xfwm4-a11y/title-3-inactive.xpm b/light/variants/a11y/xfwm4/title-3-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/title-3-inactive.xpm
rename to light/variants/a11y/xfwm4/title-3-inactive.xpm
diff --git a/light/xfwm4-a11y/title-4-active.png b/light/variants/a11y/xfwm4/title-4-active.png
similarity index 100%
rename from light/xfwm4-a11y/title-4-active.png
rename to light/variants/a11y/xfwm4/title-4-active.png
diff --git a/light/xfwm4-a11y/title-4-active.xpm b/light/variants/a11y/xfwm4/title-4-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/title-4-active.xpm
rename to light/variants/a11y/xfwm4/title-4-active.xpm
diff --git a/light/xfwm4-a11y/title-4-inactive.png b/light/variants/a11y/xfwm4/title-4-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/title-4-inactive.png
rename to light/variants/a11y/xfwm4/title-4-inactive.png
diff --git a/light/xfwm4-a11y/title-4-inactive.xpm b/light/variants/a11y/xfwm4/title-4-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/title-4-inactive.xpm
rename to light/variants/a11y/xfwm4/title-4-inactive.xpm
diff --git a/light/xfwm4-a11y/title-5-active.png b/light/variants/a11y/xfwm4/title-5-active.png
similarity index 100%
rename from light/xfwm4-a11y/title-5-active.png
rename to light/variants/a11y/xfwm4/title-5-active.png
diff --git a/light/xfwm4-a11y/title-5-active.xpm b/light/variants/a11y/xfwm4/title-5-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/title-5-active.xpm
rename to light/variants/a11y/xfwm4/title-5-active.xpm
diff --git a/light/xfwm4-a11y/title-5-inactive.png b/light/variants/a11y/xfwm4/title-5-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/title-5-inactive.png
rename to light/variants/a11y/xfwm4/title-5-inactive.png
diff --git a/light/xfwm4-a11y/title-5-inactive.xpm b/light/variants/a11y/xfwm4/title-5-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/title-5-inactive.xpm
rename to light/variants/a11y/xfwm4/title-5-inactive.xpm
diff --git a/light/xfwm4-a11y/top-left-active.png b/light/variants/a11y/xfwm4/top-left-active.png
similarity index 100%
rename from light/xfwm4-a11y/top-left-active.png
rename to light/variants/a11y/xfwm4/top-left-active.png
diff --git a/light/xfwm4-a11y/top-left-active.xpm b/light/variants/a11y/xfwm4/top-left-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/top-left-active.xpm
rename to light/variants/a11y/xfwm4/top-left-active.xpm
diff --git a/light/xfwm4-a11y/top-left-inactive.png b/light/variants/a11y/xfwm4/top-left-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/top-left-inactive.png
rename to light/variants/a11y/xfwm4/top-left-inactive.png
diff --git a/light/xfwm4-a11y/top-left-inactive.xpm b/light/variants/a11y/xfwm4/top-left-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/top-left-inactive.xpm
rename to light/variants/a11y/xfwm4/top-left-inactive.xpm
diff --git a/light/xfwm4-a11y/top-right-active.png b/light/variants/a11y/xfwm4/top-right-active.png
similarity index 100%
rename from light/xfwm4-a11y/top-right-active.png
rename to light/variants/a11y/xfwm4/top-right-active.png
diff --git a/light/xfwm4-a11y/top-right-active.xpm b/light/variants/a11y/xfwm4/top-right-active.xpm
similarity index 100%
rename from light/xfwm4-a11y/top-right-active.xpm
rename to light/variants/a11y/xfwm4/top-right-active.xpm
diff --git a/light/xfwm4-a11y/top-right-inactive.png b/light/variants/a11y/xfwm4/top-right-inactive.png
similarity index 100%
rename from light/xfwm4-a11y/top-right-inactive.png
rename to light/variants/a11y/xfwm4/top-right-inactive.png
diff --git a/light/xfwm4-a11y/top-right-inactive.xpm b/light/variants/a11y/xfwm4/top-right-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/top-right-inactive.xpm
rename to light/variants/a11y/xfwm4/top-right-inactive.xpm
diff --git a/light/xfce-notify-4.0_bright/gtk.css b/light/variants/bright/xfce-notify-4.0/gtk.css
similarity index 100%
rename from light/xfce-notify-4.0_bright/gtk.css
rename to light/variants/bright/xfce-notify-4.0/gtk.css
diff --git a/light/xfce-notify-4.0_bright/gtkrc b/light/variants/bright/xfce-notify-4.0/gtkrc
similarity index 100%
rename from light/xfce-notify-4.0_bright/gtkrc
rename to light/variants/bright/xfce-notify-4.0/gtkrc
diff --git a/dark/xfwm4-compact/base-inactive.png b/light/variants/compact/xfwm4/base-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/base-inactive.png
rename to light/variants/compact/xfwm4/base-inactive.png
diff --git a/dark/xfwm4-compact/base.png b/light/variants/compact/xfwm4/base.png
similarity index 100%
rename from dark/xfwm4-compact/base.png
rename to light/variants/compact/xfwm4/base.png
diff --git a/dark/xfwm4-compact/base_active.png b/light/variants/compact/xfwm4/base_active.png
similarity index 100%
rename from dark/xfwm4-compact/base_active.png
rename to light/variants/compact/xfwm4/base_active.png
diff --git a/dark/xfwm4-compact/base_inactive.png b/light/variants/compact/xfwm4/base_inactive.png
similarity index 100%
rename from dark/xfwm4-compact/base_inactive.png
rename to light/variants/compact/xfwm4/base_inactive.png
diff --git a/dark/xfwm4-compact/bottom-active.xpm b/light/variants/compact/xfwm4/bottom-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/bottom-active.xpm
rename to light/variants/compact/xfwm4/bottom-active.xpm
diff --git a/light/xfwm4-a11y/bottom-inactive.xpm b/light/variants/compact/xfwm4/bottom-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/bottom-inactive.xpm
rename to light/variants/compact/xfwm4/bottom-inactive.xpm
diff --git a/dark/xfwm4-compact/bottom-left-active.xpm b/light/variants/compact/xfwm4/bottom-left-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/bottom-left-active.xpm
rename to light/variants/compact/xfwm4/bottom-left-active.xpm
diff --git a/light/xfwm4-a11y/bottom-left-inactive.xpm b/light/variants/compact/xfwm4/bottom-left-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/bottom-left-inactive.xpm
rename to light/variants/compact/xfwm4/bottom-left-inactive.xpm
diff --git a/dark/xfwm4-compact/bottom-right-active.xpm b/light/variants/compact/xfwm4/bottom-right-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/bottom-right-active.xpm
rename to light/variants/compact/xfwm4/bottom-right-active.xpm
diff --git a/light/xfwm4-a11y/bottom-right-inactive.xpm b/light/variants/compact/xfwm4/bottom-right-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/bottom-right-inactive.xpm
rename to light/variants/compact/xfwm4/bottom-right-inactive.xpm
diff --git a/dark/xfwm4-compact/close-active.png b/light/variants/compact/xfwm4/close-active.png
similarity index 100%
rename from dark/xfwm4-compact/close-active.png
rename to light/variants/compact/xfwm4/close-active.png
diff --git a/dark/xfwm4-compact/close-active.xpm b/light/variants/compact/xfwm4/close-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/close-active.xpm
rename to light/variants/compact/xfwm4/close-active.xpm
diff --git a/dark/xfwm4-compact/close-inactive.png b/light/variants/compact/xfwm4/close-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/close-inactive.png
rename to light/variants/compact/xfwm4/close-inactive.png
diff --git a/dark/xfwm4-compact/close-inactive.xpm b/light/variants/compact/xfwm4/close-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/close-inactive.xpm
rename to light/variants/compact/xfwm4/close-inactive.xpm
diff --git a/dark/xfwm4-compact/close-prelight.png b/light/variants/compact/xfwm4/close-prelight.png
similarity index 100%
rename from dark/xfwm4-compact/close-prelight.png
rename to light/variants/compact/xfwm4/close-prelight.png
diff --git a/dark/xfwm4-compact/close-prelight.xpm b/light/variants/compact/xfwm4/close-prelight.xpm
similarity index 100%
rename from dark/xfwm4-compact/close-prelight.xpm
rename to light/variants/compact/xfwm4/close-prelight.xpm
diff --git a/dark/xfwm4-compact/close-pressed.png b/light/variants/compact/xfwm4/close-pressed.png
similarity index 100%
rename from dark/xfwm4-compact/close-pressed.png
rename to light/variants/compact/xfwm4/close-pressed.png
diff --git a/dark/xfwm4-compact/close-pressed.xpm b/light/variants/compact/xfwm4/close-pressed.xpm
similarity index 100%
rename from dark/xfwm4-compact/close-pressed.xpm
rename to light/variants/compact/xfwm4/close-pressed.xpm
diff --git a/dark/xfwm4-compact/hide-active.png b/light/variants/compact/xfwm4/hide-active.png
similarity index 100%
rename from dark/xfwm4-compact/hide-active.png
rename to light/variants/compact/xfwm4/hide-active.png
diff --git a/dark/xfwm4-compact/hide-active.xpm b/light/variants/compact/xfwm4/hide-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/hide-active.xpm
rename to light/variants/compact/xfwm4/hide-active.xpm
diff --git a/dark/xfwm4-compact/hide-inactive.png b/light/variants/compact/xfwm4/hide-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/hide-inactive.png
rename to light/variants/compact/xfwm4/hide-inactive.png
diff --git a/dark/xfwm4-compact/hide-inactive.xpm b/light/variants/compact/xfwm4/hide-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/hide-inactive.xpm
rename to light/variants/compact/xfwm4/hide-inactive.xpm
diff --git a/dark/xfwm4-compact/hide-prelight.png b/light/variants/compact/xfwm4/hide-prelight.png
similarity index 100%
rename from dark/xfwm4-compact/hide-prelight.png
rename to light/variants/compact/xfwm4/hide-prelight.png
diff --git a/dark/xfwm4-compact/hide-prelight.xpm b/light/variants/compact/xfwm4/hide-prelight.xpm
similarity index 100%
rename from dark/xfwm4-compact/hide-prelight.xpm
rename to light/variants/compact/xfwm4/hide-prelight.xpm
diff --git a/dark/xfwm4-compact/hide-pressed.png b/light/variants/compact/xfwm4/hide-pressed.png
similarity index 100%
rename from dark/xfwm4-compact/hide-pressed.png
rename to light/variants/compact/xfwm4/hide-pressed.png
diff --git a/dark/xfwm4-compact/hide-pressed.xpm b/light/variants/compact/xfwm4/hide-pressed.xpm
similarity index 100%
rename from dark/xfwm4-compact/hide-pressed.xpm
rename to light/variants/compact/xfwm4/hide-pressed.xpm
diff --git a/dark/xfwm4-compact/left-active.xpm b/light/variants/compact/xfwm4/left-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/left-active.xpm
rename to light/variants/compact/xfwm4/left-active.xpm
diff --git a/light/xfwm4-a11y/left-inactive.xpm b/light/variants/compact/xfwm4/left-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/left-inactive.xpm
rename to light/variants/compact/xfwm4/left-inactive.xpm
diff --git a/dark/xfwm4-compact/maximize-active.png b/light/variants/compact/xfwm4/maximize-active.png
similarity index 100%
rename from dark/xfwm4-compact/maximize-active.png
rename to light/variants/compact/xfwm4/maximize-active.png
diff --git a/dark/xfwm4-compact/maximize-active.xpm b/light/variants/compact/xfwm4/maximize-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/maximize-active.xpm
rename to light/variants/compact/xfwm4/maximize-active.xpm
diff --git a/dark/xfwm4-compact/maximize-inactive.png b/light/variants/compact/xfwm4/maximize-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/maximize-inactive.png
rename to light/variants/compact/xfwm4/maximize-inactive.png
diff --git a/dark/xfwm4-compact/maximize-inactive.xpm b/light/variants/compact/xfwm4/maximize-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/maximize-inactive.xpm
rename to light/variants/compact/xfwm4/maximize-inactive.xpm
diff --git a/dark/xfwm4-compact/maximize-prelight.png b/light/variants/compact/xfwm4/maximize-prelight.png
similarity index 100%
rename from dark/xfwm4-compact/maximize-prelight.png
rename to light/variants/compact/xfwm4/maximize-prelight.png
diff --git a/dark/xfwm4-compact/maximize-prelight.xpm b/light/variants/compact/xfwm4/maximize-prelight.xpm
similarity index 100%
rename from dark/xfwm4-compact/maximize-prelight.xpm
rename to light/variants/compact/xfwm4/maximize-prelight.xpm
diff --git a/dark/xfwm4-compact/maximize-pressed.png b/light/variants/compact/xfwm4/maximize-pressed.png
similarity index 100%
rename from dark/xfwm4-compact/maximize-pressed.png
rename to light/variants/compact/xfwm4/maximize-pressed.png
diff --git a/dark/xfwm4-compact/maximize-pressed.xpm b/light/variants/compact/xfwm4/maximize-pressed.xpm
similarity index 100%
rename from dark/xfwm4-compact/maximize-pressed.xpm
rename to light/variants/compact/xfwm4/maximize-pressed.xpm
diff --git a/dark/xfwm4-compact/menu-active.png b/light/variants/compact/xfwm4/menu-active.png
similarity index 100%
rename from dark/xfwm4-compact/menu-active.png
rename to light/variants/compact/xfwm4/menu-active.png
diff --git a/dark/xfwm4-compact/menu-active.xpm b/light/variants/compact/xfwm4/menu-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/menu-active.xpm
rename to light/variants/compact/xfwm4/menu-active.xpm
diff --git a/dark/xfwm4-compact/menu-inactive.png b/light/variants/compact/xfwm4/menu-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/menu-inactive.png
rename to light/variants/compact/xfwm4/menu-inactive.png
diff --git a/dark/xfwm4-compact/menu-inactive.xpm b/light/variants/compact/xfwm4/menu-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/menu-inactive.xpm
rename to light/variants/compact/xfwm4/menu-inactive.xpm
diff --git a/dark/xfwm4-compact/menu-prelight.png b/light/variants/compact/xfwm4/menu-prelight.png
similarity index 100%
rename from dark/xfwm4-compact/menu-prelight.png
rename to light/variants/compact/xfwm4/menu-prelight.png
diff --git a/dark/xfwm4-compact/menu-prelight.xpm b/light/variants/compact/xfwm4/menu-prelight.xpm
similarity index 100%
rename from dark/xfwm4-compact/menu-prelight.xpm
rename to light/variants/compact/xfwm4/menu-prelight.xpm
diff --git a/dark/xfwm4-compact/menu-pressed.png b/light/variants/compact/xfwm4/menu-pressed.png
similarity index 100%
rename from dark/xfwm4-compact/menu-pressed.png
rename to light/variants/compact/xfwm4/menu-pressed.png
diff --git a/dark/xfwm4-compact/menu-pressed.xpm b/light/variants/compact/xfwm4/menu-pressed.xpm
similarity index 100%
rename from dark/xfwm4-compact/menu-pressed.xpm
rename to light/variants/compact/xfwm4/menu-pressed.xpm
diff --git a/dark/xfwm4-compact/right-active.xpm b/light/variants/compact/xfwm4/right-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/right-active.xpm
rename to light/variants/compact/xfwm4/right-active.xpm
diff --git a/light/xfwm4-a11y/right-inactive.xpm b/light/variants/compact/xfwm4/right-inactive.xpm
similarity index 100%
rename from light/xfwm4-a11y/right-inactive.xpm
rename to light/variants/compact/xfwm4/right-inactive.xpm
diff --git a/dark/xfwm4-compact/shade-active.png b/light/variants/compact/xfwm4/shade-active.png
similarity index 100%
rename from dark/xfwm4-compact/shade-active.png
rename to light/variants/compact/xfwm4/shade-active.png
diff --git a/dark/xfwm4-compact/shade-active.xpm b/light/variants/compact/xfwm4/shade-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/shade-active.xpm
rename to light/variants/compact/xfwm4/shade-active.xpm
diff --git a/dark/xfwm4-compact/shade-inactive.png b/light/variants/compact/xfwm4/shade-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/shade-inactive.png
rename to light/variants/compact/xfwm4/shade-inactive.png
diff --git a/dark/xfwm4-compact/shade-inactive.xpm b/light/variants/compact/xfwm4/shade-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/shade-inactive.xpm
rename to light/variants/compact/xfwm4/shade-inactive.xpm
diff --git a/dark/xfwm4-compact/shade-prelight.png b/light/variants/compact/xfwm4/shade-prelight.png
similarity index 100%
rename from dark/xfwm4-compact/shade-prelight.png
rename to light/variants/compact/xfwm4/shade-prelight.png
diff --git a/dark/xfwm4-compact/shade-prelight.xpm b/light/variants/compact/xfwm4/shade-prelight.xpm
similarity index 100%
rename from dark/xfwm4-compact/shade-prelight.xpm
rename to light/variants/compact/xfwm4/shade-prelight.xpm
diff --git a/dark/xfwm4-compact/shade-pressed.png b/light/variants/compact/xfwm4/shade-pressed.png
similarity index 100%
rename from dark/xfwm4-compact/shade-pressed.png
rename to light/variants/compact/xfwm4/shade-pressed.png
diff --git a/dark/xfwm4-compact/shade-pressed.xpm b/light/variants/compact/xfwm4/shade-pressed.xpm
similarity index 100%
rename from dark/xfwm4-compact/shade-pressed.xpm
rename to light/variants/compact/xfwm4/shade-pressed.xpm
diff --git a/dark/xfwm4-compact/shade-toggled-active.png b/light/variants/compact/xfwm4/shade-toggled-active.png
similarity index 100%
rename from dark/xfwm4-compact/shade-toggled-active.png
rename to light/variants/compact/xfwm4/shade-toggled-active.png
diff --git a/dark/xfwm4-compact/shade-toggled-active.xpm b/light/variants/compact/xfwm4/shade-toggled-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/shade-toggled-active.xpm
rename to light/variants/compact/xfwm4/shade-toggled-active.xpm
diff --git a/dark/xfwm4-compact/shade-toggled-inactive.png b/light/variants/compact/xfwm4/shade-toggled-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/shade-toggled-inactive.png
rename to light/variants/compact/xfwm4/shade-toggled-inactive.png
diff --git a/dark/xfwm4-compact/shade-toggled-inactive.xpm b/light/variants/compact/xfwm4/shade-toggled-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/shade-toggled-inactive.xpm
rename to light/variants/compact/xfwm4/shade-toggled-inactive.xpm
diff --git a/dark/xfwm4-compact/shade-toggled-prelight.png b/light/variants/compact/xfwm4/shade-toggled-prelight.png
similarity index 100%
rename from dark/xfwm4-compact/shade-toggled-prelight.png
rename to light/variants/compact/xfwm4/shade-toggled-prelight.png
diff --git a/dark/xfwm4-compact/shade-toggled-prelight.xpm b/light/variants/compact/xfwm4/shade-toggled-prelight.xpm
similarity index 100%
rename from dark/xfwm4-compact/shade-toggled-prelight.xpm
rename to light/variants/compact/xfwm4/shade-toggled-prelight.xpm
diff --git a/dark/xfwm4-compact/shade-toggled-pressed.png b/light/variants/compact/xfwm4/shade-toggled-pressed.png
similarity index 100%
rename from dark/xfwm4-compact/shade-toggled-pressed.png
rename to light/variants/compact/xfwm4/shade-toggled-pressed.png
diff --git a/dark/xfwm4-compact/shade-toggled-pressed.xpm b/light/variants/compact/xfwm4/shade-toggled-pressed.xpm
similarity index 100%
rename from dark/xfwm4-compact/shade-toggled-pressed.xpm
rename to light/variants/compact/xfwm4/shade-toggled-pressed.xpm
diff --git a/dark/xfwm4-compact/stick-active.png b/light/variants/compact/xfwm4/stick-active.png
similarity index 100%
rename from dark/xfwm4-compact/stick-active.png
rename to light/variants/compact/xfwm4/stick-active.png
diff --git a/dark/xfwm4-compact/stick-active.xpm b/light/variants/compact/xfwm4/stick-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/stick-active.xpm
rename to light/variants/compact/xfwm4/stick-active.xpm
diff --git a/dark/xfwm4-compact/stick-inactive.png b/light/variants/compact/xfwm4/stick-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/stick-inactive.png
rename to light/variants/compact/xfwm4/stick-inactive.png
diff --git a/dark/xfwm4-compact/stick-inactive.xpm b/light/variants/compact/xfwm4/stick-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/stick-inactive.xpm
rename to light/variants/compact/xfwm4/stick-inactive.xpm
diff --git a/dark/xfwm4-compact/stick-prelight.png b/light/variants/compact/xfwm4/stick-prelight.png
similarity index 100%
rename from dark/xfwm4-compact/stick-prelight.png
rename to light/variants/compact/xfwm4/stick-prelight.png
diff --git a/dark/xfwm4-compact/stick-prelight.xpm b/light/variants/compact/xfwm4/stick-prelight.xpm
similarity index 100%
rename from dark/xfwm4-compact/stick-prelight.xpm
rename to light/variants/compact/xfwm4/stick-prelight.xpm
diff --git a/dark/xfwm4-compact/stick-pressed.png b/light/variants/compact/xfwm4/stick-pressed.png
similarity index 100%
rename from dark/xfwm4-compact/stick-pressed.png
rename to light/variants/compact/xfwm4/stick-pressed.png
diff --git a/dark/xfwm4-compact/stick-pressed.xpm b/light/variants/compact/xfwm4/stick-pressed.xpm
similarity index 100%
rename from dark/xfwm4-compact/stick-pressed.xpm
rename to light/variants/compact/xfwm4/stick-pressed.xpm
diff --git a/dark/xfwm4-compact/stick-toggled-active.png b/light/variants/compact/xfwm4/stick-toggled-active.png
similarity index 100%
rename from dark/xfwm4-compact/stick-toggled-active.png
rename to light/variants/compact/xfwm4/stick-toggled-active.png
diff --git a/dark/xfwm4-compact/stick-toggled-active.xpm b/light/variants/compact/xfwm4/stick-toggled-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/stick-toggled-active.xpm
rename to light/variants/compact/xfwm4/stick-toggled-active.xpm
diff --git a/dark/xfwm4-compact/stick-toggled-inactive.png b/light/variants/compact/xfwm4/stick-toggled-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/stick-toggled-inactive.png
rename to light/variants/compact/xfwm4/stick-toggled-inactive.png
diff --git a/dark/xfwm4-compact/stick-toggled-inactive.xpm b/light/variants/compact/xfwm4/stick-toggled-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/stick-toggled-inactive.xpm
rename to light/variants/compact/xfwm4/stick-toggled-inactive.xpm
diff --git a/dark/xfwm4-compact/stick-toggled-prelight.png b/light/variants/compact/xfwm4/stick-toggled-prelight.png
similarity index 100%
rename from dark/xfwm4-compact/stick-toggled-prelight.png
rename to light/variants/compact/xfwm4/stick-toggled-prelight.png
diff --git a/dark/xfwm4-compact/stick-toggled-prelight.xpm b/light/variants/compact/xfwm4/stick-toggled-prelight.xpm
similarity index 100%
rename from dark/xfwm4-compact/stick-toggled-prelight.xpm
rename to light/variants/compact/xfwm4/stick-toggled-prelight.xpm
diff --git a/dark/xfwm4-compact/stick-toggled-pressed.png b/light/variants/compact/xfwm4/stick-toggled-pressed.png
similarity index 100%
rename from dark/xfwm4-compact/stick-toggled-pressed.png
rename to light/variants/compact/xfwm4/stick-toggled-pressed.png
diff --git a/dark/xfwm4-compact/stick-toggled-pressed.xpm b/light/variants/compact/xfwm4/stick-toggled-pressed.xpm
similarity index 100%
rename from dark/xfwm4-compact/stick-toggled-pressed.xpm
rename to light/variants/compact/xfwm4/stick-toggled-pressed.xpm
diff --git a/dark/xfwm4-compact/themerc b/light/variants/compact/xfwm4/themerc
similarity index 100%
rename from dark/xfwm4-compact/themerc
rename to light/variants/compact/xfwm4/themerc
diff --git a/dark/xfwm4-compact/title-1-active.png b/light/variants/compact/xfwm4/title-1-active.png
similarity index 100%
rename from dark/xfwm4-compact/title-1-active.png
rename to light/variants/compact/xfwm4/title-1-active.png
diff --git a/dark/xfwm4-compact/title-1-active.xpm b/light/variants/compact/xfwm4/title-1-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/title-1-active.xpm
rename to light/variants/compact/xfwm4/title-1-active.xpm
diff --git a/dark/xfwm4-compact/title-1-inactive.png b/light/variants/compact/xfwm4/title-1-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/title-1-inactive.png
rename to light/variants/compact/xfwm4/title-1-inactive.png
diff --git a/dark/xfwm4-compact/title-1-inactive.xpm b/light/variants/compact/xfwm4/title-1-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/title-1-inactive.xpm
rename to light/variants/compact/xfwm4/title-1-inactive.xpm
diff --git a/dark/xfwm4-compact/title-2-active.png b/light/variants/compact/xfwm4/title-2-active.png
similarity index 100%
rename from dark/xfwm4-compact/title-2-active.png
rename to light/variants/compact/xfwm4/title-2-active.png
diff --git a/dark/xfwm4-compact/title-2-active.xpm b/light/variants/compact/xfwm4/title-2-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/title-2-active.xpm
rename to light/variants/compact/xfwm4/title-2-active.xpm
diff --git a/dark/xfwm4-compact/title-2-inactive.png b/light/variants/compact/xfwm4/title-2-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/title-2-inactive.png
rename to light/variants/compact/xfwm4/title-2-inactive.png
diff --git a/dark/xfwm4-compact/title-2-inactive.xpm b/light/variants/compact/xfwm4/title-2-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/title-2-inactive.xpm
rename to light/variants/compact/xfwm4/title-2-inactive.xpm
diff --git a/dark/xfwm4-compact/title-3-active.png b/light/variants/compact/xfwm4/title-3-active.png
similarity index 100%
rename from dark/xfwm4-compact/title-3-active.png
rename to light/variants/compact/xfwm4/title-3-active.png
diff --git a/dark/xfwm4-compact/title-3-active.xpm b/light/variants/compact/xfwm4/title-3-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/title-3-active.xpm
rename to light/variants/compact/xfwm4/title-3-active.xpm
diff --git a/dark/xfwm4-compact/title-3-inactive.png b/light/variants/compact/xfwm4/title-3-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/title-3-inactive.png
rename to light/variants/compact/xfwm4/title-3-inactive.png
diff --git a/dark/xfwm4-compact/title-3-inactive.xpm b/light/variants/compact/xfwm4/title-3-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/title-3-inactive.xpm
rename to light/variants/compact/xfwm4/title-3-inactive.xpm
diff --git a/dark/xfwm4-compact/title-4-active.png b/light/variants/compact/xfwm4/title-4-active.png
similarity index 100%
rename from dark/xfwm4-compact/title-4-active.png
rename to light/variants/compact/xfwm4/title-4-active.png
diff --git a/dark/xfwm4-compact/title-4-active.xpm b/light/variants/compact/xfwm4/title-4-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/title-4-active.xpm
rename to light/variants/compact/xfwm4/title-4-active.xpm
diff --git a/dark/xfwm4-compact/title-4-inactive.png b/light/variants/compact/xfwm4/title-4-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/title-4-inactive.png
rename to light/variants/compact/xfwm4/title-4-inactive.png
diff --git a/dark/xfwm4-compact/title-4-inactive.xpm b/light/variants/compact/xfwm4/title-4-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/title-4-inactive.xpm
rename to light/variants/compact/xfwm4/title-4-inactive.xpm
diff --git a/dark/xfwm4-compact/title-5-active.png b/light/variants/compact/xfwm4/title-5-active.png
similarity index 100%
rename from dark/xfwm4-compact/title-5-active.png
rename to light/variants/compact/xfwm4/title-5-active.png
diff --git a/dark/xfwm4-compact/title-5-active.xpm b/light/variants/compact/xfwm4/title-5-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/title-5-active.xpm
rename to light/variants/compact/xfwm4/title-5-active.xpm
diff --git a/dark/xfwm4-compact/title-5-inactive.png b/light/variants/compact/xfwm4/title-5-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/title-5-inactive.png
rename to light/variants/compact/xfwm4/title-5-inactive.png
diff --git a/dark/xfwm4-compact/title-5-inactive.xpm b/light/variants/compact/xfwm4/title-5-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/title-5-inactive.xpm
rename to light/variants/compact/xfwm4/title-5-inactive.xpm
diff --git a/dark/xfwm4-compact/top-left-active.png b/light/variants/compact/xfwm4/top-left-active.png
similarity index 100%
rename from dark/xfwm4-compact/top-left-active.png
rename to light/variants/compact/xfwm4/top-left-active.png
diff --git a/dark/xfwm4-compact/top-left-active.xpm b/light/variants/compact/xfwm4/top-left-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/top-left-active.xpm
rename to light/variants/compact/xfwm4/top-left-active.xpm
diff --git a/dark/xfwm4-compact/top-left-inactive.png b/light/variants/compact/xfwm4/top-left-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/top-left-inactive.png
rename to light/variants/compact/xfwm4/top-left-inactive.png
diff --git a/dark/xfwm4-compact/top-left-inactive.xpm b/light/variants/compact/xfwm4/top-left-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/top-left-inactive.xpm
rename to light/variants/compact/xfwm4/top-left-inactive.xpm
diff --git a/dark/xfwm4-compact/top-right-active.png b/light/variants/compact/xfwm4/top-right-active.png
similarity index 100%
rename from dark/xfwm4-compact/top-right-active.png
rename to light/variants/compact/xfwm4/top-right-active.png
diff --git a/dark/xfwm4-compact/top-right-active.xpm b/light/variants/compact/xfwm4/top-right-active.xpm
similarity index 100%
rename from dark/xfwm4-compact/top-right-active.xpm
rename to light/variants/compact/xfwm4/top-right-active.xpm
diff --git a/dark/xfwm4-compact/top-right-inactive.png b/light/variants/compact/xfwm4/top-right-inactive.png
similarity index 100%
rename from dark/xfwm4-compact/top-right-inactive.png
rename to light/variants/compact/xfwm4/top-right-inactive.png
diff --git a/dark/xfwm4-compact/top-right-inactive.xpm b/light/variants/compact/xfwm4/top-right-inactive.xpm
similarity index 100%
rename from dark/xfwm4-compact/top-right-inactive.xpm
rename to light/variants/compact/xfwm4/top-right-inactive.xpm
diff --git a/light/xfwm4-compact/base-inactive.png b/light/xfwm4-compact/base-inactive.png
deleted file mode 100644
index c9eb2a2a..00000000
Binary files a/light/xfwm4-compact/base-inactive.png and /dev/null differ
diff --git a/light/xfwm4-compact/base.png b/light/xfwm4-compact/base.png
deleted file mode 100644
index 6d95d21a..00000000
Binary files a/light/xfwm4-compact/base.png and /dev/null differ
diff --git a/light/xfwm4-compact/base_active.png b/light/xfwm4-compact/base_active.png
deleted file mode 100644
index dfcc0eec..00000000
Binary files a/light/xfwm4-compact/base_active.png and /dev/null differ
diff --git a/light/xfwm4-compact/base_inactive.png b/light/xfwm4-compact/base_inactive.png
deleted file mode 100644
index 12b60090..00000000
Binary files a/light/xfwm4-compact/base_inactive.png and /dev/null differ
diff --git a/light/xfwm4-compact/bottom-active.xpm b/light/xfwm4-compact/bottom-active.xpm
deleted file mode 100644
index 0ec965bb..00000000
--- a/light/xfwm4-compact/bottom-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #DEDEDE s active_color_2",
-"+	c #939393",
-"..",
-"++"};
diff --git a/light/xfwm4-compact/bottom-inactive.xpm b/light/xfwm4-compact/bottom-inactive.xpm
deleted file mode 120000
index 9f106392..00000000
--- a/light/xfwm4-compact/bottom-inactive.xpm
+++ /dev/null
@@ -1 +0,0 @@
-bottom-active.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/bottom-left-active.xpm b/light/xfwm4-compact/bottom-left-active.xpm
deleted file mode 100644
index 5b65d0b5..00000000
--- a/light/xfwm4-compact/bottom-left-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #939393",
-"+	c #DEDEDE s active_color_2",
-".+",
-".."};
diff --git a/light/xfwm4-compact/bottom-left-inactive.xpm b/light/xfwm4-compact/bottom-left-inactive.xpm
deleted file mode 120000
index d70de34a..00000000
--- a/light/xfwm4-compact/bottom-left-inactive.xpm
+++ /dev/null
@@ -1 +0,0 @@
-bottom-left-active.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/bottom-right-active.xpm b/light/xfwm4-compact/bottom-right-active.xpm
deleted file mode 100644
index 9e3d478c..00000000
--- a/light/xfwm4-compact/bottom-right-active.xpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"2 2 3 1",
-" 	c None",
-".	c #DEDEDE s active_color_2",
-"+	c #939393",
-".+",
-"++"};
diff --git a/light/xfwm4-compact/bottom-right-inactive.xpm b/light/xfwm4-compact/bottom-right-inactive.xpm
deleted file mode 120000
index d234cea5..00000000
--- a/light/xfwm4-compact/bottom-right-inactive.xpm
+++ /dev/null
@@ -1 +0,0 @@
-bottom-right-active.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/close-active.png b/light/xfwm4-compact/close-active.png
deleted file mode 100644
index 8601b653..00000000
Binary files a/light/xfwm4-compact/close-active.png and /dev/null differ
diff --git a/light/xfwm4-compact/close-active.xpm b/light/xfwm4-compact/close-active.xpm
deleted file mode 100644
index a69258a3..00000000
--- a/light/xfwm4-compact/close-active.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * close_prelight_xpm[] = {
-"22 18 8 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #969696",
-"$	c #ACACAC",
-"%	c #E5E5E5",
-"&	c #B0B0B0",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@##@@@@##@@@@@@@",
-"@@@@@@@$$#@@#$$@@@@@@@",
-"@@@@@@@%$$##$$%@@@@@@@",
-"@@@@@@@@%$$$$%@@@@@@@@",
-"@@@@@@@@@&$$&@@@@@@@@@",
-"@@@@@@@@#$$$$#@@@@@@@@",
-"@@@@@@@#$$%%$$#@@@@@@@",
-"@@@@@@@$$%@@%$$@@@@@@@",
-"@@@@@@@%%@@@@%%@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/close-inactive.png b/light/xfwm4-compact/close-inactive.png
deleted file mode 100644
index 7bf3eb09..00000000
Binary files a/light/xfwm4-compact/close-inactive.png and /dev/null differ
diff --git a/light/xfwm4-compact/close-inactive.xpm b/light/xfwm4-compact/close-inactive.xpm
deleted file mode 100644
index 3ddba969..00000000
--- a/light/xfwm4-compact/close-inactive.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * close_inactive_xpm[] = {
-"22 18 9 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #BFBFBF",
-"$	c #CFCFCF",
-"%	c #ECECEC",
-"&	c #D5D5D5",
-"*	c #F2F2F2",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@##@@@@##@@@@@@@",
-"@@@@@@@$$#@@#$$@@@@@@@",
-"@@@@@@@%$$##$$%@@@@@@@",
-"@@@@@@@@%$$$$%@@@@@@@@",
-"@@@@@@@@@&$$&@@@@@@@@@",
-"@@@@@@@@#$$$$#@@@@@@@@",
-"@@@@@@@#$$%%$$#@@@@@@@",
-"@@@@@@@$$%@@*$$@@@@@@@",
-"@@@@@@@%%@@@@%%@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/close-prelight.png b/light/xfwm4-compact/close-prelight.png
deleted file mode 120000
index 2fffb9c4..00000000
--- a/light/xfwm4-compact/close-prelight.png
+++ /dev/null
@@ -1 +0,0 @@
-close-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/close-prelight.xpm b/light/xfwm4-compact/close-prelight.xpm
deleted file mode 100644
index a7038ad8..00000000
--- a/light/xfwm4-compact/close-prelight.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * close_prelight_xpm[] = {
-"22 18 8 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #9B9B9B",
-"$	c #888888",
-"%	c #E5E5E5",
-"&	c #8B8B8B",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@##@@@@##@@@@@@@",
-"@@@@@@@$$#@@#$$@@@@@@@",
-"@@@@@@@%$$##$$%@@@@@@@",
-"@@@@@@@@%$$$$%@@@@@@@@",
-"@@@@@@@@@&$$&@@@@@@@@@",
-"@@@@@@@@#$$$$#@@@@@@@@",
-"@@@@@@@#$$%%$$#@@@@@@@",
-"@@@@@@@$$%@@%$$@@@@@@@",
-"@@@@@@@%%@@@@%%@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/close-pressed.png b/light/xfwm4-compact/close-pressed.png
deleted file mode 120000
index 2fffb9c4..00000000
--- a/light/xfwm4-compact/close-pressed.png
+++ /dev/null
@@ -1 +0,0 @@
-close-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/close-pressed.xpm b/light/xfwm4-compact/close-pressed.xpm
deleted file mode 100644
index daf869b1..00000000
--- a/light/xfwm4-compact/close-pressed.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"22 18 4 1",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #6897BC s active_color_1",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@##@@@@##@@@@@@@",
-"@@@@@@@###@@###@@@@@@@",
-"@@@@@@@@######@@@@@@@@",
-"@@@@@@@@@####@@@@@@@@@",
-"@@@@@@@@@####@@@@@@@@@",
-"@@@@@@@@######@@@@@@@@",
-"@@@@@@@###@@###@@@@@@@",
-"@@@@@@@##@@@@##@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/hide-active.png b/light/xfwm4-compact/hide-active.png
deleted file mode 100644
index 1aa20bdb..00000000
Binary files a/light/xfwm4-compact/hide-active.png and /dev/null differ
diff --git a/light/xfwm4-compact/hide-active.xpm b/light/xfwm4-compact/hide-active.xpm
deleted file mode 100644
index 7688865e..00000000
--- a/light/xfwm4-compact/hide-active.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * hide_active_xpm[] = {
-"22 18 7 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #969696",
-"$	c #ACACAC",
-"%	c #ECECEC",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@########@@@@@@@",
-"@@@@@@@$$$$$$$$@@@@@@@",
-"@@@@@@@%%%%%%%%@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/hide-inactive.png b/light/xfwm4-compact/hide-inactive.png
deleted file mode 100644
index 223f2b90..00000000
Binary files a/light/xfwm4-compact/hide-inactive.png and /dev/null differ
diff --git a/light/xfwm4-compact/hide-inactive.xpm b/light/xfwm4-compact/hide-inactive.xpm
deleted file mode 100644
index dcfe95e6..00000000
--- a/light/xfwm4-compact/hide-inactive.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * hide_inactive_xpm[] = {
-"22 18 7 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #BBBBBB",
-"$	c #CACACA",
-"%	c #ECECEC",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@########@@@@@@@",
-"@@@@@@@$$$$$$$$@@@@@@@",
-"@@@@@@@%%%%%%%%@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/hide-prelight.png b/light/xfwm4-compact/hide-prelight.png
deleted file mode 120000
index d5f88e30..00000000
--- a/light/xfwm4-compact/hide-prelight.png
+++ /dev/null
@@ -1 +0,0 @@
-hide-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/hide-prelight.xpm b/light/xfwm4-compact/hide-prelight.xpm
deleted file mode 100644
index d733d586..00000000
--- a/light/xfwm4-compact/hide-prelight.xpm
+++ /dev/null
@@ -1,28 +0,0 @@
-/* XPM */
-static char * hide_prelight_xpm[] = {
-"22 18 7 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #707070",
-"$	c #868686",
-"%	c #ECECEC",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@########@@@@@@@",
-"@@@@@@@$$$$$$$$@@@@@@@",
-"@@@@@@@%%%%%%%%@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/hide-pressed.png b/light/xfwm4-compact/hide-pressed.png
deleted file mode 120000
index d5f88e30..00000000
--- a/light/xfwm4-compact/hide-pressed.png
+++ /dev/null
@@ -1 +0,0 @@
-hide-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/hide-pressed.xpm b/light/xfwm4-compact/hide-pressed.xpm
deleted file mode 100644
index d965f135..00000000
--- a/light/xfwm4-compact/hide-pressed.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"22 18 4 1",
-" 	c #939393",
-".	c #FFFFFF",
-"+	c #DEDEDE s active_color_2",
-"@	c #6696BA s active_color_1",
-"                      ",
-"......................",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"+++++++@@@@@@@@+++++++",
-"+++++++@@@@@@@@+++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++"};
diff --git a/light/xfwm4-compact/left-active.xpm b/light/xfwm4-compact/left-active.xpm
deleted file mode 100644
index c1019ae1..00000000
--- a/light/xfwm4-compact/left-active.xpm
+++ /dev/null
@@ -1,7 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"2 1 3 1",
-" 	c None",
-".	c #939393",
-"+	c #DEDEDE s active_color_2",
-".+"};
diff --git a/light/xfwm4-compact/left-inactive.xpm b/light/xfwm4-compact/left-inactive.xpm
deleted file mode 120000
index ebcf4903..00000000
--- a/light/xfwm4-compact/left-inactive.xpm
+++ /dev/null
@@ -1 +0,0 @@
-left-active.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/maximize-active.png b/light/xfwm4-compact/maximize-active.png
deleted file mode 100644
index 7d697f02..00000000
Binary files a/light/xfwm4-compact/maximize-active.png and /dev/null differ
diff --git a/light/xfwm4-compact/maximize-active.xpm b/light/xfwm4-compact/maximize-active.xpm
deleted file mode 100644
index c8e98d65..00000000
--- a/light/xfwm4-compact/maximize-active.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"22 18 10 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #969696",
-"$	c #9F9F9F",
-"%	c #ACACAC",
-"&	c #ECECEC",
-"*	c #EEEFEF",
-"=	c #EFEFEF",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@##@@@@@@@@@@",
-"@@@@@@@@@@$$@@@@@@@@@@",
-"@@@@@@@@@@%%@@@@@@@@@@",
-"@@@@@@@###%%###@@@@@@@",
-"@@@@@@@%%%%%%%%@@@@@@@",
-"@@@@@@@&&&%%&&&@@@@@@@",
-"@@@@@@@@@@%%@@@@@@@@@@",
-"@@@@@@@@@@%%@@@@@@@@@@",
-"@@@@@@@@@@*=@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/maximize-inactive.png b/light/xfwm4-compact/maximize-inactive.png
deleted file mode 100644
index 9f10b2dd..00000000
Binary files a/light/xfwm4-compact/maximize-inactive.png and /dev/null differ
diff --git a/light/xfwm4-compact/maximize-inactive.xpm b/light/xfwm4-compact/maximize-inactive.xpm
deleted file mode 100644
index c5cc1736..00000000
--- a/light/xfwm4-compact/maximize-inactive.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * maximize_inactive_xpm[] = {
-"22 18 8 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #BABABA",
-"$	c #CACACA",
-"%	c #EAEAEA",
-"&	c #D4D4D4",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@##@@@@@@@@@@",
-"@@@@@@@@@@$$@@@@@@@@@@",
-"@@@@@@@@@@$$@@@@@@@@@@",
-"@@@@@@@###$$###@@@@@@@",
-"@@@@@@@$$$$$$$$@@@@@@@",
-"@@@@@@@%%%$$%%%@@@@@@@",
-"@@@@@@@@@@$$@@@@@@@@@@",
-"@@@@@@@@@@&&@@@@@@@@@@",
-"@@@@@@@@@@%%@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/maximize-prelight.png b/light/xfwm4-compact/maximize-prelight.png
deleted file mode 120000
index 73899538..00000000
--- a/light/xfwm4-compact/maximize-prelight.png
+++ /dev/null
@@ -1 +0,0 @@
-maximize-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/maximize-prelight.xpm b/light/xfwm4-compact/maximize-prelight.xpm
deleted file mode 100644
index 754dd8b3..00000000
--- a/light/xfwm4-compact/maximize-prelight.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * maximize_prelight_xpm[] = {
-"22 18 8 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #707070",
-"$	c #868686",
-"%	c #EAEAEA",
-"&	c #B3B3B3",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@##@@@@@@@@@@",
-"@@@@@@@@@@$$@@@@@@@@@@",
-"@@@@@@@@@@$$@@@@@@@@@@",
-"@@@@@@@###$$###@@@@@@@",
-"@@@@@@@$$$$$$$$@@@@@@@",
-"@@@@@@@%%%$$%%%@@@@@@@",
-"@@@@@@@@@@$$@@@@@@@@@@",
-"@@@@@@@@@@&&@@@@@@@@@@",
-"@@@@@@@@@@%%@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/maximize-pressed.png b/light/xfwm4-compact/maximize-pressed.png
deleted file mode 120000
index 73899538..00000000
--- a/light/xfwm4-compact/maximize-pressed.png
+++ /dev/null
@@ -1 +0,0 @@
-maximize-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/maximize-pressed.xpm b/light/xfwm4-compact/maximize-pressed.xpm
deleted file mode 100644
index d90ec8f4..00000000
--- a/light/xfwm4-compact/maximize-pressed.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"22 18 4 1",
-" 	c #939393",
-".	c #FFFFFF",
-"+	c #DEDEDE s active_color_2",
-"@	c #5189B5 s active_color_1",
-"                      ",
-"......................",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++@@++++++++++",
-"++++++++++@@++++++++++",
-"++++++++++@@++++++++++",
-"+++++++@@@@@@@@+++++++",
-"+++++++@@@@@@@@+++++++",
-"++++++++++@@++++++++++",
-"++++++++++@@++++++++++",
-"++++++++++@@++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
diff --git a/light/xfwm4-compact/menu-active.png b/light/xfwm4-compact/menu-active.png
deleted file mode 100644
index 027774d3..00000000
Binary files a/light/xfwm4-compact/menu-active.png and /dev/null differ
diff --git a/light/xfwm4-compact/menu-active.xpm b/light/xfwm4-compact/menu-active.xpm
deleted file mode 100644
index 730edf13..00000000
--- a/light/xfwm4-compact/menu-active.xpm
+++ /dev/null
@@ -1,46 +0,0 @@
-/* XPM */
-static char * menu_active_xpm[] = {
-"22 18 25 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #A7A7A7",
-"$	c #888888",
-"%	c #AAAAAA",
-"&	c #ECECEC",
-"*	c #B0B0B0",
-"=	c #9F9F9F",
-"-	c #B6B6B6",
-";	c #DFDFDF",
-">	c #EAEAEA",
-",	c #ABABAB",
-"'	c #A5A5A5",
-")	c #B2B2B2",
-"!	c #E1E1E1",
-"~	c #E0E0E0",
-"{	c #ACACAC",
-"]	c #B1B1B1",
-"^	c #E9E9E9",
-"/	c #E6E6E6",
-"(	c #D3D3D3",
-"_	c #E2E2E2",
-":	c #EDEDED",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@#$$$$$$%@@@@@@@",
-"@@@@@@@&*====-&@@@@@@@",
-"@@@@@@@;>,'')&@@@@@@@@",
-"@@@@@@@@!~{]^~@@@@@@@@",
-"@@@@@@@@@/(__@@@@@@@@@",
-"@@@@@@@@@@:/@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/menu-inactive.png b/light/xfwm4-compact/menu-inactive.png
deleted file mode 100644
index 48a434d5..00000000
Binary files a/light/xfwm4-compact/menu-inactive.png and /dev/null differ
diff --git a/light/xfwm4-compact/menu-inactive.xpm b/light/xfwm4-compact/menu-inactive.xpm
deleted file mode 100644
index 17aeff8f..00000000
--- a/light/xfwm4-compact/menu-inactive.xpm
+++ /dev/null
@@ -1,42 +0,0 @@
-/* XPM */
-static char * menu_inactive_xpm[] = {
-"22 18 21 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #C2C2C2",
-"$	c #B4B4B4",
-"%	c #C4C4C4",
-"&	c #E7E7E7",
-"*	c #CCCCCC",
-"=	c #CFCFCF",
-"-	c #DFDFDF",
-";	c #C9C9C9",
-">	c #C7C7C7",
-",	c #CDCDCD",
-"'	c #E9E9E9",
-")	c #E0E0E0",
-"!	c #E3E3E3",
-"~	c #CBCBCB",
-"{	c #DCDCDC",
-"]	c #E5E5E5",
-"^	c #E1E1E1",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@#$$$$$$%@@@@@@@",
-"@@@@@@@&*%%%%=&@@@@@@@",
-"@@@@@@@-&;>>,'@@@@@@@@",
-"@@@@@@@@)!~,&-@@@@@@@@",
-"@@@@@@@@@!{]^@@@@@@@@@",
-"@@@@@@@@@@&!@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/menu-prelight.png b/light/xfwm4-compact/menu-prelight.png
deleted file mode 120000
index b334d4fc..00000000
--- a/light/xfwm4-compact/menu-prelight.png
+++ /dev/null
@@ -1 +0,0 @@
-menu-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/menu-prelight.xpm b/light/xfwm4-compact/menu-prelight.xpm
deleted file mode 100644
index 04129c54..00000000
--- a/light/xfwm4-compact/menu-prelight.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */
-static char * menu_prelight_xpm[] = {
-"22 18 24 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #8C8C8C",
-"$	c #5E5E5E",
-"%	c #8F8F8F",
-"&	c #EAEAEA",
-"*	c #727272",
-"=	c #959595",
-"-	c #ECECEC",
-";	c #DFDFDF",
-">	c #E4E4E4",
-",	c #858585",
-"'	c #7C7C7C",
-")	c #E1E1E1",
-"!	c #D4D4D4",
-"~	c #888888",
-"{	c #E0E0E0",
-"]	c #E6E6E6",
-"^	c #BEBEBE",
-"/	c #D8D8D8",
-"(	c #E2E2E2",
-"_	c #EDEDED",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@#$$$$$$%@@@@@@@",
-"@@@@@@@&#****=-@@@@@@@",
-"@@@@@@@;>,''%&@@@@@@@@",
-"@@@@@@@@)!~%>{@@@@@@@@",
-"@@@@@@@@@]^/(@@@@@@@@@",
-"@@@@@@@@@@_]@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/menu-pressed.png b/light/xfwm4-compact/menu-pressed.png
deleted file mode 120000
index b334d4fc..00000000
--- a/light/xfwm4-compact/menu-pressed.png
+++ /dev/null
@@ -1 +0,0 @@
-menu-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/menu-pressed.xpm b/light/xfwm4-compact/menu-pressed.xpm
deleted file mode 100644
index 2dc5d400..00000000
--- a/light/xfwm4-compact/menu-pressed.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"22 18 4 1",
-" 	c #939393",
-".	c #FFFFFF",
-"+	c #DEDEDE s active_color_2",
-"@	c #84A8C3 s active_color_1",
-"                      ",
-"......................",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"+++++++@@@@@@@@+++++++",
-"++++++++@@@@@@++++++++",
-"+++++++++@@@@+++++++++",
-"++++++++++@@++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++",
-"++++++++++++++++++++++"};
diff --git a/light/xfwm4-compact/right-active.xpm b/light/xfwm4-compact/right-active.xpm
deleted file mode 100644
index 5b15e1e5..00000000
--- a/light/xfwm4-compact/right-active.xpm
+++ /dev/null
@@ -1,7 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"2 1 3 1",
-" 	c None",
-".	c #DEDEDE s active_color_2",
-"+	c #939393",
-".+"};
diff --git a/light/xfwm4-compact/right-inactive.xpm b/light/xfwm4-compact/right-inactive.xpm
deleted file mode 120000
index 6734f48a..00000000
--- a/light/xfwm4-compact/right-inactive.xpm
+++ /dev/null
@@ -1 +0,0 @@
-right-active.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/shade-active.png b/light/xfwm4-compact/shade-active.png
deleted file mode 100644
index 2d5b24eb..00000000
Binary files a/light/xfwm4-compact/shade-active.png and /dev/null differ
diff --git a/light/xfwm4-compact/shade-active.xpm b/light/xfwm4-compact/shade-active.xpm
deleted file mode 100644
index db813dc2..00000000
--- a/light/xfwm4-compact/shade-active.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * shade_active_xpm[] = {
-"22 18 13 1",
-" 	c None",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #ABABAB",
-"$	c #B0B0B0",
-"%	c #A4A4A4",
-"&	c #B1B1B1",
-"*	c #9E9E9E",
-"=	c #B6B6B6",
-"-	c #A8A8A8",
-";	c #898989",
-">	c #EAEAEA",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@#$@@@@@@@@@@",
-"@@@@@@@@@#%%&@@@@@@@@@",
-"@@@@@@@@$*==*=@@@@@@@@",
-"@@@@@@@-;#>>#;#@@@@@@@",
-"@@@@@@@>>>@@>>>@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/shade-inactive.png b/light/xfwm4-compact/shade-inactive.png
deleted file mode 100644
index 924700fb..00000000
Binary files a/light/xfwm4-compact/shade-inactive.png and /dev/null differ
diff --git a/light/xfwm4-compact/shade-inactive.xpm b/light/xfwm4-compact/shade-inactive.xpm
deleted file mode 100644
index 5ae4fad3..00000000
--- a/light/xfwm4-compact/shade-inactive.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * shade_inactive_xpm[] = {
-"22 18 14 1",
-" 	c None",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #CACACA",
-"$	c #CCCCCC",
-"%	c #C9C9C9",
-"&	c #C6C6C6",
-"*	c #CDCDCD",
-"=	c #C4C4C4",
-"-	c #CFCFCF",
-";	c #B5B5B5",
-">	c #C5C5C5",
-",	c #EAEAEA",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@#$@@@@@@@@@@",
-"@@@@@@@@@%&&*@@@@@@@@@",
-"@@@@@@@@$=--=-@@@@@@@@",
-"@@@@@@@=;>,,>;>@@@@@@@",
-"@@@@@@@,,,@@,,,@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/shade-prelight.png b/light/xfwm4-compact/shade-prelight.png
deleted file mode 120000
index 41584517..00000000
--- a/light/xfwm4-compact/shade-prelight.png
+++ /dev/null
@@ -1 +0,0 @@
-shade-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/shade-prelight.xpm b/light/xfwm4-compact/shade-prelight.xpm
deleted file mode 100644
index fd35aab8..00000000
--- a/light/xfwm4-compact/shade-prelight.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char * shade_prelight_xpm[] = {
-"22 18 14 1",
-" 	c None",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #878787",
-"$	c #8E8E8E",
-"%	c #848484",
-"&	c #7C7C7C",
-"*	c #8C8C8C",
-"=	c #727272",
-"-	c #959595",
-";	c #5E5E5E",
-">	c #EAEAEA",
-",	c #909090",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@#$@@@@@@@@@@",
-"@@@@@@@@@%&&$@@@@@@@@@",
-"@@@@@@@@*=*-=-@@@@@@@@",
-"@@@@@@@*;*>>,;,@@@@@@@",
-"@@@@@@@>>>@@>>>@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/shade-pressed.png b/light/xfwm4-compact/shade-pressed.png
deleted file mode 120000
index 41584517..00000000
--- a/light/xfwm4-compact/shade-pressed.png
+++ /dev/null
@@ -1 +0,0 @@
-shade-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/shade-pressed.xpm b/light/xfwm4-compact/shade-pressed.xpm
deleted file mode 100644
index 01f99500..00000000
--- a/light/xfwm4-compact/shade-pressed.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * shade_pressed_xpm[] = {
-"22 18 4 1",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #70A2C8 s active_color_1",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@##@@@@@@@@@@",
-"@@@@@@@@@####@@@@@@@@@",
-"@@@@@@@@######@@@@@@@@",
-"@@@@@@@###@@###@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/shade-toggled-active.png b/light/xfwm4-compact/shade-toggled-active.png
deleted file mode 100644
index 72a7c6f0..00000000
Binary files a/light/xfwm4-compact/shade-toggled-active.png and /dev/null differ
diff --git a/light/xfwm4-compact/shade-toggled-active.xpm b/light/xfwm4-compact/shade-toggled-active.xpm
deleted file mode 100644
index 96152697..00000000
--- a/light/xfwm4-compact/shade-toggled-active.xpm
+++ /dev/null
@@ -1,39 +0,0 @@
-/* XPM */
-static char * shade_toggled_active_xpm[] = {
-"22 18 18 1",
-" 	c None",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #A8A8A8",
-"$	c #898989",
-"%	c #B1B1B1",
-"&	c #ABABAB",
-"*	c #ECECEC",
-"=	c #B0B0B0",
-"-	c #9E9E9E",
-";	c #B6B6B6",
-">	c #E9E9E9",
-",	c #A4A4A4",
-"'	c #EBEBEB",
-")	c #E1E1E1",
-"!	c #E0E0E0",
-"~	c #E5E5E5",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@#$%@@%$&@@@@@@@",
-"@@@@@@@*=-%%-;*@@@@@@@",
-"@@@@@@@@>&,,%'@@@@@@@@",
-"@@@@@@@@)!&=>@@@@@@@@@",
-"@@@@@@@@@~~))@@@@@@@@@",
-"@@@@@@@@@@*~@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/shade-toggled-inactive.png b/light/xfwm4-compact/shade-toggled-inactive.png
deleted file mode 100644
index 97d56a93..00000000
Binary files a/light/xfwm4-compact/shade-toggled-inactive.png and /dev/null differ
diff --git a/light/xfwm4-compact/shade-toggled-inactive.xpm b/light/xfwm4-compact/shade-toggled-inactive.xpm
deleted file mode 100644
index 9962eb6d..00000000
--- a/light/xfwm4-compact/shade-toggled-inactive.xpm
+++ /dev/null
@@ -1,43 +0,0 @@
-/* XPM */
-static char * shade_toggled_inactive_xpm[] = {
-"22 18 22 1",
-" 	c None",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #C4C4C4",
-"$	c #B5B5B5",
-"%	c #C5C5C5",
-"&	c #E7E7E7",
-"*	c #CCCCCC",
-"=	c #CFCFCF",
-"-	c #E6E6E6",
-";	c #C9C9C9",
-">	c #C6C6C6",
-",	c #CDCDCD",
-"'	c #E8E8E8",
-")	c #E0E0E0",
-"!	c #E3E3E3",
-"~	c #CACACA",
-"{	c #DFDFDF",
-"]	c #E2E2E2",
-"^	c #DBDBDB",
-"/	c #E4E4E4",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@#$%@@%$%@@@@@@@",
-"@@@@@@@&*#==#=&@@@@@@@",
-"@@@@@@@@-;>>,'@@@@@@@@",
-"@@@@@@@@)!~*-{@@@@@@@@",
-"@@@@@@@@@]^/{@@@@@@@@@",
-"@@@@@@@@@@-]@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/shade-toggled-prelight.png b/light/xfwm4-compact/shade-toggled-prelight.png
deleted file mode 120000
index f5e2b83c..00000000
--- a/light/xfwm4-compact/shade-toggled-prelight.png
+++ /dev/null
@@ -1 +0,0 @@
-shade-toggled-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/shade-toggled-prelight.xpm b/light/xfwm4-compact/shade-toggled-prelight.xpm
deleted file mode 100644
index 0814b831..00000000
--- a/light/xfwm4-compact/shade-toggled-prelight.xpm
+++ /dev/null
@@ -1,44 +0,0 @@
-/* XPM */
-static char * shade_toggled_prelight_xpm[] = {
-"22 18 23 1",
-" 	c None",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #8C8C8C",
-"$	c #5E5E5E",
-"%	c #909090",
-"&	c #EAEAEA",
-"*	c #727272",
-"=	c #959595",
-"-	c #ECECEC",
-";	c #E4E4E4",
-">	c #848484",
-",	c #7C7C7C",
-"'	c #8E8E8E",
-")	c #E1E1E1",
-"!	c #D4D4D4",
-"~	c #878787",
-"{	c #E3E3E3",
-"]	c #DFDFDF",
-"^	c #E5E5E5",
-"/	c #BDBDBD",
-"(	c #D8D8D8",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@#$%@@%$%@@@@@@@",
-"@@@@@@@&#*%%*=-@@@@@@@",
-"@@@@@@@@;>,,'&@@@@@@@@",
-"@@@@@@@@)!~'{]@@@@@@@@",
-"@@@@@@@@@^/()@@@@@@@@@",
-"@@@@@@@@@@-^@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/shade-toggled-pressed.png b/light/xfwm4-compact/shade-toggled-pressed.png
deleted file mode 120000
index f5e2b83c..00000000
--- a/light/xfwm4-compact/shade-toggled-pressed.png
+++ /dev/null
@@ -1 +0,0 @@
-shade-toggled-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/shade-toggled-pressed.xpm b/light/xfwm4-compact/shade-toggled-pressed.xpm
deleted file mode 100644
index 2b622137..00000000
--- a/light/xfwm4-compact/shade-toggled-pressed.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"22 18 4 1",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"$	c #669BC3 s active_color_1",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@$$$@@$$$@@@@@@@",
-"@@@@@@@@$$$$$$@@@@@@@@",
-"@@@@@@@@@$$$$@@@@@@@@@",
-"@@@@@@@@@@$$@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/stick-active.png b/light/xfwm4-compact/stick-active.png
deleted file mode 100644
index 1e687b76..00000000
Binary files a/light/xfwm4-compact/stick-active.png and /dev/null differ
diff --git a/light/xfwm4-compact/stick-active.xpm b/light/xfwm4-compact/stick-active.xpm
deleted file mode 100644
index f066cf6d..00000000
--- a/light/xfwm4-compact/stick-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * stick_active_xpm[] = {
-"22 18 12 1",
-" 	c None",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #888888",
-"$	c #8C8C8C",
-"%	c #9F9F9F",
-"&	c #ECECEC",
-"*	c #A2A2A2",
-"=	c #A5A5A5",
-"-	c #ACACAC",
-";	c #B1B1B1",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@####@@@@@@@@@",
-"@@@@@@@@$$$$$$@@@@@@@@",
-"@@@@@@@%%&&&&%%@@@@@@@",
-"@@@@@@@**@@@@**@@@@@@@",
-"@@@@@@@==@@@@==@@@@@@@",
-"@@@@@@@==@@@@==@@@@@@@",
-"@@@@@@@&------&@@@@@@@",
-"@@@@@@@@&;;;;&@@@@@@@@",
-"@@@@@@@@@&&&&@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/stick-inactive.png b/light/xfwm4-compact/stick-inactive.png
deleted file mode 100644
index 97e044f4..00000000
Binary files a/light/xfwm4-compact/stick-inactive.png and /dev/null differ
diff --git a/light/xfwm4-compact/stick-inactive.xpm b/light/xfwm4-compact/stick-inactive.xpm
deleted file mode 100644
index 91d6016b..00000000
--- a/light/xfwm4-compact/stick-inactive.xpm
+++ /dev/null
@@ -1,45 +0,0 @@
-/* XPM */
-static char * stick_inactive_xpm[] = {
-"22 18 24 1",
-" 	c None",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #BCBCBC",
-"$	c #BCBDBD",
-"%	c #BCBDBC",
-"&	c #BDBCBC",
-"*	c #BFBFC0",
-"=	c #C0C0BF",
-"-	c #ECECEC",
-";	c #BFC0C0",
-">	c #BFBFBF",
-",	c #C2C2C2",
-"'	c #C3C2C2",
-")	c #C5C5C5",
-"!	c #C5C5C6",
-"~	c #C9C9C8",
-"{	c #C8C9C8",
-"]	c #C8C8C8",
-"^	c #C9C8C8",
-"/	c #CBCCCB",
-"(	c #CBCBCB",
-"_	c #CECECE",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@####@@@@@@@@@",
-"@@@@@@@@$%#%&#@@@@@@@@",
-"@@@@@@@*=----;>@@@@@@@",
-"@@@@@@@,,@@@@''@@@@@@@",
-"@@@@@@@)!@@@@!!@@@@@@@",
-"@@@@@@@~{@@@@]^@@@@@@@",
-"@@@@@@@-//(((/-@@@@@@@",
-"@@@@@@@@-____-@@@@@@@@",
-"@@@@@@@@@----@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/stick-prelight.png b/light/xfwm4-compact/stick-prelight.png
deleted file mode 120000
index b93b327c..00000000
--- a/light/xfwm4-compact/stick-prelight.png
+++ /dev/null
@@ -1 +0,0 @@
-stick-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/stick-prelight.xpm b/light/xfwm4-compact/stick-prelight.xpm
deleted file mode 100644
index 8134b3e5..00000000
--- a/light/xfwm4-compact/stick-prelight.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * stick_prelight_xpm[] = {
-"22 18 10 1",
-" 	c None",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #707070",
-"$	c #ECECEC",
-"%	c #767676",
-"&	c #7A7A7A",
-"*	c #7E7E7E",
-"=	c #868686",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@####@@@@@@@@@",
-"@@@@@@@@######@@@@@@@@",
-"@@@@@@@##$$$$##@@@@@@@",
-"@@@@@@@%%@@@@%%@@@@@@@",
-"@@@@@@@&&@@@@&&@@@@@@@",
-"@@@@@@@**@@@@**@@@@@@@",
-"@@@@@@@$======$@@@@@@@",
-"@@@@@@@@$====$@@@@@@@@",
-"@@@@@@@@@$$$$@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/stick-pressed.png b/light/xfwm4-compact/stick-pressed.png
deleted file mode 120000
index b93b327c..00000000
--- a/light/xfwm4-compact/stick-pressed.png
+++ /dev/null
@@ -1 +0,0 @@
-stick-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/stick-pressed.xpm b/light/xfwm4-compact/stick-pressed.xpm
deleted file mode 100644
index 8966a748..00000000
--- a/light/xfwm4-compact/stick-pressed.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * stick_pressed_xpm[] = {
-"22 18 4 1",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #5189B5 s active_color_1",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@####@@@@@@@@@",
-"@@@@@@@@######@@@@@@@@",
-"@@@@@@@##@@@@##@@@@@@@",
-"@@@@@@@##@@@@##@@@@@@@",
-"@@@@@@@##@@@@##@@@@@@@",
-"@@@@@@@##@@@@##@@@@@@@",
-"@@@@@@@@######@@@@@@@@",
-"@@@@@@@@@####@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/stick-toggled-active.png b/light/xfwm4-compact/stick-toggled-active.png
deleted file mode 100644
index a4e19fc4..00000000
Binary files a/light/xfwm4-compact/stick-toggled-active.png and /dev/null differ
diff --git a/light/xfwm4-compact/stick-toggled-active.xpm b/light/xfwm4-compact/stick-toggled-active.xpm
deleted file mode 100644
index 6333c042..00000000
--- a/light/xfwm4-compact/stick-toggled-active.xpm
+++ /dev/null
@@ -1,33 +0,0 @@
-/* XPM */
-static char * stick_toggled_active_xpm[] = {
-"22 18 12 1",
-" 	c None",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #888888",
-"$	c #8C8C8C",
-"%	c #9F9F9F",
-"&	c #ECECEC",
-"*	c #A2A2A2",
-"=	c #A5A5A5",
-"-	c #ACACAC",
-";	c #B1B1B1",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@#@@@@@@@@",
-"@@@@@@@@@##@@##@@@@@@@",
-"@@@@@@@@$$$@$$$$@@@@@@",
-"@@@@@@@%%&&@%%&&@@@@@@",
-"@@@@@@@**@@*&&@@@@@@@@",
-"@@@@@@@==@@&@==@@@@@@@",
-"@@@@@@@==@@@@==@@@@@@@",
-"@@@@@@@&------&@@@@@@@",
-"@@@@@@@@&;;;;&@@@@@@@@",
-"@@@@@@@@@&&&&@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/stick-toggled-inactive.png b/light/xfwm4-compact/stick-toggled-inactive.png
deleted file mode 100644
index 93f987a5..00000000
Binary files a/light/xfwm4-compact/stick-toggled-inactive.png and /dev/null differ
diff --git a/light/xfwm4-compact/stick-toggled-inactive.xpm b/light/xfwm4-compact/stick-toggled-inactive.xpm
deleted file mode 100644
index ec894c69..00000000
--- a/light/xfwm4-compact/stick-toggled-inactive.xpm
+++ /dev/null
@@ -1,41 +0,0 @@
-/* XPM */
-static char * stick_toggled_inactive_xpm[] = {
-"22 18 20 1",
-" 	c None",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #BCBCBC",
-"$	c #BCBDBD",
-"%	c #BCBDBC",
-"&	c #BFBFC0",
-"*	c #C0C0BF",
-"=	c #ECECEC",
-"-	c #C2C2C2",
-";	c #C5C5C5",
-">	c #C5C5C6",
-",	c #C9C9C8",
-"'	c #C8C9C8",
-")	c #C8C8C8",
-"!	c #C9C8C8",
-"~	c #CBCCCB",
-"{	c #CBCBCB",
-"]	c #CECECE",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@#@@@@@@@@",
-"@@@@@@@@@##@@##@@@@@@@",
-"@@@@@@@@$%#@%%%%@@@@@@",
-"@@@@@@@&*==@**==@@@@@@",
-"@@@@@@@--@@-==@@@@@@@@",
-"@@@@@@@;>@@=@>>@@@@@@@",
-"@@@@@@@,'@@@@)!@@@@@@@",
-"@@@@@@@=~~{{{~=@@@@@@@",
-"@@@@@@@@=]]]]=@@@@@@@@",
-"@@@@@@@@@====@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/stick-toggled-prelight.png b/light/xfwm4-compact/stick-toggled-prelight.png
deleted file mode 120000
index 67bce619..00000000
--- a/light/xfwm4-compact/stick-toggled-prelight.png
+++ /dev/null
@@ -1 +0,0 @@
-stick-toggled-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/stick-toggled-prelight.xpm b/light/xfwm4-compact/stick-toggled-prelight.xpm
deleted file mode 100644
index c59921b6..00000000
--- a/light/xfwm4-compact/stick-toggled-prelight.xpm
+++ /dev/null
@@ -1,31 +0,0 @@
-/* XPM */
-static char * stick_toggled_prelight_xpm[] = {
-"22 18 10 1",
-" 	c None",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"#	c #707070",
-"$	c #ECECEC",
-"%	c #767676",
-"&	c #7A7A7A",
-"*	c #7E7E7E",
-"=	c #868686",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@#@@@@@@@@",
-"@@@@@@@@@##@@##@@@@@@@",
-"@@@@@@@@###@####@@@@@@",
-"@@@@@@@##$$@##$$@@@@@@",
-"@@@@@@@%%@@%$$@@@@@@@@",
-"@@@@@@@&&@@$@&&@@@@@@@",
-"@@@@@@@**@@@@**@@@@@@@",
-"@@@@@@@$======$@@@@@@@",
-"@@@@@@@@$====$@@@@@@@@",
-"@@@@@@@@@$$$$@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/stick-toggled-pressed.png b/light/xfwm4-compact/stick-toggled-pressed.png
deleted file mode 120000
index 67bce619..00000000
--- a/light/xfwm4-compact/stick-toggled-pressed.png
+++ /dev/null
@@ -1 +0,0 @@
-stick-toggled-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/stick-toggled-pressed.xpm b/light/xfwm4-compact/stick-toggled-pressed.xpm
deleted file mode 100644
index 26ae5d58..00000000
--- a/light/xfwm4-compact/stick-toggled-pressed.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"22 18 4 1",
-".	c #8D8D8D",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"-	c #5189B5 s active_color_1",
-"......................",
-"++++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@-@@@@@@@@",
-"@@@@@@@@@--@@--@@@@@@@",
-"@@@@@@@@---@----@@@@@@",
-"@@@@@@@--@@@--@@@@@@@@",
-"@@@@@@@--@@-@@@@@@@@@@",
-"@@@@@@@--@@@@--@@@@@@@",
-"@@@@@@@--@@@@--@@@@@@@",
-"@@@@@@@@------@@@@@@@@",
-"@@@@@@@@@----@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/light/xfwm4-compact/themerc b/light/xfwm4-compact/themerc
deleted file mode 100644
index 56b58b98..00000000
--- a/light/xfwm4-compact/themerc
+++ /dev/null
@@ -1,22 +0,0 @@
-# Author: Simon Steinbeiß <simon.steinbeiss@elfenbeinturm.at>
-# Author of original metacity theme: elementart Art Team
-# Compact Greybird theme for xfwm4 using GTK color pickup.
-# License: GPL
-# Date: July 2011
-
-active_text_color=#6f6f6f
-active_text_shadow_color=#efefef
-inactive_text_color=#9c9c9c
-inactive_text_shadow_color=#f7f7f7
-title_shadow_active=true
-title_shadow_inactive=true
-full_width_title=true
-title_vertical_offset_active=2
-title_vertical_offset_inactive=2
-button_offset=3
-button_spacing=0
-shadow_delta_height=2
-shadow_delta_width=0
-shadow_delta_x=0
-shadow_delta_y=-8
-shadow_opacity=50
diff --git a/light/xfwm4-compact/title-1-active.png b/light/xfwm4-compact/title-1-active.png
deleted file mode 100644
index eb2d7a72..00000000
Binary files a/light/xfwm4-compact/title-1-active.png and /dev/null differ
diff --git a/light/xfwm4-compact/title-1-active.xpm b/light/xfwm4-compact/title-1-active.xpm
deleted file mode 100644
index 518d5728..00000000
--- a/light/xfwm4-compact/title-1-active.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * title_1_active_xpm[] = {
-"2 18 4 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/light/xfwm4-compact/title-1-inactive.png b/light/xfwm4-compact/title-1-inactive.png
deleted file mode 100644
index c4692240..00000000
Binary files a/light/xfwm4-compact/title-1-inactive.png and /dev/null differ
diff --git a/light/xfwm4-compact/title-1-inactive.xpm b/light/xfwm4-compact/title-1-inactive.xpm
deleted file mode 100644
index 0990ef80..00000000
--- a/light/xfwm4-compact/title-1-inactive.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * title_1_inactive_xpm[] = {
-"2 18 4 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"..",
-"++",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@",
-"@@"};
diff --git a/light/xfwm4-compact/title-2-active.png b/light/xfwm4-compact/title-2-active.png
deleted file mode 120000
index b4aa42bc..00000000
--- a/light/xfwm4-compact/title-2-active.png
+++ /dev/null
@@ -1 +0,0 @@
-title-1-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-2-active.xpm b/light/xfwm4-compact/title-2-active.xpm
deleted file mode 120000
index def55f78..00000000
--- a/light/xfwm4-compact/title-2-active.xpm
+++ /dev/null
@@ -1 +0,0 @@
-title-1-active.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-2-inactive.png b/light/xfwm4-compact/title-2-inactive.png
deleted file mode 120000
index 6cd87130..00000000
--- a/light/xfwm4-compact/title-2-inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-title-1-inactive.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-2-inactive.xpm b/light/xfwm4-compact/title-2-inactive.xpm
deleted file mode 120000
index b5c58ae0..00000000
--- a/light/xfwm4-compact/title-2-inactive.xpm
+++ /dev/null
@@ -1 +0,0 @@
-title-1-inactive.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-3-active.png b/light/xfwm4-compact/title-3-active.png
deleted file mode 120000
index b4aa42bc..00000000
--- a/light/xfwm4-compact/title-3-active.png
+++ /dev/null
@@ -1 +0,0 @@
-title-1-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-3-active.xpm b/light/xfwm4-compact/title-3-active.xpm
deleted file mode 120000
index def55f78..00000000
--- a/light/xfwm4-compact/title-3-active.xpm
+++ /dev/null
@@ -1 +0,0 @@
-title-1-active.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-3-inactive.png b/light/xfwm4-compact/title-3-inactive.png
deleted file mode 120000
index 6cd87130..00000000
--- a/light/xfwm4-compact/title-3-inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-title-1-inactive.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-3-inactive.xpm b/light/xfwm4-compact/title-3-inactive.xpm
deleted file mode 120000
index b5c58ae0..00000000
--- a/light/xfwm4-compact/title-3-inactive.xpm
+++ /dev/null
@@ -1 +0,0 @@
-title-1-inactive.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-4-active.png b/light/xfwm4-compact/title-4-active.png
deleted file mode 120000
index b4aa42bc..00000000
--- a/light/xfwm4-compact/title-4-active.png
+++ /dev/null
@@ -1 +0,0 @@
-title-1-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-4-active.xpm b/light/xfwm4-compact/title-4-active.xpm
deleted file mode 120000
index def55f78..00000000
--- a/light/xfwm4-compact/title-4-active.xpm
+++ /dev/null
@@ -1 +0,0 @@
-title-1-active.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-4-inactive.png b/light/xfwm4-compact/title-4-inactive.png
deleted file mode 120000
index 6cd87130..00000000
--- a/light/xfwm4-compact/title-4-inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-title-1-inactive.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-4-inactive.xpm b/light/xfwm4-compact/title-4-inactive.xpm
deleted file mode 120000
index b5c58ae0..00000000
--- a/light/xfwm4-compact/title-4-inactive.xpm
+++ /dev/null
@@ -1 +0,0 @@
-title-1-inactive.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-5-active.png b/light/xfwm4-compact/title-5-active.png
deleted file mode 120000
index b4aa42bc..00000000
--- a/light/xfwm4-compact/title-5-active.png
+++ /dev/null
@@ -1 +0,0 @@
-title-1-active.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-5-active.xpm b/light/xfwm4-compact/title-5-active.xpm
deleted file mode 120000
index def55f78..00000000
--- a/light/xfwm4-compact/title-5-active.xpm
+++ /dev/null
@@ -1 +0,0 @@
-title-1-active.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-5-inactive.png b/light/xfwm4-compact/title-5-inactive.png
deleted file mode 120000
index 6cd87130..00000000
--- a/light/xfwm4-compact/title-5-inactive.png
+++ /dev/null
@@ -1 +0,0 @@
-title-1-inactive.png
\ No newline at end of file
diff --git a/light/xfwm4-compact/title-5-inactive.xpm b/light/xfwm4-compact/title-5-inactive.xpm
deleted file mode 120000
index b5c58ae0..00000000
--- a/light/xfwm4-compact/title-5-inactive.xpm
+++ /dev/null
@@ -1 +0,0 @@
-title-1-inactive.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/top-left-active.png b/light/xfwm4-compact/top-left-active.png
deleted file mode 100644
index 23113665..00000000
Binary files a/light/xfwm4-compact/top-left-active.png and /dev/null differ
diff --git a/light/xfwm4-compact/top-left-active.xpm b/light/xfwm4-compact/top-left-active.xpm
deleted file mode 100644
index 711379c1..00000000
--- a/light/xfwm4-compact/top-left-active.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * top_left_inactive_xpm[] = {
-"8 18 4 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"     ...",
-"   ..+++",
-"  .@@@@@",
-" .@@@@@@",
-" .@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@",
-".@@@@@@@"};
diff --git a/light/xfwm4-compact/top-left-inactive.png b/light/xfwm4-compact/top-left-inactive.png
deleted file mode 100644
index bb6c6941..00000000
Binary files a/light/xfwm4-compact/top-left-inactive.png and /dev/null differ
diff --git a/light/xfwm4-compact/top-left-inactive.xpm b/light/xfwm4-compact/top-left-inactive.xpm
deleted file mode 120000
index fcdd4164..00000000
--- a/light/xfwm4-compact/top-left-inactive.xpm
+++ /dev/null
@@ -1 +0,0 @@
-./top-left-active.xpm
\ No newline at end of file
diff --git a/light/xfwm4-compact/top-right-active.png b/light/xfwm4-compact/top-right-active.png
deleted file mode 100644
index 844f3ecf..00000000
Binary files a/light/xfwm4-compact/top-right-active.png and /dev/null differ
diff --git a/light/xfwm4-compact/top-right-active.xpm b/light/xfwm4-compact/top-right-active.xpm
deleted file mode 100644
index f13cd1d2..00000000
--- a/light/xfwm4-compact/top-right-active.xpm
+++ /dev/null
@@ -1,25 +0,0 @@
-/* XPM */
-static char * top_right_active_xpm[] = {
-"8 18 4 1",
-" 	c None",
-".	c #939393",
-"+	c #FFFFFF",
-"@	c #DEDEDE s active_color_2",
-"...     ",
-"+++..   ",
-"@@@@@.  ",
-"@@@@@@. ",
-"@@@@@@. ",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@.",
-"@@@@@@@."};
diff --git a/light/xfwm4-compact/top-right-inactive.png b/light/xfwm4-compact/top-right-inactive.png
deleted file mode 100644
index 636ecd02..00000000
Binary files a/light/xfwm4-compact/top-right-inactive.png and /dev/null differ
diff --git a/light/xfwm4-compact/top-right-inactive.xpm b/light/xfwm4-compact/top-right-inactive.xpm
deleted file mode 120000
index 79e7d7fd..00000000
--- a/light/xfwm4-compact/top-right-inactive.xpm
+++ /dev/null
@@ -1 +0,0 @@
-./top-right-active.xpm
\ No newline at end of file