108 files changed, 68 insertions, 66 deletions

diff --git a/configure.in b/configure.in
index 2a77ebc4..9c017d5e 100644
--- a/configure.in
+++ b/configure.in
@@ -102,7 +102,7 @@ AC_ARG_ENABLE(test-themes,
  [enable_test_themes=no])
 
 if test "x$enable_test_themes" = "xyes"; then
-	TEST_THEMES="ClearlooksTest"
+	TEST_THEMES="TraditionalOkTest"
 else
 	TEST_THEMES=""
 fi
@@ -188,8 +188,8 @@ desktop-themes/Aldabra/gtk-3.0/Makefile
 desktop-themes/Aldabra/gtk-3.0/assets/Makefile
 desktop-themes/Aldabra/metacity-1/Makefile
 desktop-themes/Crux/Makefile
-desktop-themes/Clearlooks/Makefile
-desktop-themes/ClearlooksTest/Makefile
+desktop-themes/TraditionalOk/Makefile
+desktop-themes/TraditionalOkTest/Makefile
 desktop-themes/Glider/Makefile
 desktop-themes/Glossy/Makefile
 desktop-themes/HighContrast/Makefile
@@ -208,8 +208,8 @@ marco-themes/Makefile
 gtk-themes/Makefile
 gtk-themes/Glider/Makefile
 gtk-themes/Glossy/Makefile
-gtk-themes/ClearlooksClassic/Makefile
-gtk-themes/ClearlooksTest/Makefile
+gtk-themes/TraditionalOkClassic/Makefile
+gtk-themes/TraditionalOkTest/Makefile
 gtk-themes/HighContrast/Makefile
 gtk-themes/HighContrast/gtkrc
 gtk-themes/HighContrastInverse/Makefile
diff --git a/desktop-themes/Makefile.am b/desktop-themes/Makefile.am
index 64948925..755f5c87 100644
--- a/desktop-themes/Makefile.am
+++ b/desktop-themes/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = \
 	Aldabra \
-	Crux \
+	Quid \
 	TraditionalOk \
 	Glider \
 	Glossy \
@@ -16,7 +16,7 @@ SUBDIRS = \
 
 DIST_SUBDIRS = \
 	Aldabra \
-	Crux \
+	Quid \
 	TraditionalOk \
 	Glider \
 	Glossy \
diff --git a/desktop-themes/Crux/Makefile.am b/desktop-themes/Quid/Makefile.am
index 2bad6f64..5f2adc7e 100644
--- a/desktop-themes/Crux/Makefile.am
+++ b/desktop-themes/Quid/Makefile.am
@@ -1,4 +1,4 @@
-THEME_NAME=Crux
+THEME_NAME=Quid
 THEME_IN_FILES=index.theme.in
  
 %.theme:   %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff --git a/desktop-themes/Crux/index.theme.in b/desktop-themes/Quid/index.theme.in
index 46e034c9..aa022e62 100644
--- a/desktop-themes/Crux/index.theme.in
+++ b/desktop-themes/Quid/index.theme.in
@@ -1,8 +1,8 @@
 [X-GNOME-Metatheme]
-_Name=Crux
+_Name=Quid
 Type=X-GNOME-Metatheme
 _Comment=Smooth gradients with purple highlights
 Encoding=UTF-8
-GtkTheme=Crux
-MetacityTheme=Crux
-IconTheme=Crux
+GtkTheme=Quid
+MetacityTheme=Quid
+IconTheme=Quid
diff --git a/icon-themes/Crux/scalable/Makefile.am b/icon-themes/Crux/scalable/Makefile.am
deleted file mode 100644
index d652496b..00000000
--- a/icon-themes/Crux/scalable/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-SUBDIRS = actions places status
-
-MAINTAINERCLEANFILES =	\
-	Makefile.in
-
diff --git a/icon-themes/Makefile.am b/icon-themes/Makefile.am
index cb631509..fff50889 100644
--- a/icon-themes/Makefile.am
+++ b/icon-themes/Makefile.am
@@ -1,8 +1,10 @@
-SUBDIRS=Crux \
-	HighContrast		\
-	HighContrastInverse	\
-	HighContrastLargePrint	\
+SUBDIRS = \
+	Quid \
+	HighContrast \
+	HighContrastInverse \
+	HighContrastLargePrint \
 	HighContrastLargePrintInverse \
