diff --git a/index.theme b/index.theme
index d0ee6fd..e8a634a 100644
--- a/index.theme
+++ b/index.theme
@@ -5,6 +5,6 @@ Comment=Low contrast and simple light theme
Encoding=UTF-8
[X-GNOME-Metatheme]
-GtkTheme=Numix
-MetacityTheme=Numix
+GtkTheme=numix-gtk-theme
+MetacityTheme=numix-gtk-theme
ButtonLayout=:minimize,maximize,close
diff --git a/metacity-1/close_focused_normal.png b/metacity-1/close_focused_normal.png
index 4960002..6608e95 100644
Binary files a/metacity-1/close_focused_normal.png and b/metacity-1/close_focused_normal.png differ
diff --git a/metacity-1/close_focused_prelight.png b/metacity-1/close_focused_prelight.png
index 1ffcb90..980a80e 100644
Binary files a/metacity-1/close_focused_prelight.png and b/metacity-1/close_focused_prelight.png differ
diff --git a/metacity-1/close_focused_pressed.png b/metacity-1/close_focused_pressed.png
index 2462879..e2d55a2 100644
Binary files a/metacity-1/close_focused_pressed.png and b/metacity-1/close_focused_pressed.png differ
diff --git a/metacity-1/close_unfocused.png b/metacity-1/close_unfocused.png
index 327ecb2..7320bd6 100644
Binary files a/metacity-1/close_unfocused.png and b/metacity-1/close_unfocused.png differ
diff --git a/metacity-1/close_unfocused_prelight.png b/metacity-1/close_unfocused_prelight.png
index b2cf727..980a80e 100644
Binary files a/metacity-1/close_unfocused_prelight.png and b/metacity-1/close_unfocused_prelight.png differ
diff --git a/metacity-1/close_unfocused_pressed.png b/metacity-1/close_unfocused_pressed.png
index a1a54fc..7e20728 100644
Binary files a/metacity-1/close_unfocused_pressed.png and b/metacity-1/close_unfocused_pressed.png differ
diff --git a/metacity-1/maximize_focused_normal.png b/metacity-1/maximize_focused_normal.png
index 09f7f22..a329af9 100644
Binary files a/metacity-1/maximize_focused_normal.png and b/metacity-1/maximize_focused_normal.png differ
diff --git a/metacity-1/maximize_focused_prelight.png b/metacity-1/maximize_focused_prelight.png
index 64a751b..3a51c72 100644
Binary files a/metacity-1/maximize_focused_prelight.png and b/metacity-1/maximize_focused_prelight.png differ
diff --git a/metacity-1/maximize_focused_pressed.png b/metacity-1/maximize_focused_pressed.png
index 11607d4..2b4dad5 100644
Binary files a/metacity-1/maximize_focused_pressed.png and b/metacity-1/maximize_focused_pressed.png differ
diff --git a/metacity-1/maximize_unfocused.png b/metacity-1/maximize_unfocused.png
index 1cdace9..357924e 100644
Binary files a/metacity-1/maximize_unfocused.png and b/metacity-1/maximize_unfocused.png differ
diff --git a/metacity-1/maximize_unfocused_prelight.png b/metacity-1/maximize_unfocused_prelight.png
index 5c25cfc..3a51c72 100644
Binary files a/metacity-1/maximize_unfocused_prelight.png and b/metacity-1/maximize_unfocused_prelight.png differ
diff --git a/metacity-1/maximize_unfocused_pressed.png b/metacity-1/maximize_unfocused_pressed.png
index 5080918..2b4dad5 100644
Binary files a/metacity-1/maximize_unfocused_pressed.png and b/metacity-1/maximize_unfocused_pressed.png differ
diff --git a/metacity-1/minimize_focused_normal.png b/metacity-1/minimize_focused_normal.png
index 7f65fd4..865ee9c 100644
Binary files a/metacity-1/minimize_focused_normal.png and b/metacity-1/minimize_focused_normal.png differ
diff --git a/metacity-1/minimize_focused_prelight.png b/metacity-1/minimize_focused_prelight.png
index 39a8029..2e86e18 100644
Binary files a/metacity-1/minimize_focused_prelight.png and b/metacity-1/minimize_focused_prelight.png differ
diff --git a/metacity-1/minimize_focused_pressed.png b/metacity-1/minimize_focused_pressed.png
index 4f6c01b..b7a3aca 100644
Binary files a/metacity-1/minimize_focused_pressed.png and b/metacity-1/minimize_focused_pressed.png differ
diff --git a/metacity-1/minimize_unfocused.png b/metacity-1/minimize_unfocused.png
index 18c0168..40de23e 100644
Binary files a/metacity-1/minimize_unfocused.png and b/metacity-1/minimize_unfocused.png differ
diff --git a/metacity-1/minimize_unfocused_prelight.png b/metacity-1/minimize_unfocused_prelight.png
index a7a4b97..2e86e18 100644
Binary files a/metacity-1/minimize_unfocused_prelight.png and b/metacity-1/minimize_unfocused_prelight.png differ
diff --git a/metacity-1/minimize_unfocused_pressed.png b/metacity-1/minimize_unfocused_pressed.png
index c5c202b..b7a3aca 100644
Binary files a/metacity-1/minimize_unfocused_pressed.png and b/metacity-1/minimize_unfocused_pressed.png differ
diff --git a/metacity-1/unmaximize_focused_normal.png b/metacity-1/unmaximize_focused_normal.png
index 30969e6..1557fa8 100644
Binary files a/metacity-1/unmaximize_focused_normal.png and b/metacity-1/unmaximize_focused_normal.png differ
diff --git a/metacity-1/unmaximize_focused_prelight.png b/metacity-1/unmaximize_focused_prelight.png
index 955d89d..f27f67d 100644
Binary files a/metacity-1/unmaximize_focused_prelight.png and b/metacity-1/unmaximize_focused_prelight.png differ
diff --git a/metacity-1/unmaximize_focused_pressed.png b/metacity-1/unmaximize_focused_pressed.png
index c32144e..a132c2f 100644
Binary files a/metacity-1/unmaximize_focused_pressed.png and b/metacity-1/unmaximize_focused_pressed.png differ
diff --git a/metacity-1/unmaximize_unfocused.png b/metacity-1/unmaximize_unfocused.png
index 82d4692..68649d6 100644
Binary files a/metacity-1/unmaximize_unfocused.png and b/metacity-1/unmaximize_unfocused.png differ
diff --git a/metacity-1/unmaximize_unfocused_prelight.png b/metacity-1/unmaximize_unfocused_prelight.png
index de19f52..f27f67d 100644
Binary files a/metacity-1/unmaximize_unfocused_prelight.png and b/metacity-1/unmaximize_unfocused_prelight.png differ
diff --git a/metacity-1/unmaximize_unfocused_pressed.png b/metacity-1/unmaximize_unfocused_pressed.png
index d1b3224..a132c2f 100644
Binary files a/metacity-1/unmaximize_unfocused_pressed.png and b/metacity-1/unmaximize_unfocused_pressed.png differ
diff --git a/svg-sources/export-png b/svg-sources/export-png
deleted file mode 100755
index af5a5f0..0000000
--- a/svg-sources/export-png
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-install_path=$HOME"/.themes/numix-gtk-theme/"
-source_dir="gtk-3.0/assets"
-target_dir=$install_path"gtk-3.0/assets/"
-
-cd $source_dir;
-for i in *;
-do inkscape $i --export-png=`echo $target_dir$i | sed -e 's/svg$/png/'`;
-echo $target_dir$i;
-done
-
diff --git a/svg-sources/gtk-3.0/assets/checkbox-checked-insensitive.svg b/svg-sources/gtk-3.0/assets/checkbox-checked-insensitive.svg
deleted file mode 100644
index f3ef9fa..0000000
--- a/svg-sources/gtk-3.0/assets/checkbox-checked-insensitive.svg
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/checkbox-checked.svg b/svg-sources/gtk-3.0/assets/checkbox-checked.svg
deleted file mode 100644
index 98104e2..0000000
--- a/svg-sources/gtk-3.0/assets/checkbox-checked.svg
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/checkbox-mixed-insensitive.svg b/svg-sources/gtk-3.0/assets/checkbox-mixed-insensitive.svg
deleted file mode 100644
index a007e89..0000000
--- a/svg-sources/gtk-3.0/assets/checkbox-mixed-insensitive.svg
+++ /dev/null
@@ -1,146 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/checkbox-mixed.svg b/svg-sources/gtk-3.0/assets/checkbox-mixed.svg
deleted file mode 100644
index 68d3e5f..0000000
--- a/svg-sources/gtk-3.0/assets/checkbox-mixed.svg
+++ /dev/null
@@ -1,156 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/checkbox-unchecked-insensitive.svg b/svg-sources/gtk-3.0/assets/checkbox-unchecked-insensitive.svg
deleted file mode 100644
index 80f7392..0000000
--- a/svg-sources/gtk-3.0/assets/checkbox-unchecked-insensitive.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/checkbox-unchecked.svg b/svg-sources/gtk-3.0/assets/checkbox-unchecked.svg
deleted file mode 100644
index d505bd0..0000000
--- a/svg-sources/gtk-3.0/assets/checkbox-unchecked.svg
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg b/svg-sources/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg
deleted file mode 100644
index aca0408..0000000
--- a/svg-sources/gtk-3.0/assets/menuitem-checkbox-checked-hover.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg b/svg-sources/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
deleted file mode 100644
index 76df632..0000000
--- a/svg-sources/gtk-3.0/assets/menuitem-checkbox-checked-insensitive.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/menuitem-checkbox-checked.svg b/svg-sources/gtk-3.0/assets/menuitem-checkbox-checked.svg
deleted file mode 100644
index 6eba04c..0000000
--- a/svg-sources/gtk-3.0/assets/menuitem-checkbox-checked.svg
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg b/svg-sources/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg
deleted file mode 100644
index 2222fd3..0000000
--- a/svg-sources/gtk-3.0/assets/menuitem-checkbox-mixed-hover.svg
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg b/svg-sources/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
deleted file mode 100644
index 7871b0d..0000000
--- a/svg-sources/gtk-3.0/assets/menuitem-checkbox-mixed-insensitive.svg
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg b/svg-sources/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
deleted file mode 100644
index 247b632..0000000
--- a/svg-sources/gtk-3.0/assets/menuitem-checkbox-mixed-selected.svg
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/menuitem-checkbox-mixed.svg b/svg-sources/gtk-3.0/assets/menuitem-checkbox-mixed.svg
deleted file mode 100644
index ec2672b..0000000
--- a/svg-sources/gtk-3.0/assets/menuitem-checkbox-mixed.svg
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/menuitem-radio-checked-hover.svg b/svg-sources/gtk-3.0/assets/menuitem-radio-checked-hover.svg
deleted file mode 100644
index a4525b7..0000000
--- a/svg-sources/gtk-3.0/assets/menuitem-radio-checked-hover.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg b/svg-sources/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
deleted file mode 100644
index d7a443e..0000000
--- a/svg-sources/gtk-3.0/assets/menuitem-radio-checked-insensitive.svg
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/menuitem-radio-checked.svg b/svg-sources/gtk-3.0/assets/menuitem-radio-checked.svg
deleted file mode 100644
index f3065b4..0000000
--- a/svg-sources/gtk-3.0/assets/menuitem-radio-checked.svg
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/progress-vertical.png b/svg-sources/gtk-3.0/assets/progress-vertical.png
deleted file mode 100644
index 1b30788..0000000
Binary files a/svg-sources/gtk-3.0/assets/progress-vertical.png and /dev/null differ
diff --git a/svg-sources/gtk-3.0/assets/progress.png b/svg-sources/gtk-3.0/assets/progress.png
deleted file mode 100644
index b0beb04..0000000
Binary files a/svg-sources/gtk-3.0/assets/progress.png and /dev/null differ
diff --git a/svg-sources/gtk-3.0/assets/radio-mixed-insensitive.svg b/svg-sources/gtk-3.0/assets/radio-mixed-insensitive.svg
deleted file mode 100644
index 10d2ceb..0000000
--- a/svg-sources/gtk-3.0/assets/radio-mixed-insensitive.svg
+++ /dev/null
@@ -1,124 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/radio-mixed.svg b/svg-sources/gtk-3.0/assets/radio-mixed.svg
deleted file mode 100644
index 425e1ac..0000000
--- a/svg-sources/gtk-3.0/assets/radio-mixed.svg
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/radio-selected-insensitive.svg b/svg-sources/gtk-3.0/assets/radio-selected-insensitive.svg
deleted file mode 100644
index 465a242..0000000
--- a/svg-sources/gtk-3.0/assets/radio-selected-insensitive.svg
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/radio-selected.svg b/svg-sources/gtk-3.0/assets/radio-selected.svg
deleted file mode 100644
index 5c010bf..0000000
--- a/svg-sources/gtk-3.0/assets/radio-selected.svg
+++ /dev/null
@@ -1,135 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/radio-unselected-insensitive.svg b/svg-sources/gtk-3.0/assets/radio-unselected-insensitive.svg
deleted file mode 100644
index 9535e37..0000000
--- a/svg-sources/gtk-3.0/assets/radio-unselected-insensitive.svg
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
diff --git a/svg-sources/gtk-3.0/assets/radio-unselected.svg b/svg-sources/gtk-3.0/assets/radio-unselected.svg
deleted file mode 100644
index eed0849..0000000
--- a/svg-sources/gtk-3.0/assets/radio-unselected.svg
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-