-	HighContrast-SVG 	\
-	LargePrint 		\
-	Mist 
+	HighContrast-SVG \
+	LargePrint \
+	Mist
+
diff --git a/icon-themes/Quid/16x16/Makefile.am b/icon-themes/Quid/16x16/Makefile.am
new file mode 100644
index 00000000..a533d7d3
--- /dev/null
+++ b/icon-themes/Quid/16x16/Makefile.am
@@ -0,0 +1,5 @@
+SUBDIRS = actions places status
+
+MAINTAINERCLEANFILES = \
+	Makefile.in
+
diff --git a/icon-themes/Crux/16x16/actions/Makefile.am b/icon-themes/Quid/16x16/actions/Makefile.am
index be8fd169..4f04a679 100644
--- a/icon-themes/Crux/16x16/actions/Makefile.am
+++ b/icon-themes/Quid/16x16/actions/Makefile.am
@@ -1,24 +1,24 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = 16x16
 context = actions
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA =			\
-	document-open.png	\
-	go-bottom.png		\
-	go-first.png		\
-	go-last.png		\
-	go-previous.png		\
-	go-up.png		\
-	go-down.png		\
-	go-home.png		\
-	go-next.png		\
-	go-top.png		\
+icons_DATA = \
+	document-open.png \
+	go-bottom.png \
+	go-first.png \
+	go-last.png \
+	go-previous.png \
+	go-up.png \
+	go-down.png \
+	go-home.png \
+	go-next.png \
+	go-top.png \
 	view-refresh.png
 
 
-EXTRA_DIST =		\
+EXTRA_DIST = \
 	$(icons_DATA)
 
 if LEGACY_ICON_MAPPING
diff --git a/icon-themes/Crux/16x16/actions/document-open.png b/icon-themes/Quid/16x16/actions/document-open.png
index 33c5b7f5..33c5b7f5 100644
--- a/icon-themes/Crux/16x16/actions/document-open.png
+++ b/icon-themes/Quid/16x16/actions/document-open.png
diff --git a/icon-themes/Crux/16x16/actions/go-bottom.png b/icon-themes/Quid/16x16/actions/go-bottom.png
index 21c9f5ff..21c9f5ff 100644
--- a/icon-themes/Crux/16x16/actions/go-bottom.png
+++ b/icon-themes/Quid/16x16/actions/go-bottom.png
diff --git a/icon-themes/Crux/16x16/actions/go-down.png b/icon-themes/Quid/16x16/actions/go-down.png
index 61be3406..61be3406 100644
--- a/icon-themes/Crux/16x16/actions/go-down.png
+++ b/icon-themes/Quid/16x16/actions/go-down.png
diff --git a/icon-themes/Crux/16x16/actions/go-first.png b/icon-themes/Quid/16x16/actions/go-first.png
index b6ba7f7a..b6ba7f7a 100644
--- a/icon-themes/Crux/16x16/actions/go-first.png
+++ b/icon-themes/Quid/16x16/actions/go-first.png
diff --git a/icon-themes/Crux/16x16/actions/go-home.png b/icon-themes/Quid/16x16/actions/go-home.png
index cbc19c7a..cbc19c7a 100644
--- a/icon-themes/Crux/16x16/actions/go-home.png
+++ b/icon-themes/Quid/16x16/actions/go-home.png
diff --git a/icon-themes/Crux/16x16/actions/go-last.png b/icon-themes/Quid/16x16/actions/go-last.png
index 66a72894..66a72894 100644
--- a/icon-themes/Crux/16x16/actions/go-last.png
+++ b/icon-themes/Quid/16x16/actions/go-last.png
diff --git a/icon-themes/Crux/16x16/actions/go-next.png b/icon-themes/Quid/16x16/actions/go-next.png
index ce0c2d04..ce0c2d04 100644
--- a/icon-themes/Crux/16x16/actions/go-next.png
+++ b/icon-themes/Quid/16x16/actions/go-next.png
diff --git a/icon-themes/Crux/16x16/actions/go-previous.png b/icon-themes/Quid/16x16/actions/go-previous.png
index 0a6571ae..0a6571ae 100644
--- a/icon-themes/Crux/16x16/actions/go-previous.png
+++ b/icon-themes/Quid/16x16/actions/go-previous.png
diff --git a/icon-themes/Crux/16x16/actions/go-top.png b/icon-themes/Quid/16x16/actions/go-top.png
index 5c125911..5c125911 100644
--- a/icon-themes/Crux/16x16/actions/go-top.png
+++ b/icon-themes/Quid/16x16/actions/go-top.png
diff --git a/icon-themes/Crux/16x16/actions/go-up.png b/icon-themes/Quid/16x16/actions/go-up.png
index 7fc2ef07..7fc2ef07 100644
--- a/icon-themes/Crux/16x16/actions/go-up.png
+++ b/icon-themes/Quid/16x16/actions/go-up.png
diff --git a/icon-themes/Crux/16x16/actions/view-refresh.png b/icon-themes/Quid/16x16/actions/view-refresh.png
index e12dd6f9..e12dd6f9 100644
--- a/icon-themes/Crux/16x16/actions/view-refresh.png
+++ b/icon-themes/Quid/16x16/actions/view-refresh.png
diff --git a/icon-themes/Crux/16x16/places/Makefile.am b/icon-themes/Quid/16x16/places/Makefile.am
index 7b88c969..d2cac8e5 100644
--- a/icon-themes/Crux/16x16/places/Makefile.am
+++ b/icon-themes/Quid/16x16/places/Makefile.am
@@ -1,16 +1,16 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = 16x16
 context = places
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA =			\
-	folder.png		\
-	folder-remote.png	\
-	folder-saved-search.png	\
+icons_DATA = \
+	folder.png \
+	folder-remote.png \
+	folder-saved-search.png \
 	user-home.png
 
-EXTRA_DIST =		\
+EXTRA_DIST = \
 	$(icons_DATA)
 
 if LEGACY_ICON_MAPPING
diff --git a/icon-themes/Crux/16x16/places/folder-remote.png b/icon-themes/Quid/16x16/places/folder-remote.png
index d4ba7a8b..d4ba7a8b 100644
--- a/icon-themes/Crux/16x16/places/folder-remote.png
+++ b/icon-themes/Quid/16x16/places/folder-remote.png
diff --git a/icon-themes/Crux/16x16/places/folder-saved-search.png b/icon-themes/Quid/16x16/places/folder-saved-search.png
index 0d8f846e..0d8f846e 100644
--- a/icon-themes/Crux/16x16/places/folder-saved-search.png
+++ b/icon-themes/Quid/16x16/places/folder-saved-search.png
diff --git a/icon-themes/Crux/16x16/places/folder.png b/icon-themes/Quid/16x16/places/folder.png
index 1943204b..1943204b 100644
--- a/icon-themes/Crux/16x16/places/folder.png
+++ b/icon-themes/Quid/16x16/places/folder.png
diff --git a/icon-themes/Crux/16x16/places/user-home.png b/icon-themes/Quid/16x16/places/user-home.png
index 38c7df85..38c7df85 100644
--- a/icon-themes/Crux/16x16/places/user-home.png
+++ b/icon-themes/Quid/16x16/places/user-home.png
diff --git a/icon-themes/Crux/16x16/status/Makefile.am b/icon-themes/Quid/16x16/status/Makefile.am
index 5657f04b..325e29ac 100644
--- a/icon-themes/Crux/16x16/status/Makefile.am
+++ b/icon-themes/Quid/16x16/status/Makefile.am
@@ -1,15 +1,15 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = 16x16
 context = status
 
 iconsdir = $(themedir)/$(size)/$(context)
 
-icons_DATA =			\
-	folder-drag-accept.png	\
-	folder-open.png		\
+icons_DATA = \
+	folder-drag-accept.png \
+	folder-open.png \
 	folder-visiting.png
 
-EXTRA_DIST =		\
+EXTRA_DIST = \
 	$(icons_DATA)
 
 if LEGACY_ICON_MAPPING
diff --git a/icon-themes/Crux/16x16/status/folder-drag-accept.png b/icon-themes/Quid/16x16/status/folder-drag-accept.png
index c7903ad8..c7903ad8 100644
--- a/icon-themes/Crux/16x16/status/folder-drag-accept.png
+++ b/icon-themes/Quid/16x16/status/folder-drag-accept.png
diff --git a/icon-themes/Crux/16x16/status/folder-open.png b/icon-themes/Quid/16x16/status/folder-open.png
index 007881d2..007881d2 100644
--- a/icon-themes/Crux/16x16/status/folder-open.png
+++ b/icon-themes/Quid/16x16/status/folder-open.png
diff --git a/icon-themes/Crux/16x16/status/folder-visiting.png b/icon-themes/Quid/16x16/status/folder-visiting.png
index eca102fe..eca102fe 100644
--- a/icon-themes/Crux/16x16/status/folder-visiting.png
+++ b/icon-themes/Quid/16x16/status/folder-visiting.png
diff --git a/icon-themes/Crux/16x16/Makefile.am b/icon-themes/Quid/22x22/Makefile.am
index d652496b..d652496b 100644
--- a/icon-themes/Crux/16x16/Makefile.am
+++ b/icon-themes/Quid/22x22/Makefile.am
diff --git a/icon-themes/Crux/22x22/actions/Makefile.am b/icon-themes/Quid/22x22/actions/Makefile.am
index 63696a0e..ad8252e3 100644
--- a/icon-themes/Crux/22x22/actions/Makefile.am
+++ b/icon-themes/Quid/22x22/actions/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = 22x22
 context = actions
 
diff --git a/icon-themes/Crux/22x22/actions/document-open.png b/icon-themes/Quid/22x22/actions/document-open.png
index 5ce49691..5ce49691 100644
--- a/icon-themes/Crux/22x22/actions/document-open.png
+++ b/icon-themes/Quid/22x22/actions/document-open.png
diff --git a/icon-themes/Crux/22x22/actions/go-bottom.png b/icon-themes/Quid/22x22/actions/go-bottom.png
index a4d52f94..a4d52f94 100644
--- a/icon-themes/Crux/22x22/actions/go-bottom.png
+++ b/icon-themes/Quid/22x22/actions/go-bottom.png
diff --git a/icon-themes/Crux/22x22/actions/go-down.png b/icon-themes/Quid/22x22/actions/go-down.png
index d8a77eab..d8a77eab 100644
--- a/icon-themes/Crux/22x22/actions/go-down.png
+++ b/icon-themes/Quid/22x22/actions/go-down.png
diff --git a/icon-themes/Crux/22x22/actions/go-first.png b/icon-themes/Quid/22x22/actions/go-first.png
index 58dd9dc6..58dd9dc6 100644
--- a/icon-themes/Crux/22x22/actions/go-first.png
+++ b/icon-themes/Quid/22x22/actions/go-first.png
diff --git a/icon-themes/Crux/22x22/actions/go-home.png b/icon-themes/Quid/22x22/actions/go-home.png
index f779333b..f779333b 100644
--- a/icon-themes/Crux/22x22/actions/go-home.png
+++ b/icon-themes/Quid/22x22/actions/go-home.png
diff --git a/icon-themes/Crux/22x22/actions/go-last.png b/icon-themes/Quid/22x22/actions/go-last.png
index 8836ce0b..8836ce0b 100644
--- a/icon-themes/Crux/22x22/actions/go-last.png
+++ b/icon-themes/Quid/22x22/actions/go-last.png
diff --git a/icon-themes/Crux/22x22/actions/go-next.png b/icon-themes/Quid/22x22/actions/go-next.png
index 11e022b5..11e022b5 100644
--- a/icon-themes/Crux/22x22/actions/go-next.png
+++ b/icon-themes/Quid/22x22/actions/go-next.png
diff --git a/icon-themes/Crux/22x22/actions/go-previous.png b/icon-themes/Quid/22x22/actions/go-previous.png
index 712bff30..712bff30 100644
--- a/icon-themes/Crux/22x22/actions/go-previous.png
+++ b/icon-themes/Quid/22x22/actions/go-previous.png
diff --git a/icon-themes/Crux/22x22/actions/go-top.png b/icon-themes/Quid/22x22/actions/go-top.png
index e491057f..e491057f 100644
--- a/icon-themes/Crux/22x22/actions/go-top.png
+++ b/icon-themes/Quid/22x22/actions/go-top.png
diff --git a/icon-themes/Crux/22x22/actions/go-up.png b/icon-themes/Quid/22x22/actions/go-up.png
index 4860bb3a..4860bb3a 100644
--- a/icon-themes/Crux/22x22/actions/go-up.png
+++ b/icon-themes/Quid/22x22/actions/go-up.png
diff --git a/icon-themes/Crux/22x22/actions/view-refresh.png b/icon-themes/Quid/22x22/actions/view-refresh.png
index 721df6a7..721df6a7 100644
--- a/icon-themes/Crux/22x22/actions/view-refresh.png
+++ b/icon-themes/Quid/22x22/actions/view-refresh.png
diff --git a/icon-themes/Crux/22x22/places/Makefile.am b/icon-themes/Quid/22x22/places/Makefile.am
index 4a5f5e13..1c9156b4 100644
--- a/icon-themes/Crux/22x22/places/Makefile.am
+++ b/icon-themes/Quid/22x22/places/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = 22x22
 context = places
 
diff --git a/icon-themes/Crux/22x22/places/folder-remote.png b/icon-themes/Quid/22x22/places/folder-remote.png
index 7b40cd3f..7b40cd3f 100644
--- a/icon-themes/Crux/22x22/places/folder-remote.png
+++ b/icon-themes/Quid/22x22/places/folder-remote.png
diff --git a/icon-themes/Crux/22x22/places/folder-saved-search.png b/icon-themes/Quid/22x22/places/folder-saved-search.png
index 1ee766d0..1ee766d0 100644
--- a/icon-themes/Crux/22x22/places/folder-saved-search.png
+++ b/icon-themes/Quid/22x22/places/folder-saved-search.png
diff --git a/icon-themes/Crux/22x22/places/folder.png b/icon-themes/Quid/22x22/places/folder.png
index ab2c024c..ab2c024c 100644
--- a/icon-themes/Crux/22x22/places/folder.png
+++ b/icon-themes/Quid/22x22/places/folder.png
diff --git a/icon-themes/Crux/22x22/places/user-home.png b/icon-themes/Quid/22x22/places/user-home.png
index f0254af6..f0254af6 100644
--- a/icon-themes/Crux/22x22/places/user-home.png
+++ b/icon-themes/Quid/22x22/places/user-home.png
diff --git a/icon-themes/Crux/22x22/status/Makefile.am b/icon-themes/Quid/22x22/status/Makefile.am
index 28ecd9a1..868a7c6e 100644
--- a/icon-themes/Crux/22x22/status/Makefile.am
+++ b/icon-themes/Quid/22x22/status/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = 22x22
 context = status
 
diff --git a/icon-themes/Crux/22x22/status/folder-drag-accept.png b/icon-themes/Quid/22x22/status/folder-drag-accept.png
index 95ba0a03..95ba0a03 100644
--- a/icon-themes/Crux/22x22/status/folder-drag-accept.png
+++ b/icon-themes/Quid/22x22/status/folder-drag-accept.png
diff --git a/icon-themes/Crux/22x22/status/folder-open.png b/icon-themes/Quid/22x22/status/folder-open.png
index 613774a7..613774a7 100644
--- a/icon-themes/Crux/22x22/status/folder-open.png
+++ b/icon-themes/Quid/22x22/status/folder-open.png
diff --git a/icon-themes/Crux/22x22/status/folder-visiting.png b/icon-themes/Quid/22x22/status/folder-visiting.png
index ba398055..ba398055 100644
--- a/icon-themes/Crux/22x22/status/folder-visiting.png
+++ b/icon-themes/Quid/22x22/status/folder-visiting.png
diff --git a/icon-themes/Crux/22x22/Makefile.am b/icon-themes/Quid/24x24/Makefile.am
index d652496b..d652496b 100644
--- a/icon-themes/Crux/22x22/Makefile.am
+++ b/icon-themes/Quid/24x24/Makefile.am
diff --git a/icon-themes/Crux/24x24/actions/Makefile.am b/icon-themes/Quid/24x24/actions/Makefile.am
index 1c851c0e..467ec4cc 100644
--- a/icon-themes/Crux/24x24/actions/Makefile.am
+++ b/icon-themes/Quid/24x24/actions/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = 24x24
 context = actions
 
diff --git a/icon-themes/Crux/24x24/actions/document-open.png b/icon-themes/Quid/24x24/actions/document-open.png
index 143e3b19..143e3b19 100644
--- a/icon-themes/Crux/24x24/actions/document-open.png
+++ b/icon-themes/Quid/24x24/actions/document-open.png
diff --git a/icon-themes/Crux/24x24/actions/go-bottom.png b/icon-themes/Quid/24x24/actions/go-bottom.png
index ab0ee326..ab0ee326 100644
--- a/icon-themes/Crux/24x24/actions/go-bottom.png
+++ b/icon-themes/Quid/24x24/actions/go-bottom.png
diff --git a/icon-themes/Crux/24x24/actions/go-down.png b/icon-themes/Quid/24x24/actions/go-down.png
index 7bebce62..7bebce62 100644
--- a/icon-themes/Crux/24x24/actions/go-down.png
+++ b/icon-themes/Quid/24x24/actions/go-down.png
diff --git a/icon-themes/Crux/24x24/actions/go-first.png b/icon-themes/Quid/24x24/actions/go-first.png
index 7126350b..7126350b 100644
--- a/icon-themes/Crux/24x24/actions/go-first.png
+++ b/icon-themes/Quid/24x24/actions/go-first.png
diff --git a/icon-themes/Crux/24x24/actions/go-home.png b/icon-themes/Quid/24x24/actions/go-home.png
index eeff562f..eeff562f 100644
--- a/icon-themes/Crux/24x24/actions/go-home.png
+++ b/icon-themes/Quid/24x24/actions/go-home.png
diff --git a/icon-themes/Crux/24x24/actions/go-last.png b/icon-themes/Quid/24x24/actions/go-last.png
index 3cd8fce1..3cd8fce1 100644
--- a/icon-themes/Crux/24x24/actions/go-last.png
+++ b/icon-themes/Quid/24x24/actions/go-last.png
diff --git a/icon-themes/Crux/24x24/actions/go-next.png b/icon-themes/Quid/24x24/actions/go-next.png
index b3658d0c..b3658d0c 100644
--- a/icon-themes/Crux/24x24/actions/go-next.png
+++ b/icon-themes/Quid/24x24/actions/go-next.png
diff --git a/icon-themes/Crux/24x24/actions/go-previous.png b/icon-themes/Quid/24x24/actions/go-previous.png
index d12f1c45..d12f1c45 100644
--- a/icon-themes/Crux/24x24/actions/go-previous.png
+++ b/icon-themes/Quid/24x24/actions/go-previous.png
diff --git a/icon-themes/Crux/24x24/actions/go-top.png b/icon-themes/Quid/24x24/actions/go-top.png
index 68fa4cb6..68fa4cb6 100644
--- a/icon-themes/Crux/24x24/actions/go-top.png
+++ b/icon-themes/Quid/24x24/actions/go-top.png
diff --git a/icon-themes/Crux/24x24/actions/go-up.png b/icon-themes/Quid/24x24/actions/go-up.png
index f422552d..f422552d 100644
--- a/icon-themes/Crux/24x24/actions/go-up.png
+++ b/icon-themes/Quid/24x24/actions/go-up.png
diff --git a/icon-themes/Crux/24x24/actions/view-refresh.png b/icon-themes/Quid/24x24/actions/view-refresh.png
index d919bba4..d919bba4 100644
--- a/icon-themes/Crux/24x24/actions/view-refresh.png
+++ b/icon-themes/Quid/24x24/actions/view-refresh.png
diff --git a/icon-themes/Crux/24x24/places/Makefile.am b/icon-themes/Quid/24x24/places/Makefile.am
index 7ed381a5..45ab553c 100644
--- a/icon-themes/Crux/24x24/places/Makefile.am
+++ b/icon-themes/Quid/24x24/places/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = 24x24
 context = places
 
diff --git a/icon-themes/Crux/24x24/places/folder-remote.png b/icon-themes/Quid/24x24/places/folder-remote.png
index d3ed0ad3..d3ed0ad3 100644
--- a/icon-themes/Crux/24x24/places/folder-remote.png
+++ b/icon-themes/Quid/24x24/places/folder-remote.png
diff --git a/icon-themes/Crux/24x24/places/folder-saved-search.png b/icon-themes/Quid/24x24/places/folder-saved-search.png
index d0d16d5c..d0d16d5c 100644
--- a/icon-themes/Crux/24x24/places/folder-saved-search.png
+++ b/icon-themes/Quid/24x24/places/folder-saved-search.png
diff --git a/icon-themes/Crux/24x24/places/folder.png b/icon-themes/Quid/24x24/places/folder.png
index cd00e423..cd00e423 100644
--- a/icon-themes/Crux/24x24/places/folder.png
+++ b/icon-themes/Quid/24x24/places/folder.png
diff --git a/icon-themes/Crux/24x24/places/user-home.png b/icon-themes/Quid/24x24/places/user-home.png
index c186cd2a..c186cd2a 100644
--- a/icon-themes/Crux/24x24/places/user-home.png
+++ b/icon-themes/Quid/24x24/places/user-home.png
diff --git a/icon-themes/Crux/24x24/status/Makefile.am b/icon-themes/Quid/24x24/status/Makefile.am
index 9ebd8acb..16b8ee62 100644
--- a/icon-themes/Crux/24x24/status/Makefile.am
+++ b/icon-themes/Quid/24x24/status/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = 24x24
 context = status
 
diff --git a/icon-themes/Crux/24x24/status/folder-drag-accept.png b/icon-themes/Quid/24x24/status/folder-drag-accept.png
index afa403c9..afa403c9 100644
--- a/icon-themes/Crux/24x24/status/folder-drag-accept.png
+++ b/icon-themes/Quid/24x24/status/folder-drag-accept.png
diff --git a/icon-themes/Crux/24x24/status/folder-open.png b/icon-themes/Quid/24x24/status/folder-open.png
index 9d3b7ff9..9d3b7ff9 100644
--- a/icon-themes/Crux/24x24/status/folder-open.png
+++ b/icon-themes/Quid/24x24/status/folder-open.png
diff --git a/icon-themes/Crux/24x24/status/folder-visiting.png b/icon-themes/Quid/24x24/status/folder-visiting.png
index 866ed724..866ed724 100644
--- a/icon-themes/Crux/24x24/status/folder-visiting.png
+++ b/icon-themes/Quid/24x24/status/folder-visiting.png
diff --git a/icon-themes/Crux/24x24/Makefile.am b/icon-themes/Quid/32x32/Makefile.am
index d652496b..d652496b 100644
--- a/icon-themes/Crux/24x24/Makefile.am
+++ b/icon-themes/Quid/32x32/Makefile.am
diff --git a/icon-themes/Crux/32x32/actions/Makefile.am b/icon-themes/Quid/32x32/actions/Makefile.am
index c2fb07dc..db396e50 100644
--- a/icon-themes/Crux/32x32/actions/Makefile.am
+++ b/icon-themes/Quid/32x32/actions/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = 32x32
 context = actions
 
diff --git a/icon-themes/Crux/32x32/actions/document-open.png b/icon-themes/Quid/32x32/actions/document-open.png
index 18dcdcdf..18dcdcdf 100644
--- a/icon-themes/Crux/32x32/actions/document-open.png
+++ b/icon-themes/Quid/32x32/actions/document-open.png
diff --git a/icon-themes/Crux/32x32/places/Makefile.am b/icon-themes/Quid/32x32/places/Makefile.am
index 3ad77bd0..1b249731 100644
--- a/icon-themes/Crux/32x32/places/Makefile.am
+++ b/icon-themes/Quid/32x32/places/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = 32x32
 context = places
 
diff --git a/icon-themes/Crux/32x32/places/folder-remote.png b/icon-themes/Quid/32x32/places/folder-remote.png
index f81a6194..f81a6194 100644
--- a/icon-themes/Crux/32x32/places/folder-remote.png
+++ b/icon-themes/Quid/32x32/places/folder-remote.png
diff --git a/icon-themes/Crux/32x32/places/folder-saved-search.png b/icon-themes/Quid/32x32/places/folder-saved-search.png
index 142a1903..142a1903 100644
--- a/icon-themes/Crux/32x32/places/folder-saved-search.png
+++ b/icon-themes/Quid/32x32/places/folder-saved-search.png
diff --git a/icon-themes/Crux/32x32/places/folder.png b/icon-themes/Quid/32x32/places/folder.png
index 8fe42694..8fe42694 100644
--- a/icon-themes/Crux/32x32/places/folder.png
+++ b/icon-themes/Quid/32x32/places/folder.png
diff --git a/icon-themes/Crux/32x32/places/user-home.png b/icon-themes/Quid/32x32/places/user-home.png
index cf95cd94..cf95cd94 100644
--- a/icon-themes/Crux/32x32/places/user-home.png
+++ b/icon-themes/Quid/32x32/places/user-home.png
diff --git a/icon-themes/Crux/32x32/status/Makefile.am b/icon-themes/Quid/32x32/status/Makefile.am
index ac120083..2e22a100 100644
--- a/icon-themes/Crux/32x32/status/Makefile.am
+++ b/icon-themes/Quid/32x32/status/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = 32x32
 context = status
 
diff --git a/icon-themes/Crux/32x32/status/folder-drag-accept.png b/icon-themes/Quid/32x32/status/folder-drag-accept.png
index 0ee0ce89..0ee0ce89 100644
--- a/icon-themes/Crux/32x32/status/folder-drag-accept.png
+++ b/icon-themes/Quid/32x32/status/folder-drag-accept.png
diff --git a/icon-themes/Crux/32x32/status/folder-open.png b/icon-themes/Quid/32x32/status/folder-open.png
index f257ddcf..f257ddcf 100644
--- a/icon-themes/Crux/32x32/status/folder-open.png
+++ b/icon-themes/Quid/32x32/status/folder-open.png
diff --git a/icon-themes/Crux/32x32/status/folder-visiting.png b/icon-themes/Quid/32x32/status/folder-visiting.png
index eb30075a..eb30075a 100644
--- a/icon-themes/Crux/32x32/status/folder-visiting.png
+++ b/icon-themes/Quid/32x32/status/folder-visiting.png
diff --git a/icon-themes/Crux/Makefile.am b/icon-themes/Quid/Makefile.am
index a7f4797b..1cc0a28e 100644
--- a/icon-themes/Crux/Makefile.am
+++ b/icon-themes/Quid/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/MateCrux
+themedir = $(datadir)/icons/Quid
 
 SUBDIRS = 16x16 22x22 24x24 32x32 scalable
 
@@ -8,12 +8,12 @@ THEME_IN_FILES = index.theme.in
 
 theme_DATA = index.theme
 
-EXTRA_DIST=				\
+EXTRA_DIST = \
 	index.theme.in
 
-CLEANFILES = 				\
+CLEANFILES = \
 	index.theme
 
 
-MAINTAINERCLEANFILES =			\
+MAINTAINERCLEANFILES = \
 	Makefile.in
diff --git a/icon-themes/Crux/index.theme.in b/icon-themes/Quid/index.theme.in
index 528da72e..958cea8e 100644
--- a/icon-themes/Crux/index.theme.in
+++ b/icon-themes/Quid/index.theme.in
@@ -1,6 +1,6 @@
 [Icon Theme]
-_Name=Crux
-_Comment=Crux
+_Name=Quid
+_Comment=Quid
 Inherits=mate
 Directories=16x16/actions,16x16/places,16x16/status,22x22/actions,22x22/places,22x22/status,24x24/actions,24x24/places,24x24/status,32x32/actions,32x32/places,32x32/status,scalable/places,scalable/actions,scalable/status
 
diff --git a/icon-themes/Crux/32x32/Makefile.am b/icon-themes/Quid/scalable/Makefile.am
index d652496b..d652496b 100644
--- a/icon-themes/Crux/32x32/Makefile.am
+++ b/icon-themes/Quid/scalable/Makefile.am
diff --git a/icon-themes/Crux/scalable/actions/Makefile.am b/icon-themes/Quid/scalable/actions/Makefile.am
index 644771eb..ae71a7e0 100644
--- a/icon-themes/Crux/scalable/actions/Makefile.am
+++ b/icon-themes/Quid/scalable/actions/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = scalable
 context = actions
 
diff --git a/icon-themes/Crux/scalable/actions/document-open.svg b/icon-themes/Quid/scalable/actions/document-open.svg
index 6e4e8ddf..6e4e8ddf 100644
--- a/icon-themes/Crux/scalable/actions/document-open.svg
+++ b/icon-themes/Quid/scalable/actions/document-open.svg
diff --git a/icon-themes/Crux/scalable/actions/go-bottom.svg b/icon-themes/Quid/scalable/actions/go-bottom.svg
index a12c7386..a12c7386 100644
--- a/icon-themes/Crux/scalable/actions/go-bottom.svg
+++ b/icon-themes/Quid/scalable/actions/go-bottom.svg
diff --git a/icon-themes/Crux/scalable/actions/go-down.svg b/icon-themes/Quid/scalable/actions/go-down.svg
index 3376f5ff..3376f5ff 100644
--- a/icon-themes/Crux/scalable/actions/go-down.svg
+++ b/icon-themes/Quid/scalable/actions/go-down.svg
diff --git a/icon-themes/Crux/scalable/actions/go-first.svg b/icon-themes/Quid/scalable/actions/go-first.svg
index 29675e8e..29675e8e 100644
--- a/icon-themes/Crux/scalable/actions/go-first.svg
+++ b/icon-themes/Quid/scalable/actions/go-first.svg
diff --git a/icon-themes/Crux/scalable/actions/go-home.svg b/icon-themes/Quid/scalable/actions/go-home.svg
index 0bd7449c..0bd7449c 100644
--- a/icon-themes/Crux/scalable/actions/go-home.svg
+++ b/icon-themes/Quid/scalable/actions/go-home.svg
diff --git a/icon-themes/Crux/scalable/actions/go-last.svg b/icon-themes/Quid/scalable/actions/go-last.svg
index f77c9160..f77c9160 100644
--- a/icon-themes/Crux/scalable/actions/go-last.svg
+++ b/icon-themes/Quid/scalable/actions/go-last.svg
diff --git a/icon-themes/Crux/scalable/actions/go-next.svg b/icon-themes/Quid/scalable/actions/go-next.svg
index 98ffec34..98ffec34 100644
--- a/icon-themes/Crux/scalable/actions/go-next.svg
+++ b/icon-themes/Quid/scalable/actions/go-next.svg
diff --git a/icon-themes/Crux/scalable/actions/go-previous.svg b/icon-themes/Quid/scalable/actions/go-previous.svg
index 071907f7..071907f7 100644
--- a/icon-themes/Crux/scalable/actions/go-previous.svg
+++ b/icon-themes/Quid/scalable/actions/go-previous.svg
diff --git a/icon-themes/Crux/scalable/actions/go-top.svg b/icon-themes/Quid/scalable/actions/go-top.svg
index 86aa9b7f..86aa9b7f 100644
--- a/icon-themes/Crux/scalable/actions/go-top.svg
+++ b/icon-themes/Quid/scalable/actions/go-top.svg
diff --git a/icon-themes/Crux/scalable/actions/go-up.svg b/icon-themes/Quid/scalable/actions/go-up.svg
index fca5d2d4..fca5d2d4 100644
--- a/icon-themes/Crux/scalable/actions/go-up.svg
+++ b/icon-themes/Quid/scalable/actions/go-up.svg
diff --git a/icon-themes/Crux/scalable/actions/view-refresh.svg b/icon-themes/Quid/scalable/actions/view-refresh.svg
index 1f677291..1f677291 100644
--- a/icon-themes/Crux/scalable/actions/view-refresh.svg
+++ b/icon-themes/Quid/scalable/actions/view-refresh.svg
diff --git a/icon-themes/Crux/scalable/places/Makefile.am b/icon-themes/Quid/scalable/places/Makefile.am
index 36a82efb..49d53b39 100644
--- a/icon-themes/Crux/scalable/places/Makefile.am
+++ b/icon-themes/Quid/scalable/places/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = scalable
 context = places
 
diff --git a/icon-themes/Crux/scalable/places/folder-remote.svg b/icon-themes/Quid/scalable/places/folder-remote.svg
index 08f1e6fc..08f1e6fc 100644
--- a/icon-themes/Crux/scalable/places/folder-remote.svg
+++ b/icon-themes/Quid/scalable/places/folder-remote.svg
diff --git a/icon-themes/Crux/scalable/places/folder-saved-search.svg b/icon-themes/Quid/scalable/places/folder-saved-search.svg
index c3ef5a2d..c3ef5a2d 100644
--- a/icon-themes/Crux/scalable/places/folder-saved-search.svg
+++ b/icon-themes/Quid/scalable/places/folder-saved-search.svg
diff --git a/icon-themes/Crux/scalable/places/folder.svg b/icon-themes/Quid/scalable/places/folder.svg
index 74c1d628..74c1d628 100644
--- a/icon-themes/Crux/scalable/places/folder.svg
+++ b/icon-themes/Quid/scalable/places/folder.svg
diff --git a/icon-themes/Crux/scalable/places/user-home.svg b/icon-themes/Quid/scalable/places/user-home.svg
index 351439ca..351439ca 100644
--- a/icon-themes/Crux/scalable/places/user-home.svg
+++ b/icon-themes/Quid/scalable/places/user-home.svg
diff --git a/icon-themes/Crux/scalable/status/Makefile.am b/icon-themes/Quid/scalable/status/Makefile.am
index 7391baa1..10eac02a 100644
--- a/icon-themes/Crux/scalable/status/Makefile.am
+++ b/icon-themes/Quid/scalable/status/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/Crux
+themedir = $(datadir)/icons/Quid
 size = scalable
 context = status
 
diff --git a/icon-themes/Crux/scalable/status/folder-drag-accept.svg b/icon-themes/Quid/scalable/status/folder-drag-accept.svg
index 7526d7ee..7526d7ee 100644
--- a/icon-themes/Crux/scalable/status/folder-drag-accept.svg
+++ b/icon-themes/Quid/scalable/status/folder-drag-accept.svg
diff --git a/icon-themes/Crux/scalable/status/folder-open.svg b/icon-themes/Quid/scalable/status/folder-open.svg
index b7bbac61..b7bbac61 100644
--- a/icon-themes/Crux/scalable/status/folder-open.svg
+++ b/icon-themes/Quid/scalable/status/folder-open.svg
diff --git a/icon-themes/Crux/scalable/status/folder-visiting.svg b/icon-themes/Quid/scalable/status/folder-visiting.svg
index 0a41bdab..0a41bdab 100644
--- a/icon-themes/Crux/scalable/status/folder-visiting.svg
+++ b/icon-themes/Quid/scalable/status/folder-visiting.svg