972 files changed, 169 insertions, 169 deletions

diff --git a/configure.in b/configure.in
index ed10b783..8f65d5c5 100644
--- a/configure.in
+++ b/configure.in
@@ -192,12 +192,12 @@ desktop-themes/TraditionalOk/Makefile
 desktop-themes/TraditionalOkTest/Makefile
 desktop-themes/Glider/Makefile
 desktop-themes/Shiny/Makefile
-desktop-themes/HighContrast/Makefile
-desktop-themes/HighContrastInverse/Makefile
-desktop-themes/HighContrastLargePrint/Makefile
-desktop-themes/HighContrastLargePrint/index.theme.in
-desktop-themes/HighContrastLargePrintInverse/Makefile
-desktop-themes/HighContrastLargePrintInverse/index.theme.in
+desktop-themes/ContrastHigh/Makefile
+desktop-themes/ContrastHighInverse/Makefile
+desktop-themes/ContrastHighLargePrint/Makefile
+desktop-themes/ContrastHighLargePrint/index.theme.in
+desktop-themes/ContrastHighLargePrintInverse/Makefile
+desktop-themes/ContrastHighLargePrintInverse/index.theme.in
 desktop-themes/LargePrint/Makefile
 desktop-themes/LargePrint/index.theme.in
 desktop-themes/LowContrast/Makefile
@@ -210,16 +210,16 @@ gtk-themes/Glider/Makefile
 gtk-themes/Shiny/Makefile
 gtk-themes/TraditionalOkClassic/Makefile
 gtk-themes/TraditionalOkTest/Makefile
-gtk-themes/HighContrast/Makefile
-gtk-themes/HighContrast/gtkrc
-gtk-themes/HighContrastInverse/Makefile
-gtk-themes/HighContrastInverse/gtkrc
-gtk-themes/HighContrastLargePrint/Makefile
-gtk-themes/HighContrastLargePrint/gtkrc
-gtk-themes/HighContrastLargePrint/pixmaps/Makefile
-gtk-themes/HighContrastLargePrintInverse/Makefile
-gtk-themes/HighContrastLargePrintInverse/gtkrc
-gtk-themes/HighContrastLargePrintInverse/pixmaps/Makefile
+gtk-themes/ContrastHigh/Makefile
+gtk-themes/ContrastHigh/gtkrc
+gtk-themes/ContrastHighInverse/Makefile
+gtk-themes/ContrastHighInverse/gtkrc
+gtk-themes/ContrastHighLargePrint/Makefile
+gtk-themes/ContrastHighLargePrint/gtkrc
+gtk-themes/ContrastHighLargePrint/pixmaps/Makefile
+gtk-themes/ContrastHighLargePrintInverse/Makefile
+gtk-themes/ContrastHighLargePrintInverse/gtkrc
+gtk-themes/ContrastHighLargePrintInverse/pixmaps/Makefile
 gtk-themes/Reverse/Makefile
 gtk-themes/LargePrint/Makefile
 gtk-themes/LargePrint/gtkrc
@@ -251,54 +251,54 @@ icon-themes/Quid/scalable/Makefile
 icon-themes/Quid/scalable/actions/Makefile
 icon-themes/Quid/scalable/status/Makefile
 icon-themes/Quid/scalable/places/Makefile
-icon-themes/HighContrast/Makefile
-icon-themes/HighContrastInverse/Makefile
-icon-themes/HighContrastLargePrint/Makefile
-icon-themes/HighContrastLargePrint/36x36/Makefile
-icon-themes/HighContrastLargePrint/36x36/animations/Makefile
-icon-themes/HighContrastLargePrint/48x48/Makefile
-icon-themes/HighContrastLargePrint/48x48/actions/Makefile
-icon-themes/HighContrastLargePrint/48x48/apps/Makefile
-icon-themes/HighContrastLargePrint/48x48/categories/Makefile
-icon-themes/HighContrastLargePrint/48x48/devices/Makefile
-icon-themes/HighContrastLargePrint/48x48/emblems/Makefile
-icon-themes/HighContrastLargePrint/48x48/mimetypes/Makefile
-icon-themes/HighContrastLargePrint/48x48/places/Makefile
-icon-themes/HighContrastLargePrint/48x48/status/Makefile
-icon-themes/HighContrastLargePrintInverse/Makefile
-icon-themes/HighContrastLargePrintInverse/36x36/Makefile
-icon-themes/HighContrastLargePrintInverse/36x36/animations/Makefile
-icon-themes/HighContrastLargePrintInverse/48x48/Makefile
-icon-themes/HighContrastLargePrintInverse/48x48/actions/Makefile
-icon-themes/HighContrastLargePrintInverse/48x48/apps/Makefile
-icon-themes/HighContrastLargePrintInverse/48x48/categories/Makefile
-icon-themes/HighContrastLargePrintInverse/48x48/devices/Makefile
-icon-themes/HighContrastLargePrintInverse/48x48/emblems/Makefile
-icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/Makefile
-icon-themes/HighContrastLargePrintInverse/48x48/places/Makefile
-icon-themes/HighContrastLargePrintInverse/48x48/status/Makefile
-icon-themes/HighContrast-SVG/Makefile
-icon-themes/HighContrast-SVG/48x48/Makefile
-icon-themes/HighContrast-SVG/48x48/animations/Makefile
-icon-themes/HighContrast-SVG/scalable/Makefile
-icon-themes/HighContrast-SVG/scalable/actions/Makefile
-icon-themes/HighContrast-SVG/scalable/apps/Makefile
-icon-themes/HighContrast-SVG/scalable/categories/Makefile
-icon-themes/HighContrast-SVG/scalable/devices/Makefile
-icon-themes/HighContrast-SVG/scalable/emblems/Makefile
-icon-themes/HighContrast-SVG/scalable/emotes/Makefile
-icon-themes/HighContrast-SVG/scalable/mimetypes/Makefile
-icon-themes/HighContrast-SVG/scalable/places/Makefile
-icon-themes/HighContrast-SVG/scalable/status/Makefile
-icon-themes/HighContrast-SVG/scalable/actions-extra/Makefile
-icon-themes/HighContrast-SVG/scalable/apps-extra/Makefile
-icon-themes/HighContrast-SVG/scalable/categories-extra/Makefile
-icon-themes/HighContrast-SVG/scalable/devices-extra/Makefile
-icon-themes/HighContrast-SVG/scalable/emblems-extra/Makefile
-icon-themes/HighContrast-SVG/scalable/emotes-extra/Makefile
-icon-themes/HighContrast-SVG/scalable/mimetypes-extra/Makefile
-icon-themes/HighContrast-SVG/scalable/places-extra/Makefile
-icon-themes/HighContrast-SVG/scalable/status-extra/Makefile
+icon-themes/ContrastHigh/Makefile
+icon-themes/ContrastHighInverse/Makefile
+icon-themes/ContrastHighLargePrint/Makefile
+icon-themes/ContrastHighLargePrint/36x36/Makefile
+icon-themes/ContrastHighLargePrint/36x36/animations/Makefile
+icon-themes/ContrastHighLargePrint/48x48/Makefile
+icon-themes/ContrastHighLargePrint/48x48/actions/Makefile
+icon-themes/ContrastHighLargePrint/48x48/apps/Makefile
+icon-themes/ContrastHighLargePrint/48x48/categories/Makefile
+icon-themes/ContrastHighLargePrint/48x48/devices/Makefile
+icon-themes/ContrastHighLargePrint/48x48/emblems/Makefile
+icon-themes/ContrastHighLargePrint/48x48/mimetypes/Makefile
+icon-themes/ContrastHighLargePrint/48x48/places/Makefile
+icon-themes/ContrastHighLargePrint/48x48/status/Makefile
+icon-themes/ContrastHighLargePrintInverse/Makefile
+icon-themes/ContrastHighLargePrintInverse/36x36/Makefile
+icon-themes/ContrastHighLargePrintInverse/36x36/animations/Makefile
+icon-themes/ContrastHighLargePrintInverse/48x48/Makefile
+icon-themes/ContrastHighLargePrintInverse/48x48/actions/Makefile
+icon-themes/ContrastHighLargePrintInverse/48x48/apps/Makefile
+icon-themes/ContrastHighLargePrintInverse/48x48/categories/Makefile
+icon-themes/ContrastHighLargePrintInverse/48x48/devices/Makefile
+icon-themes/ContrastHighLargePrintInverse/48x48/emblems/Makefile
+icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/Makefile
+icon-themes/ContrastHighLargePrintInverse/48x48/places/Makefile
+icon-themes/ContrastHighLargePrintInverse/48x48/status/Makefile
+icon-themes/ContrastHigh-SVG/Makefile
+icon-themes/ContrastHigh-SVG/48x48/Makefile
+icon-themes/ContrastHigh-SVG/48x48/animations/Makefile
+icon-themes/ContrastHigh-SVG/scalable/Makefile
+icon-themes/ContrastHigh-SVG/scalable/actions/Makefile
+icon-themes/ContrastHigh-SVG/scalable/apps/Makefile
+icon-themes/ContrastHigh-SVG/scalable/categories/Makefile
+icon-themes/ContrastHigh-SVG/scalable/devices/Makefile
+icon-themes/ContrastHigh-SVG/scalable/emblems/Makefile
+icon-themes/ContrastHigh-SVG/scalable/emotes/Makefile
+icon-themes/ContrastHigh-SVG/scalable/mimetypes/Makefile
+icon-themes/ContrastHigh-SVG/scalable/places/Makefile
+icon-themes/ContrastHigh-SVG/scalable/status/Makefile
+icon-themes/ContrastHigh-SVG/scalable/actions-extra/Makefile
+icon-themes/ContrastHigh-SVG/scalable/apps-extra/Makefile
+icon-themes/ContrastHigh-SVG/scalable/categories-extra/Makefile
+icon-themes/ContrastHigh-SVG/scalable/devices-extra/Makefile
+icon-themes/ContrastHigh-SVG/scalable/emblems-extra/Makefile
+icon-themes/ContrastHigh-SVG/scalable/emotes-extra/Makefile
+icon-themes/ContrastHigh-SVG/scalable/mimetypes-extra/Makefile
+icon-themes/ContrastHigh-SVG/scalable/places-extra/Makefile
+icon-themes/ContrastHigh-SVG/scalable/status-extra/Makefile
 icon-themes/LargePrint/Makefile
 icon-themes/Fog/22x22/status/Makefile
 icon-themes/Fog/22x22/devices/Makefile
diff --git a/desktop-themes/HighContrast/Makefile.am b/desktop-themes/ContrastHigh/Makefile.am
index b8eee175..a2ac5dde 100644
--- a/desktop-themes/HighContrast/Makefile.am
+++ b/desktop-themes/ContrastHigh/Makefile.am
@@ -1,4 +1,4 @@
-THEME_NAME=HighContrast
+THEME_NAME=ContrastHigh
 THEME_IN_FILES=index.theme.in
 
 @INTLTOOL_THEME_RULE@ 
diff --git a/desktop-themes/HighContrast/index.theme.in b/desktop-themes/ContrastHigh/index.theme.in
index a2319857..6ccd44a0 100644
--- a/desktop-themes/HighContrast/index.theme.in
+++ b/desktop-themes/ContrastHigh/index.theme.in
@@ -5,6 +5,6 @@ _Comment=Black-on-white text and icons
 Encoding=UTF-8
 
 [X-GNOME-Metatheme]
-GtkTheme=HighContrast
-IconTheme=HighContrast
+GtkTheme=ContrastHigh
+IconTheme=ContrastHigh
 MetacityTheme=Atlanta
diff --git a/desktop-themes/HighContrastInverse/Makefile.am b/desktop-themes/ContrastHighInverse/Makefile.am
index 1468c5f2..7ca5ae9b 100644
--- a/desktop-themes/HighContrastInverse/Makefile.am
+++ b/desktop-themes/ContrastHighInverse/Makefile.am
@@ -1,4 +1,4 @@
-THEME_NAME=HighContrastInverse
+THEME_NAME=ContrastHighInverse
 THEME_IN_FILES=index.theme.in
 
 @INTLTOOL_THEME_RULE@ 
diff --git a/desktop-themes/HighContrastInverse/index.theme.in b/desktop-themes/ContrastHighInverse/index.theme.in
index cf292c64..81a7317c 100644
--- a/desktop-themes/HighContrastInverse/index.theme.in
+++ b/desktop-themes/ContrastHighInverse/index.theme.in
@@ -5,6 +5,6 @@ _Comment=White-on-black text and icons
 Encoding=UTF-8
 
 [X-GNOME-Metatheme]
-GtkTheme=HighContrastInverse
-IconTheme=HighContrastInverse
+GtkTheme=ContrastHighInverse
+IconTheme=ContrastHighInverse
 MetacityTheme=Atlanta
diff --git a/desktop-themes/HighContrastLargePrint/Makefile.am b/desktop-themes/ContrastHighLargePrint/Makefile.am
index d1200b6c..889d2d23 100644
--- a/desktop-themes/HighContrastLargePrint/Makefile.am
+++ b/desktop-themes/ContrastHighLargePrint/Makefile.am
@@ -1,4 +1,4 @@
-THEME_NAME=HighContrastLargePrint
+THEME_NAME=ContrastHighLargePrint
 THEME_IN_FILES=index.theme.in
 
 @INTLTOOL_THEME_RULE@ 
diff --git a/desktop-themes/HighContrastLargePrint/index.theme.in.in b/desktop-themes/ContrastHighLargePrint/index.theme.in.in
index 1a5c55a5..86e8cc54 100644
--- a/desktop-themes/HighContrastLargePrint/index.theme.in.in
+++ b/desktop-themes/ContrastHighLargePrint/index.theme.in.in
@@ -5,8 +5,8 @@ _Comment=Large black-on-white text and icons
 Encoding=UTF-8
 
 [X-GNOME-Metatheme]
-GtkTheme=HighContrastLargePrint
-IconTheme=HighContrast
+GtkTheme=ContrastHighLargePrint
+IconTheme=ContrastHigh
 MetacityTheme=Atlanta
 ApplicationFont=@LARGEPRINT_FONT@
 DocumentsFont=@LARGEPRINT_DOCUMENTS_FONT@
diff --git a/desktop-themes/HighContrastLargePrintInverse/Makefile.am b/desktop-themes/ContrastHighLargePrintInverse/Makefile.am
index 808ebd49..92dfe813 100644
--- a/desktop-themes/HighContrastLargePrintInverse/Makefile.am
+++ b/desktop-themes/ContrastHighLargePrintInverse/Makefile.am
@@ -1,4 +1,4 @@
-THEME_NAME=HighContrastLargePrintInverse
+THEME_NAME=ContrastHighLargePrintInverse
 THEME_IN_FILES=index.theme.in
 
 @INTLTOOL_THEME_RULE@ 
diff --git a/desktop-themes/HighContrastLargePrintInverse/index.theme.in.in b/desktop-themes/ContrastHighLargePrintInverse/index.theme.in.in
index e54a48d2..f8a57065 100644
--- a/desktop-themes/HighContrastLargePrintInverse/index.theme.in.in
+++ b/desktop-themes/ContrastHighLargePrintInverse/index.theme.in.in
@@ -5,8 +5,8 @@ _Comment=Large white-on-black text and icons
 Encoding=UTF-8
 
 [X-GNOME-Metatheme]
-GtkTheme=HighContrastLargePrintInverse
-IconTheme=HighContrastLargePrintInverse
+GtkTheme=ContrastHighLargePrintInverse
+IconTheme=ContrastHighLargePrintInverse
 MetacityTheme=Atlanta
 ApplicationFont=@LARGEPRINT_FONT@
 DocumentsFont=@LARGEPRINT_DOCUMENTS_FONT@
diff --git a/desktop-themes/Makefile.am b/desktop-themes/Makefile.am
index e63fd2a1..b55367e0 100644
--- a/desktop-themes/Makefile.am
+++ b/desktop-themes/Makefile.am
@@ -4,10 +4,10 @@ SUBDIRS = \
 	TraditionalOk \
 	Glider \
 	Shiny \
-	HighContrast \
-	HighContrastInverse \
-	HighContrastLargePrint \
-	HighContrastLargePrintInverse \
+	ContrastHigh \
+	ContrastHighInverse \
+	ContrastHighLargePrint \
+	ContrastHighLargePrintInverse \
 	LargePrint \
 	LowContrast \
 	LowContrastLargePrint \
@@ -20,10 +20,10 @@ DIST_SUBDIRS = \
 	TraditionalOk \
 	Glider \
 	Shiny \
-	HighContrast \
-	HighContrastInverse \
-	HighContrastLargePrint \
-	HighContrastLargePrintInverse \
+	ContrastHigh \
+	ContrastHighInverse \
+	ContrastHighLargePrint \
+	ContrastHighLargePrintInverse \
 	LargePrint \
 	LowContrast \
 	LowContrastLargePrint \
diff --git a/gtk-themes/ContrastHigh/Makefile.am b/gtk-themes/ContrastHigh/Makefile.am
new file mode 100644
index 00000000..ad1bfcf8
--- /dev/null
+++ b/gtk-themes/ContrastHigh/Makefile.am
@@ -0,0 +1,5 @@
+themedir = $(datadir)/themes/ContrastHigh/gtk-2.0
+
+theme_DATA = gtkrc
+
+EXTRA_DIST= $(theme_DATA)
diff --git a/gtk-themes/HighContrast/gtkrc.in b/gtk-themes/ContrastHigh/gtkrc.in
index 062586b1..8828f3ac 100644
--- a/gtk-themes/HighContrast/gtkrc.in
+++ b/gtk-themes/ContrastHigh/gtkrc.in
@@ -6,7 +6,7 @@
 #
 # High-contrast pixmap icons by jimmac with input from tigert.
 
-pixmap_path "@prefix@/share/themes/HighContrastLargePrint/pixmaps"
+pixmap_path "@prefix@/share/themes/ContrastHighLargePrint/pixmaps"
 
 #TODO: move sun-jds style downstream
 style "sun-jds"
diff --git a/gtk-themes/ContrastHighInverse/Makefile.am b/gtk-themes/ContrastHighInverse/Makefile.am
new file mode 100644
index 00000000..eb9e8504
--- /dev/null
+++ b/gtk-themes/ContrastHighInverse/Makefile.am
@@ -0,0 +1,5 @@
+themedir = $(datadir)/themes/ContrastHighInverse/gtk-2.0
+
+theme_DATA = gtkrc
+
+EXTRA_DIST= $(theme_DATA)
diff --git a/gtk-themes/HighContrastInverse/gtkrc.in b/gtk-themes/ContrastHighInverse/gtkrc.in
index 736fdde3..7c574be0 100755
--- a/gtk-themes/HighContrastInverse/gtkrc.in
+++ b/gtk-themes/ContrastHighInverse/gtkrc.in
@@ -9,7 +9,7 @@
 #Note: we just use the LargePrint icons for now, they will be scaled
 #to the correct size
 
-pixmap_path "@prefix@/share/themes/HighContrastLargePrintInverse/pixmaps"
+pixmap_path "@prefix@/share/themes/ContrastHighLargePrintInverse/pixmaps"
 
 #TODO: move sun-jds style downstream
 style "sun-jds"
diff --git a/gtk-themes/HighContrastLargePrint/Makefile.am b/gtk-themes/ContrastHighLargePrint/Makefile.am
index f88ba7b4..7b4645bf 100644
--- a/gtk-themes/HighContrastLargePrint/Makefile.am
+++ b/gtk-themes/ContrastHighLargePrint/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/HighContrastLargePrint/gtk-2.0
+themedir = $(datadir)/themes/ContrastHighLargePrint/gtk-2.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/HighContrastLargePrint/gtkrc.in b/gtk-themes/ContrastHighLargePrint/gtkrc.in
index 89c7076a..3b69523f 100644
--- a/gtk-themes/HighContrastLargePrint/gtkrc.in
+++ b/gtk-themes/ContrastHighLargePrint/gtkrc.in
@@ -6,7 +6,7 @@
 #
 # High-contrast pixmap icons by jimmac with input from tigert.
 
-pixmap_path "@prefix@/share/themes/HighContrastLargePrint/pixmaps"
+pixmap_path "@prefix@/share/themes/ContrastHighLargePrint/pixmaps"
 
 gtk-icon-sizes = "@LARGEPRINT_ICON_SIZES@"
 
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/Makefile.am b/gtk-themes/ContrastHighLargePrint/pixmaps/Makefile.am
index eb811b4a..abaa9ed7 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/Makefile.am
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/Makefile.am
@@ -1,4 +1,4 @@
-pixmapdir=	$(datadir)/themes/HighContrastLargePrint/pixmaps
+pixmapdir=	$(datadir)/themes/ContrastHighLargePrint/pixmaps
 
 EXTRA_DIST=	$(pixmap_DATA)
 
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/double-click-maybe.png b/gtk-themes/ContrastHighLargePrint/pixmaps/double-click-maybe.png
index 1e8541d8..1e8541d8 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/double-click-maybe.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/double-click-maybe.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/double-click-off.png b/gtk-themes/ContrastHighLargePrint/pixmaps/double-click-off.png
index ff650ab2..ff650ab2 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/double-click-off.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/double-click-off.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/double-click-on.png b/gtk-themes/ContrastHighLargePrint/pixmaps/double-click-on.png
index 964af33b..964af33b 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/double-click-on.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/double-click-on.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/marco-delete.png b/gtk-themes/ContrastHighLargePrint/pixmaps/marco-delete.png
index a892881e..a892881e 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/marco-delete.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/marco-delete.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/marco-maximize.png b/gtk-themes/ContrastHighLargePrint/pixmaps/marco-maximize.png
index a7ea887e..a7ea887e 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/marco-maximize.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/marco-maximize.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/marco-minimize.png b/gtk-themes/ContrastHighLargePrint/pixmaps/marco-minimize.png
index 40ee085c..40ee085c 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/marco-minimize.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/marco-minimize.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/media-backward.png b/gtk-themes/ContrastHighLargePrint/pixmaps/media-backward.png
index c7ac2e93..c7ac2e93 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/media-backward.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/media-backward.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/media-eject.png b/gtk-themes/ContrastHighLargePrint/pixmaps/media-eject.png
index 97b693b9..97b693b9 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/media-eject.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/media-eject.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/media-forward.png b/gtk-themes/ContrastHighLargePrint/pixmaps/media-forward.png
index 8f170632..8f170632 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/media-forward.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/media-forward.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/media-next.png b/gtk-themes/ContrastHighLargePrint/pixmaps/media-next.png
index eb3483fc..eb3483fc 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/media-next.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/media-next.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/media-pause.png b/gtk-themes/ContrastHighLargePrint/pixmaps/media-pause.png
index 2037d54f..2037d54f 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/media-pause.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/media-pause.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/media-play.png b/gtk-themes/ContrastHighLargePrint/pixmaps/media-play.png
index 2090665c..2090665c 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/media-play.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/media-play.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/media-prev.png b/gtk-themes/ContrastHighLargePrint/pixmaps/media-prev.png
index 2a3de2d3..2a3de2d3 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/media-prev.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/media-prev.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/media-record.png b/gtk-themes/ContrastHighLargePrint/pixmaps/media-record.png
index e3bfe694..e3bfe694 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/media-record.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/media-record.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/media-stop.png b/gtk-themes/ContrastHighLargePrint/pixmaps/media-stop.png
index 1bac2223..1bac2223 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/media-stop.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/media-stop.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/printer-broken.png b/gtk-themes/ContrastHighLargePrint/pixmaps/printer-broken.png
index dc1930c0..dc1930c0 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/printer-broken.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/printer-broken.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/printer-default.png b/gtk-themes/ContrastHighLargePrint/pixmaps/printer-default.png
index 30e62aac..30e62aac 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/printer-default.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/printer-default.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/printer-inkjet.png b/gtk-themes/ContrastHighLargePrint/pixmaps/printer-inkjet.png
index 95dffd70..95dffd70 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/printer-inkjet.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/printer-inkjet.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/printer-personal-laser.png b/gtk-themes/ContrastHighLargePrint/pixmaps/printer-personal-laser.png
index 95dffd70..95dffd70 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/printer-personal-laser.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/printer-personal-laser.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/printer-workgroup-laser.png b/gtk-themes/ContrastHighLargePrint/pixmaps/printer-workgroup-laser.png
index 95dffd70..95dffd70 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/printer-workgroup-laser.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/printer-workgroup-laser.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_about.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_about.png
index 63ac5817..63ac5817 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_about.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_about.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_accessories.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_accessories.png
index 4a145e72..4a145e72 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_accessories.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_accessories.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_add.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_add.png
index 8ce4d80d..8ce4d80d 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_add.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_add.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_amusements.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_amusements.png
index a7bb13fd..a7bb13fd 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_amusements.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_amusements.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_apply.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_apply.png
index 96272201..96272201 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_apply.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_apply.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_attach.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_attach.png
index df26952a..df26952a 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_attach.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_attach.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_bold.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_bold.png
index fa7a4032..fa7a4032 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_bold.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_bold.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_book.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_book.png
index 06a9f6e5..06a9f6e5 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_book.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_book.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_cancel.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_cancel.png
index a892881e..a892881e 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_cancel.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_cancel.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_cde-menu.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_cde-menu.png
index 4efb3a6c..4efb3a6c 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_cde-menu.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_cde-menu.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_cdrom.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_cdrom.png
index 3f9dd8b7..3f9dd8b7 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_cdrom.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_cdrom.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_clear.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_clear.png
index c15ed26e..c15ed26e 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_clear.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_clear.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_close.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_close.png
index a892881e..a892881e 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_close.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_close.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_commandline-browser.xpm b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_commandline-browser.xpm
index f2935a11..f2935a11 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_commandline-browser.xpm
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_commandline-browser.xpm
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_commandline-history.xpm b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_commandline-history.xpm
index d1eb5300..d1eb5300 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_commandline-history.xpm
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_commandline-history.xpm
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_connect.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_connect.png
index c4cd64f3..c4cd64f3 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_connect.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_connect.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_convert.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_convert.png
index 1a20adfa..1a20adfa 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_convert.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_convert.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_copy.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_copy.png
index dc69b292..dc69b292 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_copy.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_copy.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_cut.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_cut.png
index 058ecbbb..058ecbbb 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_cut.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_cut.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_delete.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_delete.png
index 578d0040..578d0040 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_delete.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_delete.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_dialog_error.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_dialog_error.png
index 5667287d..5667287d 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_dialog_error.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_dialog_error.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_dialog_info.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_dialog_info.png
index 10bb32c6..10bb32c6 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_dialog_info.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_dialog_info.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_dialog_question.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_dialog_question.png
index 6f9b46cc..6f9b46cc 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_dialog_question.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_dialog_question.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_dialog_warning.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_dialog_warning.png
index c92abfa5..c92abfa5 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_dialog_warning.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_dialog_warning.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_disconnect.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_disconnect.png
index 4e7e77f8..4e7e77f8 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_disconnect.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_disconnect.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_dnd.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_dnd.png
index eff57a6c..eff57a6c 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_dnd.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_dnd.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_dnd_multiple.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_dnd_multiple.png
index 3073c0b9..3073c0b9 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_dnd_multiple.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_dnd_multiple.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_drawer.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_drawer.png
index 7e382e53..7e382e53 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_drawer.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_drawer.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_edit.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_edit.png
index b0dbb8b6..b0dbb8b6 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_edit.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_edit.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_empty.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_empty.png
index d0b297e4..d0b297e4 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_empty.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_empty.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_execute.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_execute.png
index 166939f5..166939f5 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_execute.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_execute.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_export.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_export.png
index 0090ac83..0090ac83 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_export.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_export.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_find-and-replace.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_find-and-replace.png
index 8a8b513a..8a8b513a 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_find-and-replace.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_find-and-replace.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_find.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_find.png
index 609ff8fd..609ff8fd 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_find.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_find.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_floppy.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_floppy.png
index a1627c7b..a1627c7b 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_floppy.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_floppy.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_go-back.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_go-back.png
index fdeada4b..fdeada4b 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_go-back.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_go-back.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_go-down.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_go-down.png
index fae93491..fae93491 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_go-down.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_go-down.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_go-forward.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_go-forward.png
index 97b88184..97b88184 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_go-forward.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_go-forward.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_go-up.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_go-up.png
index ae4e04df..ae4e04df 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_go-up.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_go-up.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_goto-bottom.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_goto-bottom.png
index d2ec9aaf..d2ec9aaf 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_goto-bottom.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_goto-bottom.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_goto-first.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_goto-first.png
index fcc08e84..fcc08e84 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_goto-first.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_goto-first.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_goto-last.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_goto-last.png
index 7d98c621..7d98c621 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_goto-last.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_goto-last.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_goto-top.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_goto-top.png
index 704eeb68..704eeb68 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_goto-top.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_goto-top.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_harddisk.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_harddisk.png
index 83f72cc3..83f72cc3 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_harddisk.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_harddisk.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_help.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_help.png
index 87c51688..87c51688 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_help.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_help.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_home.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_home.png
index 1e6916f5..1e6916f5 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_home.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_home.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_import.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_import.png
index 3a6e48d1..3a6e48d1 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_import.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_import.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_index.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_index.png
index fb24b2fc..fb24b2fc 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_index.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_index.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_info.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_info.png
index 7a353d9e..7a353d9e 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_info.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_info.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_insert-image.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_insert-image.png
index 1ee8dd19..1ee8dd19 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_insert-image.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_insert-image.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_insert-object.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_insert-object.png
index bd36c61c..bd36c61c 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_insert-object.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_insert-object.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_insert-table.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_insert-table.png
index 51b6fa9b..51b6fa9b 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_insert-table.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_insert-table.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_internet.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_internet.png
index 2d157480..2d157480 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_internet.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_internet.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_italic.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_italic.png
index 98612a88..98612a88 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_italic.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_italic.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_jump-to.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_jump-to.png
index bd7b62fb..bd7b62fb 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_jump-to.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_jump-to.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_justify-center.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_justify-center.png
index 51ffd7b1..51ffd7b1 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_justify-center.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_justify-center.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_justify-fill.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_justify-fill.png
index c91c0d2f..c91c0d2f 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_justify-fill.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_justify-fill.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_justify-left.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_justify-left.png
index 42a0d527..42a0d527 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_justify-left.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_justify-left.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_justify-right.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_justify-right.png
index be99964e..be99964e 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_justify-right.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_justify-right.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_launcher-program.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_launcher-program.png
index 7996e411..7996e411 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_launcher-program.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_launcher-program.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_line-in.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_line-in.png
index 4c549b0c..4c549b0c 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_line-in.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_line-in.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_lockscreen.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_lockscreen.png
index f0a9dd98..f0a9dd98 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_lockscreen.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_lockscreen.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_logout.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_logout.png
index 80408ced..80408ced 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_logout.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_logout.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_mate-logo.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_mate-logo.png
index ef68b39d..ef68b39d 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_mate-logo.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_mate-logo.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_mate-util.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_mate-util.png
index f26e2ea4..f26e2ea4 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_mate-util.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_mate-util.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_mic.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_mic.png
index dc7ec699..dc7ec699 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_mic.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_mic.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_missing-image.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_missing-image.png
index 1f152a74..1f152a74 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_missing-image.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_missing-image.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_multimedia.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_multimedia.png
index 2f47deb6..2f47deb6 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_multimedia.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_multimedia.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_new.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_new.png
index a53ef5ce..a53ef5ce 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_new.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_new.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_no.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_no.png
index a892881e..a892881e 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_no.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_no.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_ok.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_ok.png
index 96272201..96272201 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_ok.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_ok.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_open.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_open.png
index 03b025c6..03b025c6 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_open.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_open.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_paste.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_paste.png
index 0b3c98b2..0b3c98b2 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_paste.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_paste.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_preferences.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_preferences.png
index 0d2e0e86..0d2e0e86 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_preferences.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_preferences.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_print-preview.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_print-preview.png
index b9064f51..b9064f51 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_print-preview.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_print-preview.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_print.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_print.png
index 7e165220..7e165220 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_print.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_print.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_properties.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_properties.png
index bb456325..bb456325 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_properties.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_properties.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_quit.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_quit.png
index 30e131ac..30e131ac 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_quit.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_quit.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_redo.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_redo.png
index 058995cf..058995cf 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_redo.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_redo.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_refresh.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_refresh.png
index bd5d9ed8..bd5d9ed8 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_refresh.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_refresh.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_remove.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_remove.png
index 8016adfd..8016adfd 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_remove.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_remove.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_revert-to-saved.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_revert-to-saved.png
index 9564dcad..9564dcad 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_revert-to-saved.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_revert-to-saved.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_run.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_run.png
index f9bb92c0..f9bb92c0 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_run.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_run.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_save-as.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_save-as.png
index bb3221e9..bb3221e9 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_save-as.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_save-as.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_save.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_save.png
index a1627c7b..a1627c7b 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_save.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_save.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_screenshot.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_screenshot.png
index 719a0a08..719a0a08 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_screenshot.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_screenshot.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_searchtool.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_searchtool.png
index 1b0d3bcb..1b0d3bcb 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_searchtool.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_searchtool.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_select-color.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_select-color.png
index 25fdfa77..25fdfa77 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_select-color.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_select-color.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_select-font.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_select-font.png
index 98b82c43..98b82c43 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_select-font.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_select-font.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_sort-ascending.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_sort-ascending.png
index 84ef53d1..84ef53d1 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_sort-ascending.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_sort-ascending.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_sort-descending.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_sort-descending.png
index 81c82192..81c82192 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_sort-descending.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_sort-descending.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_spell-check.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_spell-check.png
index 3f88cd2b..3f88cd2b 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_spell-check.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_spell-check.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_stop.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_stop.png
index d367997a..d367997a 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_stop.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_stop.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_strikethrough.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_strikethrough.png
index 6ad769df..6ad769df 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_strikethrough.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_strikethrough.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_undelete.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_undelete.png
index a1bb50a6..a1bb50a6 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_undelete.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_undelete.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_underline.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_underline.png
index dac61b97..dac61b97 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_underline.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_underline.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_undo.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_undo.png
index 842e7530..842e7530 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_undo.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_undo.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_volume.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_volume.png
index b5ceeccd..b5ceeccd 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_volume.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_volume.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_yes.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_yes.png
index 96272201..96272201 100644
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_yes.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_yes.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_zoom-100.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_zoom-100.png
index 27379ef7..27379ef7 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_zoom-100.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_zoom-100.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_zoom-fit.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_zoom-fit.png
index 1fce5604..1fce5604 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_zoom-fit.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_zoom-fit.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_zoom-in.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_zoom-in.png
index 0d551057..0d551057 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_zoom-in.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_zoom-in.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/stock_zoom-out.png b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_zoom-out.png
index 84289876..84289876 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/stock_zoom-out.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/stock_zoom-out.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/volume-max.png b/gtk-themes/ContrastHighLargePrint/pixmaps/volume-max.png
index e5b59fa5..e5b59fa5 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/volume-max.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/volume-max.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/volume-medium.png b/gtk-themes/ContrastHighLargePrint/pixmaps/volume-medium.png
index 1fbc2cba..1fbc2cba 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/volume-medium.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/volume-medium.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/volume-min.png b/gtk-themes/ContrastHighLargePrint/pixmaps/volume-min.png
index 9e6c5759..9e6c5759 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/volume-min.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/volume-min.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/volume-mute.png b/gtk-themes/ContrastHighLargePrint/pixmaps/volume-mute.png
index 8d7a8eaa..8d7a8eaa 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/volume-mute.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/volume-mute.png
diff --git a/gtk-themes/HighContrastLargePrint/pixmaps/volume-zero.png b/gtk-themes/ContrastHighLargePrint/pixmaps/volume-zero.png
index 5a4dbc2b..5a4dbc2b 100755
--- a/gtk-themes/HighContrastLargePrint/pixmaps/volume-zero.png
+++ b/gtk-themes/ContrastHighLargePrint/pixmaps/volume-zero.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/Makefile.am b/gtk-themes/ContrastHighLargePrintInverse/Makefile.am
index 4338caa9..20e49cb1 100644
--- a/gtk-themes/HighContrastLargePrintInverse/Makefile.am
+++ b/gtk-themes/ContrastHighLargePrintInverse/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/HighContrastLargePrintInverse/gtk-2.0
+themedir = $(datadir)/themes/ContrastHighLargePrintInverse/gtk-2.0
 
 theme_DATA = gtkrc
 
diff --git a/gtk-themes/HighContrastLargePrintInverse/gtkrc.in b/gtk-themes/ContrastHighLargePrintInverse/gtkrc.in
index f3b57da7..dd4d3ece 100755
--- a/gtk-themes/HighContrastLargePrintInverse/gtkrc.in
+++ b/gtk-themes/ContrastHighLargePrintInverse/gtkrc.in
@@ -6,7 +6,7 @@
 #
 # High-contrast pixmap icons by jimmac with input from tigert.
 
-pixmap_path "@prefix@/share/themes/HighContrastLargePrintInverse/pixmaps"
+pixmap_path "@prefix@/share/themes/ContrastHighLargePrintInverse/pixmaps"
 
 gtk-icon-sizes = "@LARGEPRINT_ICON_SIZES@"
 
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/Makefile.am b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/Makefile.am
index fc4dee72..27b8a1fd 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/Makefile.am
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/Makefile.am
@@ -1,4 +1,4 @@
-pixmapdir=	$(datadir)/themes/HighContrastLargePrintInverse/pixmaps
+pixmapdir=	$(datadir)/themes/ContrastHighLargePrintInverse/pixmaps
 
 EXTRA_DIST=	$(pixmap_DATA)
 
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/double-click-maybe.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/double-click-maybe.png
index e776cbac..e776cbac 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/double-click-maybe.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/double-click-maybe.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/double-click-off.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/double-click-off.png
index 418db8b7..418db8b7 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/double-click-off.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/double-click-off.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/double-click-on.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/double-click-on.png
index c9ba34a5..c9ba34a5 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/double-click-on.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/double-click-on.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/marco-delete.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/marco-delete.png
index b2f69aa1..b2f69aa1 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/marco-delete.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/marco-delete.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/marco-maximize.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/marco-maximize.png
index ffacacc4..ffacacc4 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/marco-maximize.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/marco-maximize.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/marco-minimize.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/marco-minimize.png
index 9e283409..9e283409 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/marco-minimize.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/marco-minimize.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-backward.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-backward.png
index d62926e6..d62926e6 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-backward.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-backward.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-eject.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-eject.png
index 2d72a5fa..2d72a5fa 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-eject.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-eject.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-forward.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-forward.png
index 8643b914..8643b914 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-forward.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-forward.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-next.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-next.png
index 58c63a85..58c63a85 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-next.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-next.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-pause.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-pause.png
index 70d17d1b..70d17d1b 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-pause.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-pause.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-play.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-play.png
index 24b797d3..24b797d3 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-play.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-play.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-prev.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-prev.png
index d0cf74cf..d0cf74cf 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-prev.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-prev.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-record.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-record.png
index a83915c6..a83915c6 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-record.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-record.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-stop.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-stop.png
index 7ab1051b..7ab1051b 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/media-stop.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/media-stop.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/printer-broken.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/printer-broken.png
index cbcd5480..cbcd5480 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/printer-broken.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/printer-broken.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/printer-default.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/printer-default.png
index f2eb8b59..f2eb8b59 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/printer-default.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/printer-default.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/printer-inkjet.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/printer-inkjet.png
index 0d3ffe43..0d3ffe43 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/printer-inkjet.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/printer-inkjet.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/printer-personal-laser.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/printer-personal-laser.png
index f7800534..f7800534 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/printer-personal-laser.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/printer-personal-laser.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/printer-workgroup-laser.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/printer-workgroup-laser.png
index 534db451..534db451 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/printer-workgroup-laser.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/printer-workgroup-laser.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_about.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_about.png
index f0b3235d..f0b3235d 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_about.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_about.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_accessories.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_accessories.png
index 8cecf42c..8cecf42c 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_accessories.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_accessories.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_add.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_add.png
index 5123745a..5123745a 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_add.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_add.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_amusements.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_amusements.png
index a7bb13fd..a7bb13fd 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_amusements.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_amusements.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_apply.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_apply.png
index f5eceb2f..f5eceb2f 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_apply.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_apply.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_attach.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_attach.png
index 45b7bbcd..45b7bbcd 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_attach.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_attach.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_bold.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_bold.png
index 14abb2e6..14abb2e6 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_bold.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_bold.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_book.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_book.png
index b5d0f299..b5d0f299 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_book.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_book.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_cancel.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_cancel.png
index b2f69aa1..b2f69aa1 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_cancel.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_cancel.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_cde-menu.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_cde-menu.png
index 6f23299d..6f23299d 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_cde-menu.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_cde-menu.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_cdrom.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_cdrom.png
index 0edc5919..0edc5919 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_cdrom.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_cdrom.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_clear.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_clear.png
index 6f68d267..6f68d267 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_clear.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_clear.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_close.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_close.png
index b2f69aa1..b2f69aa1 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_close.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_close.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_commandline-browser.xpm b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_commandline-browser.xpm
index 00b8f23a..00b8f23a 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_commandline-browser.xpm
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_commandline-browser.xpm
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_commandline-history.xpm b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_commandline-history.xpm
index 875a6b3a..875a6b3a 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_commandline-history.xpm
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_commandline-history.xpm
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_connect.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_connect.png
index 65a018a5..65a018a5 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_connect.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_connect.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_convert.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_convert.png
index eb773acd..eb773acd 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_convert.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_convert.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_copy.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_copy.png
index d465318e..d465318e 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_copy.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_copy.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_cut.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_cut.png
index d90a0999..d90a0999 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_cut.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_cut.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_delete.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_delete.png
index 74fcdf7d..74fcdf7d 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_delete.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_delete.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_dialog_error.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_dialog_error.png
index d0eb2267..d0eb2267 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_dialog_error.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_dialog_error.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_dialog_info.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_dialog_info.png
index 60f08e7a..60f08e7a 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_dialog_info.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_dialog_info.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_dialog_question.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_dialog_question.png
index 0e792ba3..0e792ba3 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_dialog_question.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_dialog_question.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_dialog_warning.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_dialog_warning.png
index 31b218d1..31b218d1 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_dialog_warning.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_dialog_warning.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_disconnect.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_disconnect.png
index 238d9430..238d9430 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_disconnect.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_disconnect.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_dnd.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_dnd.png
index c0a3c01a..c0a3c01a 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_dnd.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_dnd.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_dnd_multiple.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_dnd_multiple.png
index 98348a25..98348a25 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_dnd_multiple.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_dnd_multiple.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_drawer.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_drawer.png
index 96220265..96220265 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_drawer.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_drawer.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_edit.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_edit.png
index 46ca3701..46ca3701 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_edit.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_edit.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_empty.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_empty.png
index 31969a44..31969a44 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_empty.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_empty.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_execute.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_execute.png
index cb9461f8..cb9461f8 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_execute.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_execute.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_export.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_export.png
index c928149a..c928149a 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_export.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_export.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_find-and-replace.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_find-and-replace.png
index ffeb60cf..ffeb60cf 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_find-and-replace.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_find-and-replace.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_find.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_find.png
index 89e0c8ac..89e0c8ac 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_find.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_find.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_floppy.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_floppy.png
index cb7b3ba3..cb7b3ba3 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_floppy.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_floppy.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_go-back.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_go-back.png
index 916265b4..916265b4 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_go-back.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_go-back.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_go-down.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_go-down.png
index e650695b..e650695b 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_go-down.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_go-down.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_go-forward.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_go-forward.png
index 63ba5723..63ba5723 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_go-forward.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_go-forward.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_go-up.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_go-up.png
index 9b0d41bf..9b0d41bf 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_go-up.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_go-up.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_goto-bottom.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_goto-bottom.png
index 7c15a6b0..7c15a6b0 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_goto-bottom.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_goto-bottom.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_goto-first.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_goto-first.png
index 1ba9e5e5..1ba9e5e5 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_goto-first.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_goto-first.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_goto-last.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_goto-last.png
index 4ccb91b6..4ccb91b6 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_goto-last.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_goto-last.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_goto-top.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_goto-top.png
index 9d5317b5..9d5317b5 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_goto-top.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_goto-top.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_harddisk.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_harddisk.png
index 937ca439..937ca439 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_harddisk.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_harddisk.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_help.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_help.png
index bb875287..bb875287 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_help.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_help.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_home.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_home.png
index 0f669761..0f669761 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_home.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_home.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_import.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_import.png
index f49e8573..f49e8573 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_import.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_import.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_index.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_index.png
index 46286ef4..46286ef4 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_index.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_index.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_info.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_info.png
index a4b89df6..a4b89df6 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_info.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_info.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_insert-image.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_insert-image.png
index 70439f74..70439f74 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_insert-image.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_insert-image.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_insert-object.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_insert-object.png
index f2dfda46..f2dfda46 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_insert-object.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_insert-object.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_insert-table.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_insert-table.png
index 1a35df78..1a35df78 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_insert-table.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_insert-table.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_internet.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_internet.png
index bc9a5a91..bc9a5a91 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_internet.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_internet.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_italic.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_italic.png
index f8065487..f8065487 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_italic.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_italic.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_jump-to.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_jump-to.png
index b8296c39..b8296c39 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_jump-to.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_jump-to.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_justify-center.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_justify-center.png
index 9f98b919..9f98b919 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_justify-center.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_justify-center.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_justify-fill.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_justify-fill.png
index 33a2bfd3..33a2bfd3 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_justify-fill.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_justify-fill.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_justify-left.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_justify-left.png
index 5138e00c..5138e00c 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_justify-left.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_justify-left.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_justify-right.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_justify-right.png
index e89c0af1..e89c0af1 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_justify-right.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_justify-right.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_launcher-program.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_launcher-program.png
index 778c34d4..778c34d4 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_launcher-program.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_launcher-program.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_line-in.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_line-in.png
index 3b44ff10..3b44ff10 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_line-in.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_line-in.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_lockscreen.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_lockscreen.png
index ba1ced46..ba1ced46 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_lockscreen.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_lockscreen.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_logout.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_logout.png
index f55f1feb..f55f1feb 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_logout.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_logout.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_mate-logo.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_mate-logo.png
index ebafbf0f..ebafbf0f 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_mate-logo.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_mate-logo.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_mate-util.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_mate-util.png
index 611140f9..611140f9 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_mate-util.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_mate-util.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_mic.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_mic.png
index e87e12d7..e87e12d7 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_mic.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_mic.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_missing-image.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_missing-image.png
index 077de5b7..077de5b7 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_missing-image.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_missing-image.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_multimedia.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_multimedia.png
index 9a292a98..9a292a98 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_multimedia.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_multimedia.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_new.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_new.png
index aec40a31..aec40a31 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_new.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_new.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_no.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_no.png
index b2f69aa1..b2f69aa1 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_no.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_no.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_ok.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_ok.png
index f5eceb2f..f5eceb2f 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_ok.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_ok.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_open.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_open.png
index 7e5486f5..7e5486f5 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_open.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_open.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_paste.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_paste.png
index 94836722..94836722 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_paste.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_paste.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_preferences.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_preferences.png
index 08cae539..08cae539 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_preferences.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_preferences.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_print-preview.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_print-preview.png
index f34d4dc2..f34d4dc2 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_print-preview.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_print-preview.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_print.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_print.png
index 5b638d23..5b638d23 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_print.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_print.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_properties.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_properties.png
index cd3d6940..cd3d6940 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_properties.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_properties.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_quit.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_quit.png
index f1a055f3..f1a055f3 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_quit.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_quit.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_redo.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_redo.png
index 292eefc6..292eefc6 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_redo.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_redo.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_refresh.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_refresh.png
index 63679fdb..63679fdb 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_refresh.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_refresh.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_remove.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_remove.png
index 52c7a879..52c7a879 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_remove.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_remove.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_revert-to-saved.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_revert-to-saved.png
index 9f16adc4..9f16adc4 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_revert-to-saved.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_revert-to-saved.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_run.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_run.png
index 33a4fbac..33a4fbac 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_run.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_run.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_save-as.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_save-as.png
index ead822f1..ead822f1 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_save-as.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_save-as.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_save.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_save.png
index cb7b3ba3..cb7b3ba3 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_save.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_save.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_screenshot.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_screenshot.png
index 3aa4b30b..3aa4b30b 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_screenshot.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_screenshot.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_searchtool.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_searchtool.png
index 64c1cdac..64c1cdac 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_searchtool.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_searchtool.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_select-color.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_select-color.png
index f6347934..f6347934 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_select-color.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_select-color.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_select-font.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_select-font.png
index 7ae2e00e..7ae2e00e 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_select-font.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_select-font.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_sort-ascending.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_sort-ascending.png
index d92df958..d92df958 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_sort-ascending.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_sort-ascending.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_sort-descending.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_sort-descending.png
index 8e26b4c2..8e26b4c2 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_sort-descending.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_sort-descending.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_spell-check.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_spell-check.png
index 41126415..41126415 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_spell-check.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_spell-check.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_stop.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_stop.png
index cb9f0427..cb9f0427 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_stop.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_stop.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_strikethrough.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_strikethrough.png
index 11aca0bc..11aca0bc 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_strikethrough.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_strikethrough.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_undelete.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_undelete.png
index 80a7ba27..80a7ba27 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_undelete.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_undelete.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_underline.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_underline.png
index b8e15b8e..b8e15b8e 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_underline.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_underline.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_undo.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_undo.png
index ee061eda..ee061eda 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_undo.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_undo.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_volume.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_volume.png
index 982fc309..982fc309 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_volume.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_volume.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_yes.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_yes.png
index f5eceb2f..f5eceb2f 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_yes.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_yes.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_zoom-100.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_zoom-100.png
index 6cd2fa7e..6cd2fa7e 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_zoom-100.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_zoom-100.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_zoom-fit.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_zoom-fit.png
index 457c516d..457c516d 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_zoom-fit.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_zoom-fit.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_zoom-in.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_zoom-in.png
index f72c0bbb..f72c0bbb 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_zoom-in.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_zoom-in.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_zoom-out.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_zoom-out.png
index dd902879..dd902879 100755
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/stock_zoom-out.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/stock_zoom-out.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/volume-max.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/volume-max.png
index b71d0cae..b71d0cae 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/volume-max.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/volume-max.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/volume-medium.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/volume-medium.png
index b52e2432..b52e2432 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/volume-medium.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/volume-medium.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/volume-min.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/volume-min.png
index 18490db1..18490db1 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/volume-min.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/volume-min.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/volume-mute.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/volume-mute.png
index 1d0fa048..1d0fa048 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/volume-mute.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/volume-mute.png
diff --git a/gtk-themes/HighContrastLargePrintInverse/pixmaps/volume-zero.png b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/volume-zero.png
index 3d1f01d6..3d1f01d6 100644
--- a/gtk-themes/HighContrastLargePrintInverse/pixmaps/volume-zero.png
+++ b/gtk-themes/ContrastHighLargePrintInverse/pixmaps/volume-zero.png
diff --git a/gtk-themes/HighContrast/Makefile.am b/gtk-themes/HighContrast/Makefile.am
deleted file mode 100644
index 143ea777..00000000
--- a/gtk-themes/HighContrast/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-themedir = $(datadir)/themes/HighContrast/gtk-2.0
-
-theme_DATA = gtkrc
-
-EXTRA_DIST= $(theme_DATA)
diff --git a/gtk-themes/HighContrastInverse/Makefile.am b/gtk-themes/HighContrastInverse/Makefile.am
deleted file mode 100644
index fd52b180..00000000
--- a/gtk-themes/HighContrastInverse/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-themedir = $(datadir)/themes/HighContrastInverse/gtk-2.0
-
-theme_DATA = gtkrc
-
-EXTRA_DIST= $(theme_DATA)
diff --git a/gtk-themes/Makefile.am b/gtk-themes/Makefile.am
index e107d048..deb9dca2 100644
--- a/gtk-themes/Makefile.am
+++ b/gtk-themes/Makefile.am
@@ -2,11 +2,11 @@ SUBDIRS = \
 	Glider \
 	Shiny \
 	TraditionalOkClassic \
-	Simple \
-	HighContrast \
-	HighContrastInverse \
-	HighContrastLargePrint \
-	HighContrastLargePrintInverse \
+	Simply \
+	ContrastHigh \
+	ContrastHighInverse \
+	ContrastHighLargePrint \
+	ContrastHighLargePrintInverse \
 	Reverse \
 	LowContrast \
 	LowContrastLargePrint \
@@ -17,11 +17,11 @@ DIST_SUBDIRS = \
 	Glider \
 	Shiny \
 	TraditionalOkClassic \
-	Simple \
-	HighContrast \
-	HighContrastInverse \
-	HighContrastLargePrint \
-	HighContrastLargePrintInverse \
+	Simply \
+	ContrastHigh \
+	ContrastHighInverse \
+	ContrastHighLargePrint \
+	ContrastHighLargePrintInverse \
 	Reverse \
 	LowContrast \
 	LowContrastLargePrint \
diff --git a/icon-themes/HighContrast-SVG/48x48/Makefile.am b/icon-themes/ContrastHigh-SVG/48x48/Makefile.am
index 2d62aa1d..80f861b7 100644
--- a/icon-themes/HighContrast-SVG/48x48/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/48x48/Makefile.am
@@ -1,5 +1,5 @@
 
-themedir=	$(datadir)/icons/HighContrast-SVG/48x48
+themedir=	$(datadir)/icons/ContrastHigh-SVG/48x48
 
 SUBDIRS = animations
 
diff --git a/icon-themes/HighContrast-SVG/48x48/animations/Makefile.am b/icon-themes/ContrastHigh-SVG/48x48/animations/Makefile.am
index 49d76408..81cdf08a 100644
--- a/icon-themes/HighContrast-SVG/48x48/animations/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/48x48/animations/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = 48x48
 context = animations
 
diff --git a/icon-themes/HighContrast-SVG/48x48/animations/process-idle.png b/icon-themes/ContrastHigh-SVG/48x48/animations/process-idle.png
index b3f0685d..b3f0685d 100644
--- a/icon-themes/HighContrast-SVG/48x48/animations/process-idle.png
+++ b/icon-themes/ContrastHigh-SVG/48x48/animations/process-idle.png
diff --git a/icon-themes/HighContrast-SVG/48x48/animations/process-working.png b/icon-themes/ContrastHigh-SVG/48x48/animations/process-working.png
index ec9d0af4..ec9d0af4 100644
--- a/icon-themes/HighContrast-SVG/48x48/animations/process-working.png
+++ b/icon-themes/ContrastHigh-SVG/48x48/animations/process-working.png
diff --git a/icon-themes/HighContrast-SVG/Makefile.am b/icon-themes/ContrastHigh-SVG/Makefile.am
index 82de2aaa..ab0c74f6 100644
--- a/icon-themes/HighContrast-SVG/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/Makefile.am
@@ -1,6 +1,6 @@
 @INTLTOOL_THEME_RULE@
 
-themedir = $(datadir)/icons/MateHighContrast-SVG
+themedir = $(datadir)/icons/MateContrastHigh-SVG
 
 theme_in_files = index.theme.in
 theme_DATA = $(theme_in_files:.theme.in=.theme)
diff --git a/icon-themes/HighContrast-SVG/index.theme.in b/icon-themes/ContrastHigh-SVG/index.theme.in
index 873e8253..87a2d011 100644
--- a/icon-themes/HighContrast-SVG/index.theme.in
+++ b/icon-themes/ContrastHigh-SVG/index.theme.in
@@ -1,5 +1,5 @@
 [Icon Theme]
-_Name=HighContrast-SVG
+_Name=ContrastHigh-SVG
 _Comment=High contrast scalable icons with black borders
 Inherits=mate,crystalsvg
 Example=folder
diff --git a/icon-themes/HighContrast-SVG/scalable/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/Makefile.am
index 48a8e8db..ebdd6faf 100644
--- a/icon-themes/HighContrast-SVG/scalable/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/Makefile.am
@@ -1,5 +1,5 @@
 
-themedir=	$(datadir)/icons/HighContrast-SVG/scalable
+themedir=	$(datadir)/icons/ContrastHigh-SVG/scalable
 
 SUBDIRS = \
 	actions			\
@@ -19,4 +19,4 @@ SUBDIRS = \
 	emotes-extra		\
 	mimetypes-extra		\
 	places-extra		\
-	status-extra
\ No newline at end of file
+	status-extra
diff --git a/icon-themes/HighContrast-SVG/scalable/actions-extra/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/actions-extra/Makefile.am
index 3b94aa70..b2424acf 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions-extra/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions-extra/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = actions
 
@@ -9,4 +9,4 @@ icon_DATA = \
 	history-view.svg
 
 EXTRA_DIST = \
-	$(icon_DATA)
\ No newline at end of file
+	$(icon_DATA)
diff --git a/icon-themes/HighContrast-SVG/scalable/actions-extra/bookmark-view.svg b/icon-themes/ContrastHigh-SVG/scalable/actions-extra/bookmark-view.svg
index 5da2ab82..5da2ab82 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions-extra/bookmark-view.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions-extra/bookmark-view.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions-extra/history-view.svg b/icon-themes/ContrastHigh-SVG/scalable/actions-extra/history-view.svg
index f9c9b121..f9c9b121 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions-extra/history-view.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions-extra/history-view.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/actions/Makefile.am
index e6104b63..09be69d0 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = actions
 
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/address-book-new.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/address-book-new.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/address-book-new.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/address-book-new.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/application-exit.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/application-exit.svg
index 84ba3472..84ba3472 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/application-exit.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/application-exit.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/appointment-new.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/appointment-new.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/appointment-new.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/appointment-new.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/call-start.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/call-start.svg
index 751478b7..751478b7 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/call-start.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/call-start.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/call-stop.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/call-stop.svg
index 1891241a..1891241a 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/call-stop.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/call-stop.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/contact-new.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/contact-new.svg
index 4b2bf10d..4b2bf10d 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/contact-new.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/contact-new.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/dialog-cancel.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/dialog-cancel.svg
index 0ea5e997..0ea5e997 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/dialog-cancel.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/dialog-cancel.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/dialog-close.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/dialog-close.svg
index 46d38f2d..46d38f2d 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/dialog-close.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/dialog-close.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/dialog-ok.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/dialog-ok.svg
index a4efc3ea..a4efc3ea 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/dialog-ok.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/dialog-ok.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/document-new.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/document-new.svg
index ffda31cb..ffda31cb 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/document-new.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/document-new.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/document-open-recent.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/document-open-recent.svg
index f9c9b121..f9c9b121 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/document-open-recent.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/document-open-recent.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/document-open.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/document-open.svg
index 77da8459..77da8459 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/document-open.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/document-open.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/document-page-setup.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/document-page-setup.svg
index da6e168a..da6e168a 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/document-page-setup.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/document-page-setup.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/document-print-preview.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/document-print-preview.svg
index 80181ba8..80181ba8 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/document-print-preview.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/document-print-preview.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/document-print.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/document-print.svg
index 7d1b0bbe..7d1b0bbe 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/document-print.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/document-print.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/document-properties.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/document-properties.svg
index d0ff43ec..d0ff43ec 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/document-properties.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/document-properties.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/document-revert.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/document-revert.svg
index d7780353..d7780353 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/document-revert.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/document-revert.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/document-save-as.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/document-save-as.svg
index b995450d..b995450d 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/document-save-as.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/document-save-as.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/document-save.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/document-save.svg
index fc10d9a5..fc10d9a5 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/document-save.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/document-save.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/document-send.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/document-send.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/document-send.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/document-send.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/edit-clear.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-clear.svg
index b8c0b8b8..b8c0b8b8 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/edit-clear.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-clear.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/edit-copy.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-copy.svg
index aa74522f..aa74522f 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/edit-copy.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-copy.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/edit-cut.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-cut.svg
index b7c6230b..b7c6230b 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/edit-cut.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-cut.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/edit-delete.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-delete.svg
index e42bb121..e42bb121 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/edit-delete.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-delete.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/edit-find-replace.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-find-replace.svg
index 16717781..16717781 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/edit-find-replace.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-find-replace.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/edit-find.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-find.svg
index 62cd7755..62cd7755 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/edit-find.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-find.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/edit-paste.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-paste.svg
index 94e6d996..94e6d996 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/edit-paste.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-paste.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/edit-redo.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-redo.svg
index b4d2da1d..b4d2da1d 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/edit-redo.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-redo.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/edit-select-all.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-select-all.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/edit-select-all.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-select-all.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/edit-undo.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-undo.svg
index 1369a26d..1369a26d 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/edit-undo.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/edit-undo.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/folder-new.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/folder-new.svg
index 08305851..08305851 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/folder-new.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/folder-new.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/format-indent-less.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/format-indent-less.svg
index 08a35658..08a35658 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/format-indent-less.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/format-indent-less.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/format-indent-more.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/format-indent-more.svg
index 27a8891a..27a8891a 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/format-indent-more.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/format-indent-more.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/format-justify-center.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/format-justify-center.svg
index 25add172..25add172 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/format-justify-center.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/format-justify-center.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/format-justify-fill.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/format-justify-fill.svg
index b66eafb2..b66eafb2 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/format-justify-fill.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/format-justify-fill.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/format-justify-left.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/format-justify-left.svg
index 5c004df2..5c004df2 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/format-justify-left.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/format-justify-left.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/format-justify-right.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/format-justify-right.svg
index 20f50a6a..20f50a6a 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/format-justify-right.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/format-justify-right.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/format-text-bold.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/format-text-bold.svg
index bbc04e4c..bbc04e4c 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/format-text-bold.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/format-text-bold.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/format-text-direction-ltr.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/format-text-direction-ltr.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/format-text-direction-ltr.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/format-text-direction-ltr.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/format-text-direction-rtl.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/format-text-direction-rtl.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/format-text-direction-rtl.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/format-text-direction-rtl.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/format-text-italic.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/format-text-italic.svg
index ea0e2893..ea0e2893 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/format-text-italic.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/format-text-italic.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/format-text-strikethrough.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/format-text-strikethrough.svg
index 831d3206..831d3206 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/format-text-strikethrough.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/format-text-strikethrough.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/format-text-underline.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/format-text-underline.svg
index 0ca452e9..0ca452e9 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/format-text-underline.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/format-text-underline.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/go-bottom.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/go-bottom.svg
index eec9f78e..eec9f78e 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/go-bottom.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/go-bottom.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/go-down.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/go-down.svg
index d8ce57d4..d8ce57d4 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/go-down.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/go-down.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/go-first.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/go-first.svg
index e3f8fad9..e3f8fad9 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/go-first.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/go-first.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/go-home.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/go-home.svg
index e93b825a..e93b825a 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/go-home.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/go-home.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/go-jump.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/go-jump.svg
index 31558a05..31558a05 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/go-jump.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/go-jump.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/go-last.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/go-last.svg
index e0dbfb1d..e0dbfb1d 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/go-last.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/go-last.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/go-next.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/go-next.svg
index bc9dc0ce..bc9dc0ce 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/go-next.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/go-next.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/go-previous.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/go-previous.svg
index d7f7db66..d7f7db66 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/go-previous.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/go-previous.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/go-top.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/go-top.svg
index 931df073..931df073 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/go-top.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/go-top.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/go-up.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/go-up.svg
index 9a27fd9c..9a27fd9c 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/go-up.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/go-up.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/help-about.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/help-about.svg
index 5598b5ad..5598b5ad 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/help-about.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/help-about.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/help-contents.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/help-contents.svg
index f78831ff..f78831ff 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/help-contents.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/help-contents.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/help-faq.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/help-faq.svg
index 69873bb3..69873bb3 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/help-faq.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/help-faq.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/insert-image.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/insert-image.svg
index 524947df..524947df 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/insert-image.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/insert-image.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/insert-link.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/insert-link.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/insert-link.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/insert-link.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/insert-object.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/insert-object.svg
index ef70a419..ef70a419 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/insert-object.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/insert-object.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/insert-text.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/insert-text.svg
index a011ab9b..a011ab9b 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/insert-text.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/insert-text.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/list-add.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/list-add.svg
index ae41ba81..ae41ba81 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/list-add.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/list-add.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/list-remove.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/list-remove.svg
index 5119624e..5119624e 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/list-remove.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/list-remove.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/mail-forward.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-forward.svg
index 2beb1d91..2beb1d91 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/mail-forward.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-forward.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/mail-mark-important.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-mark-important.svg
index a85b2120..a85b2120 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/mail-mark-important.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-mark-important.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/mail-mark-junk.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-mark-junk.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/mail-mark-junk.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-mark-junk.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/mail-mark-notjunk.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-mark-notjunk.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/mail-mark-notjunk.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-mark-notjunk.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/mail-mark-read.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-mark-read.svg
index 5b73a7e1..5b73a7e1 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/mail-mark-read.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-mark-read.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/mail-mark-unread.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-mark-unread.svg
index e465f407..e465f407 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/mail-mark-unread.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-mark-unread.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/mail-message-new.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-message-new.svg
index e707b610..e707b610 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/mail-message-new.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-message-new.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/mail-reply-all.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-reply-all.svg
index be519b03..be519b03 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/mail-reply-all.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-reply-all.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/mail-reply-sender.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-reply-sender.svg
index 1b08e529..1b08e529 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/mail-reply-sender.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-reply-sender.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/mail-send-receive.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-send-receive.svg
index 3096c77b..3096c77b 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/mail-send-receive.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-send-receive.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/mail-send.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-send.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/mail-send.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/mail-send.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/media-eject.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/media-eject.svg
index 2d299b21..2d299b21 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/media-eject.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/media-eject.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/media-playback-pause.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/media-playback-pause.svg
index 0b637285..0b637285 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/media-playback-pause.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/media-playback-pause.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/media-playback-start.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/media-playback-start.svg
index d96d2025..d96d2025 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/media-playback-start.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/media-playback-start.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/media-playback-stop.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/media-playback-stop.svg
index 87ac8ac0..87ac8ac0 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/media-playback-stop.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/media-playback-stop.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/media-record.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/media-record.svg
index 7d384cbd..7d384cbd 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/media-record.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/media-record.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/media-seek-backward.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/media-seek-backward.svg
index d46be26b..d46be26b 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/media-seek-backward.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/media-seek-backward.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/media-seek-forward.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/media-seek-forward.svg
index 85fcf0ec..85fcf0ec 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/media-seek-forward.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/media-seek-forward.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/media-skip-backward.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/media-skip-backward.svg
index 67bd2e0b..67bd2e0b 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/media-skip-backward.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/media-skip-backward.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/media-skip-forward.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/media-skip-forward.svg
index 97f8fa89..97f8fa89 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/media-skip-forward.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/media-skip-forward.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/object-flip-horizontal.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/object-flip-horizontal.svg
index 7864c0b7..7864c0b7 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/object-flip-horizontal.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/object-flip-horizontal.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/object-flip-vertical.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/object-flip-vertical.svg
index 5d20c91f..5d20c91f 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/object-flip-vertical.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/object-flip-vertical.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/object-rotate-left.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/object-rotate-left.svg
index f47c4f6a..f47c4f6a 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/object-rotate-left.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/object-rotate-left.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/object-rotate-right.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/object-rotate-right.svg
index 5e59321e..5e59321e 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/object-rotate-right.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/object-rotate-right.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/process-stop.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/process-stop.svg
index 256411ba..256411ba 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/process-stop.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/process-stop.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/system-lock-screen.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/system-lock-screen.svg
index 7142511e..7142511e 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/system-lock-screen.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/system-lock-screen.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/system-log-out.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/system-log-out.svg
index c099f9a3..c099f9a3 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/system-log-out.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/system-log-out.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/system-reboot.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/system-reboot.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/system-reboot.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/system-reboot.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/system-run.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/system-run.svg
index af7ee7d1..af7ee7d1 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/system-run.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/system-run.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/system-search.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/system-search.svg
index b9c9a4ed..b9c9a4ed 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/system-search.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/system-search.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/system-shutdown.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/system-shutdown.svg
index df49d22a..df49d22a 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/system-shutdown.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/system-shutdown.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/tool-check-spelling.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/tool-check-spelling.svg
index d5336597..d5336597 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/tool-check-spelling.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/tool-check-spelling.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/tools-check-spelling.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/tools-check-spelling.svg
index 73465ac8..73465ac8 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/tools-check-spelling.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/tools-check-spelling.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/view-fullscreen.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/view-fullscreen.svg
index 4c99d87d..4c99d87d 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/view-fullscreen.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/view-fullscreen.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/view-refresh.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/view-refresh.svg
index 5659eb29..5659eb29 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/view-refresh.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/view-refresh.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/view-restore.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/view-restore.svg
index 83039c6c..83039c6c 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/view-restore.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/view-restore.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/view-sort-ascending.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/view-sort-ascending.svg
index 9820ac5f..9820ac5f 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/view-sort-ascending.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/view-sort-ascending.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/view-sort-descending.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/view-sort-descending.svg
index a785dae0..a785dae0 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/view-sort-descending.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/view-sort-descending.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/window-close.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/window-close.svg
index 46d38f2d..46d38f2d 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/window-close.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/window-close.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/window-new.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/window-new.svg
index 6f8f574a..6f8f574a 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/window-new.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/window-new.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/zoom-fit-best.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/zoom-fit-best.svg
index f98d7e89..f98d7e89 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/zoom-fit-best.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/zoom-fit-best.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/zoom-in.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/zoom-in.svg
index 9492fbd9..9492fbd9 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/zoom-in.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/zoom-in.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/zoom-original.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/zoom-original.svg
index 5a9855c9..5a9855c9 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/zoom-original.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/zoom-original.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/actions/zoom-out.svg b/icon-themes/ContrastHigh-SVG/scalable/actions/zoom-out.svg
index bcac2880..bcac2880 100644
--- a/icon-themes/HighContrast-SVG/scalable/actions/zoom-out.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/actions/zoom-out.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/Makefile.am
index d5ed259e..f0ca8c92 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = apps
 
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/brasero.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/brasero.svg
index e7220cf6..e7220cf6 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/brasero.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/brasero.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/bug-buddy.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/bug-buddy.svg
index c92c0694..c92c0694 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/bug-buddy.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/bug-buddy.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/firefox-icon.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/firefox-icon.svg
index 67ed3e3e..67ed3e3e 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/firefox-icon.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/firefox-icon.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/glchess.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/glchess.svg
index 931c194e..931c194e 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/glchess.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/glchess.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/internet-group-chat.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/internet-group-chat.svg
index bcd362ab..bcd362ab 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/internet-group-chat.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/internet-group-chat.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/internet-mail.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/internet-mail.svg
index 3270c2c4..3270c2c4 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/internet-mail.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/internet-mail.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/internet-news-reader.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/internet-news-reader.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/internet-news-reader.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/internet-news-reader.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/internet-web-browser.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/internet-web-browser.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/internet-web-browser.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/internet-web-browser.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/orca.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/orca.svg
index 48c8cc1b..48c8cc1b 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/orca.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/orca.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/pidgin.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/pidgin.svg
index bcd362ab..bcd362ab 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/pidgin.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/pidgin.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/preferences-system-network-proxy.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/preferences-system-network-proxy.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/preferences-system-network-proxy.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/preferences-system-network-proxy.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/preferences-system-session.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/preferences-system-session.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/preferences-system-session.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/preferences-system-session.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/preferences-system-windows.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/preferences-system-windows.svg
index d9586300..d9586300 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/preferences-system-windows.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/preferences-system-windows.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/rhythmbox.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/rhythmbox.svg
index b6da05f6..b6da05f6 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/rhythmbox.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/rhythmbox.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/sound-juicer.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/sound-juicer.svg
index afc42121..afc42121 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/sound-juicer.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/sound-juicer.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/thunderbird-icon.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/thunderbird-icon.svg
index 3270c2c4..3270c2c4 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/thunderbird-icon.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/thunderbird-icon.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/tomboy.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/tomboy.svg
index 00594662..00594662 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/tomboy.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/tomboy.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps-extra/totem.svg b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/totem.svg
index f3b0be78..f3b0be78 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps-extra/totem.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps-extra/totem.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/apps/Makefile.am
index 5925ff16..c9fc146a 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = apps
 
diff --git a/icon-themes/HighContrast-SVG/scalable/apps/accessories-calculator.svg b/icon-themes/ContrastHigh-SVG/scalable/apps/accessories-calculator.svg
index 473d689c..473d689c 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps/accessories-calculator.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps/accessories-calculator.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps/accessories-character-map.svg b/icon-themes/ContrastHigh-SVG/scalable/apps/accessories-character-map.svg
index 75acad2e..75acad2e 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps/accessories-character-map.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps/accessories-character-map.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps/accessories-text-editor.svg b/icon-themes/ContrastHigh-SVG/scalable/apps/accessories-text-editor.svg
index 0f9de209..0f9de209 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps/accessories-text-editor.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps/accessories-text-editor.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps/help-browser.svg b/icon-themes/ContrastHigh-SVG/scalable/apps/help-browser.svg
index 990067f7..990067f7 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps/help-browser.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps/help-browser.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps/multimedia-volume-control.svg b/icon-themes/ContrastHigh-SVG/scalable/apps/multimedia-volume-control.svg
index b1bd4d26..b1bd4d26 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps/multimedia-volume-control.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps/multimedia-volume-control.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps/preferences-desktop-accessibility.svg b/icon-themes/ContrastHigh-SVG/scalable/apps/preferences-desktop-accessibility.svg
index b1670f3c..b1670f3c 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps/preferences-desktop-accessibility.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps/preferences-desktop-accessibility.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps/preferences-desktop-font.svg b/icon-themes/ContrastHigh-SVG/scalable/apps/preferences-desktop-font.svg
index 8eba466c..8eba466c 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps/preferences-desktop-font.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps/preferences-desktop-font.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps/preferences-desktop-locale.svg b/icon-themes/ContrastHigh-SVG/scalable/apps/preferences-desktop-locale.svg
index 44cdf2b8..44cdf2b8 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps/preferences-desktop-locale.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps/preferences-desktop-locale.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps/preferences-desktop-screensaver.svg b/icon-themes/ContrastHigh-SVG/scalable/apps/preferences-desktop-screensaver.svg
index 1152aa36..1152aa36 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps/preferences-desktop-screensaver.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps/preferences-desktop-screensaver.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps/system-file-manager.svg b/icon-themes/ContrastHigh-SVG/scalable/apps/system-file-manager.svg
index 4515523a..4515523a 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps/system-file-manager.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps/system-file-manager.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps/utilities-system-monitor.svg b/icon-themes/ContrastHigh-SVG/scalable/apps/utilities-system-monitor.svg
index ad4b4c5b..ad4b4c5b 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps/utilities-system-monitor.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps/utilities-system-monitor.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/apps/utilities-terminal.svg b/icon-themes/ContrastHigh-SVG/scalable/apps/utilities-terminal.svg
index e7030474..e7030474 100644
--- a/icon-themes/HighContrast-SVG/scalable/apps/utilities-terminal.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/apps/utilities-terminal.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/categories-extra/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/categories-extra/Makefile.am
index 66eda591..4bf44e46 100644
--- a/icon-themes/HighContrast-SVG/scalable/categories-extra/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/categories-extra/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = categories
 
diff --git a/icon-themes/HighContrast-SVG/scalable/categories/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/categories/Makefile.am
index 4e92770d..506744df 100644
--- a/icon-themes/HighContrast-SVG/scalable/categories/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/categories/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = categories
 
diff --git a/icon-themes/HighContrast-SVG/scalable/categories/applications-accessories.svg b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-accessories.svg
index 015d0633..015d0633 100644
--- a/icon-themes/HighContrast-SVG/scalable/categories/applications-accessories.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-accessories.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/categories/applications-development.svg b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-development.svg
index 1a3e785e..1a3e785e 100644
--- a/icon-themes/HighContrast-SVG/scalable/categories/applications-development.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-development.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/categories/applications-games.svg b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-games.svg
index 6495f78e..6495f78e 100644
--- a/icon-themes/HighContrast-SVG/scalable/categories/applications-games.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-games.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/categories/applications-graphics.svg b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-graphics.svg
index 7fe557c9..7fe557c9 100644
--- a/icon-themes/HighContrast-SVG/scalable/categories/applications-graphics.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-graphics.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/categories/applications-internet.svg b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-internet.svg
index 67ed3e3e..67ed3e3e 100644
--- a/icon-themes/HighContrast-SVG/scalable/categories/applications-internet.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-internet.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/categories/applications-multimedia.svg b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-multimedia.svg
index b6da05f6..b6da05f6 100644
--- a/icon-themes/HighContrast-SVG/scalable/categories/applications-multimedia.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-multimedia.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/categories/applications-system.svg b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-system.svg
index 8d980961..8d980961 100644
--- a/icon-themes/HighContrast-SVG/scalable/categories/applications-system.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/categories/applications-system.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/categories/preferences-desktop-peripherals.svg b/icon-themes/ContrastHigh-SVG/scalable/categories/preferences-desktop-peripherals.svg
index 5ddde8ab..5ddde8ab 100644
--- a/icon-themes/HighContrast-SVG/scalable/categories/preferences-desktop-peripherals.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/categories/preferences-desktop-peripherals.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/categories/preferences-desktop.svg b/icon-themes/ContrastHigh-SVG/scalable/categories/preferences-desktop.svg
index 8460ec9b..8460ec9b 100644
--- a/icon-themes/HighContrast-SVG/scalable/categories/preferences-desktop.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/categories/preferences-desktop.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/categories/preferences-system.svg b/icon-themes/ContrastHigh-SVG/scalable/categories/preferences-system.svg
index e0f71684..e0f71684 100644
--- a/icon-themes/HighContrast-SVG/scalable/categories/preferences-system.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/categories/preferences-system.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices-extra/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/devices-extra/Makefile.am
index a1325b1a..c4ff5324 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices-extra/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices-extra/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = devices
 
diff --git a/icon-themes/HighContrast-SVG/scalable/devices-extra/media-flash.svg b/icon-themes/ContrastHigh-SVG/scalable/devices-extra/media-flash.svg
index 2ace3109..2ace3109 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices-extra/media-flash.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices-extra/media-flash.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/devices/Makefile.am
index a7ff6bf8..46438148 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = devices
 
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/audio-card.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/audio-card.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/audio-card.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/audio-card.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/audio-input-microphone.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/audio-input-microphone.svg
index c029f93e..c029f93e 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/audio-input-microphone.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/audio-input-microphone.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/battery.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/battery.svg
index f0df1bbd..f0df1bbd 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/battery.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/battery.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/camera-photo.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/camera-photo.svg
index fadb6a1a..fadb6a1a 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/camera-photo.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/camera-photo.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/camera-video.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/camera-video.svg
index 639a760b..639a760b 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/camera-video.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/camera-video.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/camera-web.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/camera-web.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/camera-web.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/camera-web.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/computer.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/computer.svg
index e486b1ce..e486b1ce 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/computer.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/computer.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/drive-harddisk.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/drive-harddisk.svg
index 4167c99f..4167c99f 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/drive-harddisk.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/drive-harddisk.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/drive-optical.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/drive-optical.svg
index 28030fc4..28030fc4 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/drive-optical.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/drive-optical.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/drive-removable-media.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/drive-removable-media.svg
index 28030fc4..28030fc4 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/drive-removable-media.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/drive-removable-media.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/input-gaming.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/input-gaming.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/input-gaming.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/input-gaming.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/input-keyboard.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/input-keyboard.svg
index cb05091f..cb05091f 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/input-keyboard.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/input-keyboard.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/input-mouse.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/input-mouse.svg
index 7f173bfd..7f173bfd 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/input-mouse.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/input-mouse.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/input-tablet.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/input-tablet.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/input-tablet.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/input-tablet.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/media-flash.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/media-flash.svg
index 862e3740..862e3740 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/media-flash.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/media-flash.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/media-floppy.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/media-floppy.svg
index d898e3ae..d898e3ae 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/media-floppy.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/media-floppy.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/media-optical.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/media-optical.svg
index afc42121..afc42121 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/media-optical.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/media-optical.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/media-tape.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/media-tape.svg
index b7ee21dc..b7ee21dc 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/media-tape.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/media-tape.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/modem.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/modem.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/modem.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/modem.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/multimedia-player.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/multimedia-player.svg
index 8d1e1500..8d1e1500 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/multimedia-player.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/multimedia-player.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/network-wired.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/network-wired.svg
index f1b5518d..f1b5518d 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/network-wired.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/network-wired.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/network-wireless.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/network-wireless.svg
index 08a70855..08a70855 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/network-wireless.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/network-wireless.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/pda.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/pda.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/pda.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/pda.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/phone.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/phone.svg
index 9199b5f4..9199b5f4 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/phone.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/phone.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/printer.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/printer.svg
index dae9ed0e..dae9ed0e 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/printer.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/printer.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/scanner.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/scanner.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/scanner.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/scanner.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/devices/video-display.svg b/icon-themes/ContrastHigh-SVG/scalable/devices/video-display.svg
index f11221bc..f11221bc 100644
--- a/icon-themes/HighContrast-SVG/scalable/devices/video-display.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/devices/video-display.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems-extra/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/emblems-extra/Makefile.am
index 819b93cf..d11a3b14 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems-extra/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems-extra/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = emblems
 
@@ -7,4 +7,4 @@ icondir = $(themedir)/$(size)/$(context)
 icon_DATA =
 
 EXTRA_DIST = \
-	$(icon_DATA)
\ No newline at end of file
+	$(icon_DATA)
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/emblems/Makefile.am
index eac70ba1..3f37e1c7 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = emblems
 
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-default.svg b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-default.svg
index 76c8de4d..76c8de4d 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-default.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-default.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-documents.svg b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-documents.svg
index c4fe3d8d..c4fe3d8d 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-documents.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-documents.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-downloads.svg b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-downloads.svg
index 0e9db9c9..0e9db9c9 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-downloads.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-downloads.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-favorite.svg b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-favorite.svg
index 2b87e292..2b87e292 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-favorite.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-favorite.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-important.svg b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-important.svg
index 785a20de..785a20de 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-important.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-important.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-mail.svg b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-mail.svg
index 3270c2c4..3270c2c4 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-mail.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-mail.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-photos.svg b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-photos.svg
index c28a3a72..c28a3a72 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-photos.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-photos.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-readonly.svg b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-readonly.svg
index 7142511e..7142511e 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-readonly.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-readonly.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-shared.svg b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-shared.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-shared.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-shared.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-symbolic-link.svg b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-symbolic-link.svg
index 6ab83241..6ab83241 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-symbolic-link.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-symbolic-link.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-synchronized.svg b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-synchronized.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-synchronized.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-synchronized.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-system.svg b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-system.svg
index 9c7e5a69..9c7e5a69 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-system.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-system.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-unreadable.svg b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-unreadable.svg
index e1e5488a..e1e5488a 100644
--- a/icon-themes/HighContrast-SVG/scalable/emblems/emblem-unreadable.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emblems/emblem-unreadable.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes-extra/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/emotes-extra/Makefile.am
index 81fe85a1..e95f600d 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes-extra/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes-extra/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = emotes
 
@@ -7,4 +7,4 @@ icondir = $(themedir)/$(size)/$(context)
 icon_DATA =
 
 EXTRA_DIST = \
-	$(icon_DATA)
\ No newline at end of file
+	$(icon_DATA)
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/emotes/Makefile.am
index 76687640..5c028da5 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = emotes
 
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-angel.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-angel.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-angel.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-angel.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-angry.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-angry.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-angry.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-angry.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-cool.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-cool.svg
index 430df769..430df769 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-cool.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-cool.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-crying.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-crying.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-crying.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-crying.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-devilish.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-devilish.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-devilish.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-devilish.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-embarrassed.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-embarrassed.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-embarrassed.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-embarrassed.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-kiss.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-kiss.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-kiss.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-kiss.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-laugh.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-laugh.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-laugh.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-laugh.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-monkey.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-monkey.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-monkey.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-monkey.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-plain.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-plain.svg
index 6ae8ac19..6ae8ac19 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-plain.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-plain.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-raspberry.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-raspberry.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-raspberry.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-raspberry.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-sad.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-sad.svg
index b510e9f4..b510e9f4 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-sad.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-sad.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-sick.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-sick.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-sick.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-sick.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-smile-big.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-smile-big.svg
index 344c7911..344c7911 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-smile-big.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-smile-big.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-smile.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-smile.svg
index b8af5c8d..b8af5c8d 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-smile.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-smile.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-smirk.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-smirk.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-smirk.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-smirk.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-surprise.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-surprise.svg
index dae1c931..dae1c931 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-surprise.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-surprise.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-tired.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-tired.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-tired.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-tired.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-uncertain.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-uncertain.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-uncertain.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-uncertain.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-wink.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-wink.svg
index 40ca2e9c..40ca2e9c 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-wink.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-wink.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/emotes/face-worried.svg b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-worried.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/emotes/face-worried.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/emotes/face-worried.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes-extra/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/mimetypes-extra/Makefile.am
index 3f38c199..6fb08cac 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes-extra/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes-extra/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = mimetypes
 
@@ -7,4 +7,4 @@ icondir = $(themedir)/$(size)/$(context)
 icon_DATA =
 
 EXTRA_DIST = \
-	$(icon_DATA)
\ No newline at end of file
+	$(icon_DATA)
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/Makefile.am
index 17f554fe..d3cbcbc3 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = mimetypes
 
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/application-x-executable.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/application-x-executable.svg
index 71ec17c0..71ec17c0 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/application-x-executable.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/application-x-executable.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/audio-x-generic.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/audio-x-generic.svg
index b6da05f6..b6da05f6 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/audio-x-generic.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/audio-x-generic.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/font-x-generic.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/font-x-generic.svg
index 10f585e6..10f585e6 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/font-x-generic.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/font-x-generic.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/image-x-generic.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/image-x-generic.svg
index f19097d8..f19097d8 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/image-x-generic.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/image-x-generic.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/text-html.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/text-html.svg
index 0a832e72..0a832e72 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/text-html.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/text-html.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/text-x-generic-template.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/text-x-generic-template.svg
index 006e6011..006e6011 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/text-x-generic-template.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/text-x-generic-template.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/text-x-generic.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/text-x-generic.svg
index dafc6557..dafc6557 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/text-x-generic.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/text-x-generic.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/text-x-preview.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/text-x-preview.svg
index 5958405a..5958405a 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/text-x-preview.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/text-x-preview.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/text-x-script.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/text-x-script.svg
index 4ace4ed1..4ace4ed1 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/text-x-script.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/text-x-script.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/video-x-generic.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/video-x-generic.svg
index 4d0636c9..4d0636c9 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/video-x-generic.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/video-x-generic.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/x-office-address-book.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/x-office-address-book.svg
index 1673d214..1673d214 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/x-office-address-book.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/x-office-address-book.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/x-office-calendar.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/x-office-calendar.svg
index 233426d4..233426d4 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/x-office-calendar.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/x-office-calendar.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/x-office-document.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/x-office-document.svg
index 413242be..413242be 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/x-office-document.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/x-office-document.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/x-office-presentation.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/x-office-presentation.svg
index ba4597da..ba4597da 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/x-office-presentation.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/x-office-presentation.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/mimetypes/x-office-spreadsheet.svg b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/x-office-spreadsheet.svg
index 0fb360de..0fb360de 100644
--- a/icon-themes/HighContrast-SVG/scalable/mimetypes/x-office-spreadsheet.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/mimetypes/x-office-spreadsheet.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/places-extra/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/places-extra/Makefile.am
index 6a7ff6a4..1fe57951 100644
--- a/icon-themes/HighContrast-SVG/scalable/places-extra/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/places-extra/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = places
 
diff --git a/icon-themes/HighContrast-SVG/scalable/places-extra/library-internet-radio.svg b/icon-themes/ContrastHigh-SVG/scalable/places-extra/library-internet-radio.svg
index 8cf6acb2..8cf6acb2 100644
--- a/icon-themes/HighContrast-SVG/scalable/places-extra/library-internet-radio.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/places-extra/library-internet-radio.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/places-extra/library-podcast.svg b/icon-themes/ContrastHigh-SVG/scalable/places-extra/library-podcast.svg
index c75de6ee..c75de6ee 100644
--- a/icon-themes/HighContrast-SVG/scalable/places-extra/library-podcast.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/places-extra/library-podcast.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/places-extra/playlist-automatic.svg b/icon-themes/ContrastHigh-SVG/scalable/places-extra/playlist-automatic.svg
index aed503e6..aed503e6 100644
--- a/icon-themes/HighContrast-SVG/scalable/places-extra/playlist-automatic.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/places-extra/playlist-automatic.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/places-extra/playlist.svg b/icon-themes/ContrastHigh-SVG/scalable/places-extra/playlist.svg
index 26712158..26712158 100644
--- a/icon-themes/HighContrast-SVG/scalable/places-extra/playlist.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/places-extra/playlist.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/places/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/places/Makefile.am
index 5d31730f..c2d6e933 100644
--- a/icon-themes/HighContrast-SVG/scalable/places/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/places/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = places
 
diff --git a/icon-themes/HighContrast-SVG/scalable/places/folder-remote.svg b/icon-themes/ContrastHigh-SVG/scalable/places/folder-remote.svg
index 88201d7a..88201d7a 100644
--- a/icon-themes/HighContrast-SVG/scalable/places/folder-remote.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/places/folder-remote.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/places/folder.svg b/icon-themes/ContrastHigh-SVG/scalable/places/folder.svg
index 8480ea00..8480ea00 100644
--- a/icon-themes/HighContrast-SVG/scalable/places/folder.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/places/folder.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/places/network-server.svg b/icon-themes/ContrastHigh-SVG/scalable/places/network-server.svg
index 7645c6dc..7645c6dc 100644
--- a/icon-themes/HighContrast-SVG/scalable/places/network-server.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/places/network-server.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/places/network-workgroup.svg b/icon-themes/ContrastHigh-SVG/scalable/places/network-workgroup.svg
index 60db1a5a..60db1a5a 100644
--- a/icon-themes/HighContrast-SVG/scalable/places/network-workgroup.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/places/network-workgroup.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/places/start-here.svg b/icon-themes/ContrastHigh-SVG/scalable/places/start-here.svg
index 2b31400c..2b31400c 100644
--- a/icon-themes/HighContrast-SVG/scalable/places/start-here.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/places/start-here.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/places/user-bookmarks.svg b/icon-themes/ContrastHigh-SVG/scalable/places/user-bookmarks.svg
index 5da2ab82..5da2ab82 100644
--- a/icon-themes/HighContrast-SVG/scalable/places/user-bookmarks.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/places/user-bookmarks.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/places/user-desktop.svg b/icon-themes/ContrastHigh-SVG/scalable/places/user-desktop.svg
index 8cd0aa0f..8cd0aa0f 100644
--- a/icon-themes/HighContrast-SVG/scalable/places/user-desktop.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/places/user-desktop.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/places/user-home.svg b/icon-themes/ContrastHigh-SVG/scalable/places/user-home.svg
index e93b825a..e93b825a 100644
--- a/icon-themes/HighContrast-SVG/scalable/places/user-home.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/places/user-home.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/places/user-trash.svg b/icon-themes/ContrastHigh-SVG/scalable/places/user-trash.svg
index cb19dc7b..cb19dc7b 100644
--- a/icon-themes/HighContrast-SVG/scalable/places/user-trash.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/places/user-trash.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status-extra/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/status-extra/Makefile.am
index cc557231..4c91e8fe 100644
--- a/icon-themes/HighContrast-SVG/scalable/status-extra/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/status-extra/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = status
 
diff --git a/icon-themes/HighContrast-SVG/scalable/status-extra/nm-signal-100.svg b/icon-themes/ContrastHigh-SVG/scalable/status-extra/nm-signal-100.svg
index 032d8a0f..032d8a0f 100644
--- a/icon-themes/HighContrast-SVG/scalable/status-extra/nm-signal-100.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status-extra/nm-signal-100.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status-extra/nm-signal-25.svg b/icon-themes/ContrastHigh-SVG/scalable/status-extra/nm-signal-25.svg
index 932c02c0..932c02c0 100644
--- a/icon-themes/HighContrast-SVG/scalable/status-extra/nm-signal-25.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status-extra/nm-signal-25.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status-extra/nm-signal-50.svg b/icon-themes/ContrastHigh-SVG/scalable/status-extra/nm-signal-50.svg
index ce6010e6..ce6010e6 100644
--- a/icon-themes/HighContrast-SVG/scalable/status-extra/nm-signal-50.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status-extra/nm-signal-50.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status-extra/nm-signal-75.svg b/icon-themes/ContrastHigh-SVG/scalable/status-extra/nm-signal-75.svg
index 08a1316e..08a1316e 100644
--- a/icon-themes/HighContrast-SVG/scalable/status-extra/nm-signal-75.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status-extra/nm-signal-75.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/Makefile.am b/icon-themes/ContrastHigh-SVG/scalable/status/Makefile.am
index cfe8a493..56043e80 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/Makefile.am
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/Makefile.am
@@ -1,4 +1,4 @@
-themedir =  $(datadir)/icons/HighContrast-SVG
+themedir =  $(datadir)/icons/ContrastHigh-SVG
 size = scalable
 context = status
 
diff --git a/icon-themes/HighContrast-SVG/scalable/status/appointment-missed.svg b/icon-themes/ContrastHigh-SVG/scalable/status/appointment-missed.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/appointment-missed.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/appointment-missed.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/appointment-soon.svg b/icon-themes/ContrastHigh-SVG/scalable/status/appointment-soon.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/appointment-soon.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/appointment-soon.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/audio-volume-high.svg b/icon-themes/ContrastHigh-SVG/scalable/status/audio-volume-high.svg
index bf566b0d..bf566b0d 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/audio-volume-high.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/audio-volume-high.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/audio-volume-low.svg b/icon-themes/ContrastHigh-SVG/scalable/status/audio-volume-low.svg
index 19501ea3..19501ea3 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/audio-volume-low.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/audio-volume-low.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/audio-volume-medium.svg b/icon-themes/ContrastHigh-SVG/scalable/status/audio-volume-medium.svg
index 3b231a41..3b231a41 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/audio-volume-medium.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/audio-volume-medium.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/audio-volume-muted.svg b/icon-themes/ContrastHigh-SVG/scalable/status/audio-volume-muted.svg
index d74cd3d2..d74cd3d2 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/audio-volume-muted.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/audio-volume-muted.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/battery-caution.svg b/icon-themes/ContrastHigh-SVG/scalable/status/battery-caution.svg
index 4c3b5383..4c3b5383 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/battery-caution.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/battery-caution.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/battery-low.svg b/icon-themes/ContrastHigh-SVG/scalable/status/battery-low.svg
index 826ecad4..826ecad4 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/battery-low.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/battery-low.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/dialog-error.svg b/icon-themes/ContrastHigh-SVG/scalable/status/dialog-error.svg
index 7c575178..7c575178 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/dialog-error.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/dialog-error.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/dialog-information.svg b/icon-themes/ContrastHigh-SVG/scalable/status/dialog-information.svg
index 1780dad9..1780dad9 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/dialog-information.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/dialog-information.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/dialog-password.svg b/icon-themes/ContrastHigh-SVG/scalable/status/dialog-password.svg
index 7142511e..7142511e 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/dialog-password.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/dialog-password.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/dialog-question.svg b/icon-themes/ContrastHigh-SVG/scalable/status/dialog-question.svg
index 00fd4ef8..00fd4ef8 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/dialog-question.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/dialog-question.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/dialog-warning.svg b/icon-themes/ContrastHigh-SVG/scalable/status/dialog-warning.svg
index da469fcf..da469fcf 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/dialog-warning.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/dialog-warning.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/folder-drag-accept.svg b/icon-themes/ContrastHigh-SVG/scalable/status/folder-drag-accept.svg
index 97b0a651..97b0a651 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/folder-drag-accept.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/folder-drag-accept.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/folder-open.svg b/icon-themes/ContrastHigh-SVG/scalable/status/folder-open.svg
index c7ad23a1..c7ad23a1 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/folder-open.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/folder-open.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/folder-visiting.svg b/icon-themes/ContrastHigh-SVG/scalable/status/folder-visiting.svg
index cb5c0dc7..cb5c0dc7 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/folder-visiting.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/folder-visiting.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/image-loading.svg b/icon-themes/ContrastHigh-SVG/scalable/status/image-loading.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/image-loading.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/image-loading.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/image-missing.svg b/icon-themes/ContrastHigh-SVG/scalable/status/image-missing.svg
index d7115cff..d7115cff 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/image-missing.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/image-missing.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/mail-attachment.svg b/icon-themes/ContrastHigh-SVG/scalable/status/mail-attachment.svg
index ce5a1e91..ce5a1e91 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/mail-attachment.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/mail-attachment.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/mail-read.svg b/icon-themes/ContrastHigh-SVG/scalable/status/mail-read.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/mail-read.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/mail-read.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/mail-replied.svg b/icon-themes/ContrastHigh-SVG/scalable/status/mail-replied.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/mail-replied.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/mail-replied.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/mail-signed-verified.svg b/icon-themes/ContrastHigh-SVG/scalable/status/mail-signed-verified.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/mail-signed-verified.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/mail-signed-verified.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/mail-signed.svg b/icon-themes/ContrastHigh-SVG/scalable/status/mail-signed.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/mail-signed.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/mail-signed.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/mail-unread.svg b/icon-themes/ContrastHigh-SVG/scalable/status/mail-unread.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/mail-unread.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/mail-unread.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/media-playlist-repeat.svg b/icon-themes/ContrastHigh-SVG/scalable/status/media-playlist-repeat.svg
index 8ec1cf4e..8ec1cf4e 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/media-playlist-repeat.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/media-playlist-repeat.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/media-playlist-shuffle.svg b/icon-themes/ContrastHigh-SVG/scalable/status/media-playlist-shuffle.svg
index 136d53f1..136d53f1 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/media-playlist-shuffle.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/media-playlist-shuffle.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/network-error.svg b/icon-themes/ContrastHigh-SVG/scalable/status/network-error.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/network-error.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/network-error.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/network-idle.svg b/icon-themes/ContrastHigh-SVG/scalable/status/network-idle.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/network-idle.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/network-idle.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/network-offline.svg b/icon-themes/ContrastHigh-SVG/scalable/status/network-offline.svg
index c6d27e60..c6d27e60 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/network-offline.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/network-offline.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/network-online.svg b/icon-themes/ContrastHigh-SVG/scalable/status/network-online.svg
index bb8d8652..bb8d8652 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/network-online.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/network-online.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/network-receive.svg b/icon-themes/ContrastHigh-SVG/scalable/status/network-receive.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/network-receive.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/network-receive.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/network-transmit-receive.svg b/icon-themes/ContrastHigh-SVG/scalable/status/network-transmit-receive.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/network-transmit-receive.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/network-transmit-receive.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/network-transmit.svg b/icon-themes/ContrastHigh-SVG/scalable/status/network-transmit.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/network-transmit.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/network-transmit.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/printer-printing.svg b/icon-themes/ContrastHigh-SVG/scalable/status/printer-printing.svg
index 6c4a8b41..6c4a8b41 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/printer-printing.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/printer-printing.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/security-high.svg b/icon-themes/ContrastHigh-SVG/scalable/status/security-high.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/security-high.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/security-high.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/security-low.svg b/icon-themes/ContrastHigh-SVG/scalable/status/security-low.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/security-low.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/security-low.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/security-medium.svg b/icon-themes/ContrastHigh-SVG/scalable/status/security-medium.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/security-medium.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/security-medium.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/software-update-available.svg b/icon-themes/ContrastHigh-SVG/scalable/status/software-update-available.svg
index c35bdb18..c35bdb18 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/software-update-available.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/software-update-available.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/software-update-urgent.svg b/icon-themes/ContrastHigh-SVG/scalable/status/software-update-urgent.svg
index e9eb613e..e9eb613e 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/software-update-urgent.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/software-update-urgent.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/sync-error.svg b/icon-themes/ContrastHigh-SVG/scalable/status/sync-error.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/sync-error.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/sync-error.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/sync-synchronizing.svg b/icon-themes/ContrastHigh-SVG/scalable/status/sync-synchronizing.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/sync-synchronizing.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/sync-synchronizing.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/task-due.svg b/icon-themes/ContrastHigh-SVG/scalable/status/task-due.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/task-due.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/task-due.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/task-past-due.svg b/icon-themes/ContrastHigh-SVG/scalable/status/task-past-due.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/task-past-due.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/task-past-due.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/user-away.svg b/icon-themes/ContrastHigh-SVG/scalable/status/user-away.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/user-away.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/user-away.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/user-idle.svg b/icon-themes/ContrastHigh-SVG/scalable/status/user-idle.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/user-idle.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/user-idle.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/user-offline.svg b/icon-themes/ContrastHigh-SVG/scalable/status/user-offline.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/user-offline.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/user-offline.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/user-online.svg b/icon-themes/ContrastHigh-SVG/scalable/status/user-online.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/user-online.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/user-online.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/user-trash-full.svg b/icon-themes/ContrastHigh-SVG/scalable/status/user-trash-full.svg
index c809a2d2..c809a2d2 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/user-trash-full.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/user-trash-full.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/weather-clear-night.svg b/icon-themes/ContrastHigh-SVG/scalable/status/weather-clear-night.svg
index 2a04ffc0..2a04ffc0 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/weather-clear-night.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/weather-clear-night.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/weather-clear.svg b/icon-themes/ContrastHigh-SVG/scalable/status/weather-clear.svg
index e1cf28dd..e1cf28dd 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/weather-clear.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/weather-clear.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/weather-few-clouds-night.svg b/icon-themes/ContrastHigh-SVG/scalable/status/weather-few-clouds-night.svg
index 6e3ecf07..6e3ecf07 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/weather-few-clouds-night.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/weather-few-clouds-night.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/weather-few-clouds.svg b/icon-themes/ContrastHigh-SVG/scalable/status/weather-few-clouds.svg
index e53f9212..e53f9212 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/weather-few-clouds.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/weather-few-clouds.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/weather-fog.svg b/icon-themes/ContrastHigh-SVG/scalable/status/weather-fog.svg
index 77ff3d3c..77ff3d3c 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/weather-fog.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/weather-fog.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/weather-overcast.svg b/icon-themes/ContrastHigh-SVG/scalable/status/weather-overcast.svg
index b5aab40c..b5aab40c 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/weather-overcast.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/weather-overcast.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/weather-severe-alert.svg b/icon-themes/ContrastHigh-SVG/scalable/status/weather-severe-alert.svg
index eca4bc70..eca4bc70 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/weather-severe-alert.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/weather-severe-alert.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/weather-showers-scattered.svg b/icon-themes/ContrastHigh-SVG/scalable/status/weather-showers-scattered.svg
index 6e9e9f94..6e9e9f94 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/weather-showers-scattered.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/weather-showers-scattered.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/weather-showers.svg b/icon-themes/ContrastHigh-SVG/scalable/status/weather-showers.svg
index 058f68a7..058f68a7 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/weather-showers.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/weather-showers.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/weather-snow.svg b/icon-themes/ContrastHigh-SVG/scalable/status/weather-snow.svg
index 525f385c..525f385c 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/weather-snow.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/weather-snow.svg
diff --git a/icon-themes/HighContrast-SVG/scalable/status/weather-storm.svg b/icon-themes/ContrastHigh-SVG/scalable/status/weather-storm.svg
index b76b769b..b76b769b 100644
--- a/icon-themes/HighContrast-SVG/scalable/status/weather-storm.svg
+++ b/icon-themes/ContrastHigh-SVG/scalable/status/weather-storm.svg
diff --git a/icon-themes/HighContrast/Makefile.am b/icon-themes/ContrastHigh/Makefile.am
index 65f152de..3aa15ece 100644
--- a/icon-themes/HighContrast/Makefile.am
+++ b/icon-themes/ContrastHigh/Makefile.am
@@ -1,4 +1,4 @@
-indexthemedir =	$(datadir)/icons/MateHighContrast/
+indexthemedir =	$(datadir)/icons/MateContrastHigh/
 
 indextheme_DATA = index.theme
 
diff --git a/icon-themes/HighContrast/index.theme b/icon-themes/ContrastHigh/index.theme
index ecd974a5..26f008c0 100755
--- a/icon-themes/HighContrast/index.theme
+++ b/icon-themes/ContrastHigh/index.theme
@@ -2,7 +2,7 @@
 Name=High Contrast
 Comment=High Contrast Theme
 Directories=128x128/actions,128x128/apps,128x128/devices,128x128/filesystems,128x128/mimetypes,96x96/actions,96x96/apps,96x96/devices,96x96/filesystems,96x96/mimetypes,64x64/actions,64x64/apps,64x64/devices,64x64/filesystems,64x64/mimetypes,48x48/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,32x32/actions,32x32/apps,32x32/devices,32x32/filesystems,32x32/mimetypes,22x22/actions,22x22/apps,22x22/devices,22x22/filesystems,22x22/mimetypes,16x16/actions,16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,scalable/actions,scalable/apps,scalable/devices,scalable/filesystems,scalable/mimetypes
-Inherits=HighContrastLargePrint,mate
+Inherits=ContrastHighLargePrint,mate
 
 [16x16/actions]
 Size=16
diff --git a/icon-themes/HighContrastInverse/Makefile.am b/icon-themes/ContrastHighInverse/Makefile.am
index cc300af7..530272dc 100644
--- a/icon-themes/HighContrastInverse/Makefile.am
+++ b/icon-themes/ContrastHighInverse/Makefile.am
@@ -1,4 +1,4 @@
-indexthemedir =	$(datadir)/icons/MateHighContrastInverse/
+indexthemedir =	$(datadir)/icons/MateContrastHighInverse/
 
 indextheme_DATA = index.theme
 
diff --git a/icon-themes/HighContrastInverse/index.theme b/icon-themes/ContrastHighInverse/index.theme
index 75375d22..4e46a6be 100755
--- a/icon-themes/HighContrastInverse/index.theme
+++ b/icon-themes/ContrastHighInverse/index.theme
@@ -2,7 +2,7 @@
 Name=High Contrast Inverse
 Comment=Inverse High Contrast Theme
 Directories=128x128/actions,128x128/apps,128x128/devices,128x128/filesystems,128x128/mimetypes,96x96/actions,96x96/apps,96x96/devices,96x96/filesystems,96x96/mimetypes,64x64/actions,64x64/apps,64x64/devices,64x64/filesystems,64x64/mimetypes,48x48/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,32x32/actions,32x32/apps,32x32/devices,32x32/filesystems,32x32/mimetypes,22x22/actions,22x22/apps,22x22/devices,22x22/filesystems,22x22/mimetypes,16x16/actions,16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,scalable/actions,scalable/apps,scalable/devices,scalable/filesystems,scalable/mimetypes
-Inherits=HighContrastLargePrintInverse,mate
+Inherits=ContrastHighLargePrintInverse,mate
 
 [16x16/actions]
 Size=16
diff --git a/icon-themes/HighContrastLargePrint/36x36/Makefile.am b/icon-themes/ContrastHighLargePrint/36x36/Makefile.am
index 599d058b..599d058b 100644
--- a/icon-themes/HighContrastLargePrint/36x36/Makefile.am
+++ b/icon-themes/ContrastHighLargePrint/36x36/Makefile.am
diff --git a/icon-themes/HighContrastLargePrint/36x36/animations/Makefile.am b/icon-themes/ContrastHighLargePrint/36x36/animations/Makefile.am
index 318d7308..72ea925d 100644
--- a/icon-themes/HighContrastLargePrint/36x36/animations/Makefile.am
+++ b/icon-themes/ContrastHighLargePrint/36x36/animations/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrint
+themedir = $(datadir)/icons/ContrastHighLargePrint
 size = 36x36
 context = animations
 
diff --git a/icon-themes/HighContrastLargePrint/36x36/animations/process-idle.png b/icon-themes/ContrastHighLargePrint/36x36/animations/process-idle.png
index ce158bbe..ce158bbe 100755
--- a/icon-themes/HighContrastLargePrint/36x36/animations/process-idle.png
+++ b/icon-themes/ContrastHighLargePrint/36x36/animations/process-idle.png
diff --git a/icon-themes/HighContrastLargePrint/36x36/animations/process-working.png b/icon-themes/ContrastHighLargePrint/36x36/animations/process-working.png
index 8085afb8..8085afb8 100755
--- a/icon-themes/HighContrastLargePrint/36x36/animations/process-working.png
+++ b/icon-themes/ContrastHighLargePrint/36x36/animations/process-working.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/Makefile.am b/icon-themes/ContrastHighLargePrint/48x48/Makefile.am
index 838df2a7..838df2a7 100644
--- a/icon-themes/HighContrastLargePrint/48x48/Makefile.am
+++ b/icon-themes/ContrastHighLargePrint/48x48/Makefile.am
diff --git a/icon-themes/HighContrastLargePrint/48x48/actions/Makefile.am b/icon-themes/ContrastHighLargePrint/48x48/actions/Makefile.am
index 4608ceb6..418e9b0a 100644
--- a/icon-themes/HighContrastLargePrint/48x48/actions/Makefile.am
+++ b/icon-themes/ContrastHighLargePrint/48x48/actions/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrint
+themedir = $(datadir)/icons/ContrastHighLargePrint
 size = 48x48
 context = actions
 
diff --git a/icon-themes/HighContrastLargePrint/48x48/actions/go-home.png b/icon-themes/ContrastHighLargePrint/48x48/actions/go-home.png
index 72f155be..72f155be 100644
--- a/icon-themes/HighContrastLargePrint/48x48/actions/go-home.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/actions/go-home.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/actions/media-playback-pause.png b/icon-themes/ContrastHighLargePrint/48x48/actions/media-playback-pause.png
index d9c9cad9..d9c9cad9 100644
--- a/icon-themes/HighContrastLargePrint/48x48/actions/media-playback-pause.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/actions/media-playback-pause.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/actions/stock_new-tab.png b/icon-themes/ContrastHighLargePrint/48x48/actions/stock_new-tab.png
index 39a6f0c8..39a6f0c8 100644
--- a/icon-themes/HighContrastLargePrint/48x48/actions/stock_new-tab.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/actions/stock_new-tab.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/actions/system-log-out.png b/icon-themes/ContrastHighLargePrint/48x48/actions/system-log-out.png
index 80408ced..80408ced 100644
--- a/icon-themes/HighContrastLargePrint/48x48/actions/system-log-out.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/actions/system-log-out.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/actions/system-run.png b/icon-themes/ContrastHighLargePrint/48x48/actions/system-run.png
index f9bb92c0..f9bb92c0 100644
--- a/icon-themes/HighContrastLargePrint/48x48/actions/system-run.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/actions/system-run.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/actions/system-search.png b/icon-themes/ContrastHighLargePrint/48x48/actions/system-search.png
index 609ff8fd..609ff8fd 100755
--- a/icon-themes/HighContrastLargePrint/48x48/actions/system-search.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/actions/system-search.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/actions/system-shutdown.png b/icon-themes/ContrastHighLargePrint/48x48/actions/system-shutdown.png
index 57cd5a1a..57cd5a1a 100644
--- a/icon-themes/HighContrastLargePrint/48x48/actions/system-shutdown.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/actions/system-shutdown.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/actions/view-refresh.png b/icon-themes/ContrastHighLargePrint/48x48/actions/view-refresh.png
index 63f1956a..63f1956a 100644
--- a/icon-themes/HighContrastLargePrint/48x48/actions/view-refresh.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/actions/view-refresh.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/Makefile.am b/icon-themes/ContrastHighLargePrint/48x48/apps/Makefile.am
index 1d879f6f..45145ae7 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/Makefile.am
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrint
+themedir = $(datadir)/icons/ContrastHighLargePrint
 size = 48x48
 context = apps
 
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/accessories-calculator.png b/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-calculator.png
index b486015a..b486015a 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/accessories-calculator.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-calculator.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/accessories-character-map.png b/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-character-map.png
index 12888464..12888464 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/accessories-character-map.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-character-map.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/accessories-dictionary.png b/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-dictionary.png
index 06a9f6e5..06a9f6e5 100755
--- a/icon-themes/HighContrastLargePrint/48x48/apps/accessories-dictionary.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-dictionary.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/accessories-text-editor.png b/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-text-editor.png
index 9402d048..9402d048 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/accessories-text-editor.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-text-editor.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/advanced-directory.png b/icon-themes/ContrastHighLargePrint/48x48/apps/advanced-directory.png
index 4a145e72..4a145e72 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/advanced-directory.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/advanced-directory.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/applets-screenshooter.png b/icon-themes/ContrastHighLargePrint/48x48/apps/applets-screenshooter.png
index 719a0a08..719a0a08 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/applets-screenshooter.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/applets-screenshooter.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/ax-applet.png b/icon-themes/ContrastHighLargePrint/48x48/apps/ax-applet.png
index e8a25aba..e8a25aba 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/ax-applet.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/ax-applet.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/brasero.png b/icon-themes/ContrastHighLargePrint/48x48/apps/brasero.png
index aba6c53d..aba6c53d 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/brasero.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/brasero.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/charpick.png b/icon-themes/ContrastHighLargePrint/48x48/apps/charpick.png
index 57dc13ee..57dc13ee 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/charpick.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/charpick.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/clock.png b/icon-themes/ContrastHighLargePrint/48x48/apps/clock.png
index 521b3e4b..521b3e4b 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/clock.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/clock.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/display-capplet.png b/icon-themes/ContrastHighLargePrint/48x48/apps/display-capplet.png
index e7ee88d5..e7ee88d5 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/display-capplet.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/display-capplet.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/eog.png b/icon-themes/ContrastHighLargePrint/48x48/apps/eog.png
index 0875d5f5..0875d5f5 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/eog.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/eog.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/evince.png b/icon-themes/ContrastHighLargePrint/48x48/apps/evince.png
index f3cf1105..f3cf1105 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/evince.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/evince.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/evolution.png b/icon-themes/ContrastHighLargePrint/48x48/apps/evolution.png
index 655cb1cd..655cb1cd 100755
--- a/icon-themes/HighContrastLargePrint/48x48/apps/evolution.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/evolution.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/file-roller.png b/icon-themes/ContrastHighLargePrint/48x48/apps/file-roller.png
index dc7ec041..dc7ec041 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/file-roller.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/file-roller.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/firefox-icon.png b/icon-themes/ContrastHighLargePrint/48x48/apps/firefox-icon.png
index 2d157480..2d157480 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/firefox-icon.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/firefox-icon.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/ghex.png b/icon-themes/ContrastHighLargePrint/48x48/apps/ghex.png
index df5504ff..df5504ff 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/ghex.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/ghex.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/gimp.png b/icon-themes/ContrastHighLargePrint/48x48/apps/gimp.png
index 475d9f35..475d9f35 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/gimp.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/gimp.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/gkb.png b/icon-themes/ContrastHighLargePrint/48x48/apps/gkb.png
index 3ba478dd..3ba478dd 100755
--- a/icon-themes/HighContrastLargePrint/48x48/apps/gkb.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/gkb.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/gok.png b/icon-themes/ContrastHighLargePrint/48x48/apps/gok.png
index e78d7c54..e78d7c54 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/gok.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/gok.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/gtkam-camera.png b/icon-themes/ContrastHighLargePrint/48x48/apps/gtkam-camera.png
index 719a0a08..719a0a08 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/gtkam-camera.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/gtkam-camera.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/help-browser.png b/icon-themes/ContrastHighLargePrint/48x48/apps/help-browser.png
index 4ac63f17..4ac63f17 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/help-browser.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/help-browser.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/launcher-program.png b/icon-themes/ContrastHighLargePrint/48x48/apps/launcher-program.png
index 7996e411..7996e411 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/launcher-program.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/launcher-program.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-application-generic.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-application-generic.png
index 166939f5..166939f5 100755
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-application-generic.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-application-generic.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-audio2.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-audio2.png
index 6ace9978..6ace9978 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-audio2.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-audio2.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-calc3.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-calc3.png
index b486015a..b486015a 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-calc3.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-calc3.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-ccmime.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-ccmime.png
index 3d83774a..3d83774a 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-ccmime.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-ccmime.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-ccscreensaver.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-ccscreensaver.png
index 25ca1e2d..25ca1e2d 100755
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-ccscreensaver.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-ccscreensaver.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-cd.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-cd.png
index 6a56953a..6a56953a 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-cd.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-cd.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-folder-generic.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-folder-generic.png
index dad53d03..dad53d03 100755
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-folder-generic.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-folder-generic.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-grecord.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-grecord.png
index 6ace9978..6ace9978 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-grecord.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-grecord.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-home.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-home.png
index 74be271a..74be271a 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-home.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-home.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-info.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-info.png
index 685c1d3d..685c1d3d 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-info.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-info.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-log.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-log.png
index 04a13b75..04a13b75 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-log.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-log.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-logo-icon-transparent.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-logo-icon-transparent.png
index ef68b39d..ef68b39d 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-logo-icon-transparent.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-logo-icon-transparent.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-mailcheck.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-mailcheck.png
index 996c8d64..996c8d64 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-mailcheck.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-mailcheck.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-mini-commander.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-mini-commander.png
index 9c5a26cb..9c5a26cb 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-mini-commander.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-mini-commander.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-mixer-applet.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-mixer-applet.png
index bb375318..bb375318 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-mixer-applet.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-mixer-applet.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-palm.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-palm.png
index ba1df0c8..ba1df0c8 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-palm.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-palm.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-panel.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-panel.png
index 5cd5081e..5cd5081e 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-panel.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-panel.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-searchtool-animation-rest.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-searchtool-animation-rest.png
index 609ff8fd..609ff8fd 100755
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-searchtool-animation-rest.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-searchtool-animation-rest.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-searchtool-animation.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-searchtool-animation.png
index b34497b7..b34497b7 100755
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-searchtool-animation.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-searchtool-animation.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-settings-accessibility-keyboard.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-settings-accessibility-keyboard.png
index e78d7c54..e78d7c54 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-settings-accessibility-keyboard.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-settings-accessibility-keyboard.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-settings-default-applications.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-settings-default-applications.png
index a76a8bce..a76a8bce 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-settings-default-applications.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-settings-default-applications.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-settings-ui-behavior.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-settings-ui-behavior.png
index 137edf97..137edf97 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-settings-ui-behavior.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-settings-ui-behavior.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-starthere.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-starthere.png
index 2a9e6631..2a9e6631 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-starthere.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-starthere.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-windows.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-windows.png
index 50e474ef..50e474ef 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-windows.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-windows.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mate-workspace.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-workspace.png
index b80f57bd..b80f57bd 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mate-workspace.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mate-workspace.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/mozilla-icon.png b/icon-themes/ContrastHighLargePrint/48x48/apps/mozilla-icon.png
index 2d157480..2d157480 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/mozilla-icon.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/mozilla-icon.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/multimedia-volume-control.png b/icon-themes/ContrastHighLargePrint/48x48/apps/multimedia-volume-control.png
index bb375318..bb375318 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/multimedia-volume-control.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/multimedia-volume-control.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/orca.png b/icon-themes/ContrastHighLargePrint/48x48/apps/orca.png
index e47002fa..e47002fa 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/orca.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/orca.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/panel-drawer.png b/icon-themes/ContrastHighLargePrint/48x48/apps/panel-drawer.png
index 7e382e53..7e382e53 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/panel-drawer.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/panel-drawer.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/panel-force-quit.png b/icon-themes/ContrastHighLargePrint/48x48/apps/panel-force-quit.png
index 30e131ac..30e131ac 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/panel-force-quit.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/panel-force-quit.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/perfmeter.png b/icon-themes/ContrastHighLargePrint/48x48/apps/perfmeter.png
index cf046798..cf046798 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/perfmeter.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/perfmeter.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/pidgin.png b/icon-themes/ContrastHighLargePrint/48x48/apps/pidgin.png
index 88b9cc2c..88b9cc2c 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/pidgin.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/pidgin.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-accessibility.png b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-accessibility.png
index fcc98714..fcc98714 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-accessibility.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-accessibility.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-font.png b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-font.png
index 54d0c653..54d0c653 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-font.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-font.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-keyboard-shortcuts.png b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-keyboard-shortcuts.png
index 01389332..01389332 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-keyboard-shortcuts.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-keyboard-shortcuts.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-keyboard.png b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-keyboard.png
index e78d7c54..e78d7c54 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-keyboard.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-keyboard.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-locale.png b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-locale.png
index d791419f..d791419f 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-locale.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-locale.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-sound.png b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-sound.png
index 6ace9978..6ace9978 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-sound.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-sound.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-theme.png b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-theme.png
index fee5e3bb..fee5e3bb 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-theme.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-theme.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-wallpaper.png b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-wallpaper.png
index 508a05b3..508a05b3 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-desktop-wallpaper.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-wallpaper.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-system-session.png b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-system-session.png
index 0bfdfced..0bfdfced 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-system-session.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-system-session.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-system-windows.png b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-system-windows.png
index cbd83b1c..cbd83b1c 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/preferences-system-windows.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-system-windows.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/rhythmbox.png b/icon-themes/ContrastHighLargePrint/48x48/apps/rhythmbox.png
index 2f30d8b4..2f30d8b4 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/rhythmbox.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/rhythmbox.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/smc.png b/icon-themes/ContrastHighLargePrint/48x48/apps/smc.png
index 9bdd39d8..9bdd39d8 100755
--- a/icon-themes/HighContrastLargePrint/48x48/apps/smc.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/smc.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/sound-juicer.png b/icon-themes/ContrastHighLargePrint/48x48/apps/sound-juicer.png
index 6a56953a..6a56953a 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/sound-juicer.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/sound-juicer.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/star.png b/icon-themes/ContrastHighLargePrint/48x48/apps/star.png
index 40551661..40551661 100755
--- a/icon-themes/HighContrastLargePrint/48x48/apps/star.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/star.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/symlinks.dat b/icon-themes/ContrastHighLargePrint/48x48/apps/symlinks.dat
index bd53871b..bd53871b 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/symlinks.dat
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/symlinks.dat
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/system-file-manager.png b/icon-themes/ContrastHighLargePrint/48x48/apps/system-file-manager.png
index e8a0a47c..e8a0a47c 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/system-file-manager.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/system-file-manager.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/thunderbird-icon.png b/icon-themes/ContrastHighLargePrint/48x48/apps/thunderbird-icon.png
index 655cb1cd..655cb1cd 100755
--- a/icon-themes/HighContrastLargePrint/48x48/apps/thunderbird-icon.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/thunderbird-icon.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/totem.png b/icon-themes/ContrastHighLargePrint/48x48/apps/totem.png
index c43c5b77..c43c5b77 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/totem.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/totem.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/utilities-system-monitor.png b/icon-themes/ContrastHighLargePrint/48x48/apps/utilities-system-monitor.png
index 7a97eed2..7a97eed2 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/utilities-system-monitor.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/utilities-system-monitor.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/utilities-terminal.png b/icon-themes/ContrastHighLargePrint/48x48/apps/utilities-terminal.png
index d31dff89..d31dff89 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/utilities-terminal.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/utilities-terminal.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/apps/window-capplet.png b/icon-themes/ContrastHighLargePrint/48x48/apps/window-capplet.png
index fc8fd62e..fc8fd62e 100644
--- a/icon-themes/HighContrastLargePrint/48x48/apps/window-capplet.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/apps/window-capplet.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/Makefile.am b/icon-themes/ContrastHighLargePrint/48x48/categories/Makefile.am
index 85026384..1c669a51 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/Makefile.am
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrint
+themedir = $(datadir)/icons/ContrastHighLargePrint
 size = 48x48
 context = categories
 
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/applications-accessories.png b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-accessories.png
index f26e2ea4..f26e2ea4 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/applications-accessories.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-accessories.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/applications-development.png b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-development.png
index 42364704..42364704 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/applications-development.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-development.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/applications-engineering.png b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-engineering.png
index 42364704..42364704 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/applications-engineering.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-engineering.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/applications-games.png b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-games.png
index 47bf1373..47bf1373 100755
--- a/icon-themes/HighContrastLargePrint/48x48/categories/applications-games.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-games.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/applications-graphics.png b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-graphics.png
index 475d9f35..475d9f35 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/applications-graphics.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-graphics.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/applications-internet.png b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-internet.png
index 2d157480..2d157480 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/applications-internet.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-internet.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/applications-multimedia.png b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-multimedia.png
index 2f47deb6..2f47deb6 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/applications-multimedia.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-multimedia.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/applications-office.png b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-office.png
index 11afab87..11afab87 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/applications-office.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-office.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/applications-other.png b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-other.png
index 6d7b0624..6d7b0624 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/applications-other.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-other.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/applications-science.png b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-science.png
index 6d7b0624..6d7b0624 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/applications-science.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-science.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/applications-system.png b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-system.png
index 6d7b0624..6d7b0624 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/applications-system.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-system.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/applications-utilities.png b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-utilities.png
index f26e2ea4..f26e2ea4 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/applications-utilities.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/applications-utilities.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/preferences-desktop-peripherals.png b/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-desktop-peripherals.png
index 19980aa8..19980aa8 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/preferences-desktop-peripherals.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-desktop-peripherals.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/preferences-desktop-personal.png b/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-desktop-personal.png
index 19980aa8..19980aa8 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/preferences-desktop-personal.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-desktop-personal.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/preferences-desktop.png b/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-desktop.png
index 19980aa8..19980aa8 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/preferences-desktop.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-desktop.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/preferences-other.png b/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-other.png
index 19980aa8..19980aa8 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/preferences-other.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-other.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/preferences-system-network.png b/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-system-network.png
index 6d7b0624..6d7b0624 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/preferences-system-network.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-system-network.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/categories/preferences-system.png b/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-system.png
index 6d7b0624..6d7b0624 100644
--- a/icon-themes/HighContrastLargePrint/48x48/categories/preferences-system.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-system.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/Makefile.am b/icon-themes/ContrastHighLargePrint/48x48/devices/Makefile.am
index 5f297b55..7ef451f1 100644
--- a/icon-themes/HighContrastLargePrint/48x48/devices/Makefile.am
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrint
+themedir = $(datadir)/icons/ContrastHighLargePrint
 size = 48x48
 context = devices
 
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/computer.png b/icon-themes/ContrastHighLargePrint/48x48/devices/computer.png
index 6d7b0624..6d7b0624 100644
--- a/icon-themes/HighContrastLargePrint/48x48/devices/computer.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/computer.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/drive-harddisk.png b/icon-themes/ContrastHighLargePrint/48x48/devices/drive-harddisk.png
index 83f72cc3..83f72cc3 100755
--- a/icon-themes/HighContrastLargePrint/48x48/devices/drive-harddisk.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/drive-harddisk.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/drive-optical.png b/icon-themes/ContrastHighLargePrint/48x48/devices/drive-optical.png
index 3f9dd8b7..3f9dd8b7 100644
--- a/icon-themes/HighContrastLargePrint/48x48/devices/drive-optical.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/drive-optical.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/drive-removable-media.png b/icon-themes/ContrastHighLargePrint/48x48/devices/drive-removable-media.png
index 9ea32efa..9ea32efa 100755
--- a/icon-themes/HighContrastLargePrint/48x48/devices/drive-removable-media.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/drive-removable-media.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/input-keyboard.png b/icon-themes/ContrastHighLargePrint/48x48/devices/input-keyboard.png
index e78d7c54..e78d7c54 100644
--- a/icon-themes/HighContrastLargePrint/48x48/devices/input-keyboard.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/input-keyboard.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/input-mouse.png b/icon-themes/ContrastHighLargePrint/48x48/devices/input-mouse.png
index 78fc44bd..78fc44bd 100644
--- a/icon-themes/HighContrastLargePrint/48x48/devices/input-mouse.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/input-mouse.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/mate-dev-printer-network.png b/icon-themes/ContrastHighLargePrint/48x48/devices/mate-dev-printer-network.png
index 26b511b9..26b511b9 100644
--- a/icon-themes/HighContrastLargePrint/48x48/devices/mate-dev-printer-network.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/mate-dev-printer-network.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/mate-dev-printer-new.png b/icon-themes/ContrastHighLargePrint/48x48/devices/mate-dev-printer-new.png
index 6e910ed8..6e910ed8 100644
--- a/icon-themes/HighContrastLargePrint/48x48/devices/mate-dev-printer-new.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/mate-dev-printer-new.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/media-floppy.png b/icon-themes/ContrastHighLargePrint/48x48/devices/media-floppy.png
index a1627c7b..a1627c7b 100644
--- a/icon-themes/HighContrastLargePrint/48x48/devices/media-floppy.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/media-floppy.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/media-optical.png b/icon-themes/ContrastHighLargePrint/48x48/devices/media-optical.png
index 59310054..59310054 100755
--- a/icon-themes/HighContrastLargePrint/48x48/devices/media-optical.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/media-optical.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/pda.png b/icon-themes/ContrastHighLargePrint/48x48/devices/pda.png
index ba1df0c8..ba1df0c8 100644
--- a/icon-themes/HighContrastLargePrint/48x48/devices/pda.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/pda.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/printer.png b/icon-themes/ContrastHighLargePrint/48x48/devices/printer.png
index 7e165220..7e165220 100755
--- a/icon-themes/HighContrastLargePrint/48x48/devices/printer.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/printer.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/devices/symlinks.dat b/icon-themes/ContrastHighLargePrint/48x48/devices/symlinks.dat
index 58bf09db..58bf09db 100644
--- a/icon-themes/HighContrastLargePrint/48x48/devices/symlinks.dat
+++ b/icon-themes/ContrastHighLargePrint/48x48/devices/symlinks.dat
diff --git a/icon-themes/HighContrastLargePrint/48x48/emblems/Makefile.am b/icon-themes/ContrastHighLargePrint/48x48/emblems/Makefile.am
index d3058543..e2183441 100644
--- a/icon-themes/HighContrastLargePrint/48x48/emblems/Makefile.am
+++ b/icon-themes/ContrastHighLargePrint/48x48/emblems/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrint
+themedir = $(datadir)/icons/ContrastHighLargePrint
 size = 48x48
 context = emblems
 
diff --git a/icon-themes/HighContrastLargePrint/48x48/emblems/emblem-default.png b/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-default.png
index 964d22b9..964d22b9 100644
--- a/icon-themes/HighContrastLargePrint/48x48/emblems/emblem-default.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-default.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/emblems/emblem-desktop.png b/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-desktop.png
index 2b2d03a6..2b2d03a6 100755
--- a/icon-themes/HighContrastLargePrint/48x48/emblems/emblem-desktop.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-desktop.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/emblems/emblem-important.png b/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-important.png
index b9787f47..b9787f47 100644
--- a/icon-themes/HighContrastLargePrint/48x48/emblems/emblem-important.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-important.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/emblems/emblem-personal.png b/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-personal.png
index 0551563d..0551563d 100644
--- a/icon-themes/HighContrastLargePrint/48x48/emblems/emblem-personal.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-personal.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/emblems/emblem-special.png b/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-special.png
index f797e9f7..f797e9f7 100644
--- a/icon-themes/HighContrastLargePrint/48x48/emblems/emblem-special.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-special.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/emblems/emblem-unreadable.png b/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-unreadable.png
index 33d2a7e2..33d2a7e2 100644
--- a/icon-themes/HighContrastLargePrint/48x48/emblems/emblem-unreadable.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-unreadable.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/mimetypes/Makefile.am b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/Makefile.am
index 028a5428..e67dd4a8 100644
--- a/icon-themes/HighContrastLargePrint/48x48/mimetypes/Makefile.am
+++ b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrint
+themedir = $(datadir)/icons/ContrastHighLargePrint
 size = 48x48
 context = mimetypes
 
diff --git a/icon-themes/HighContrastLargePrint/48x48/mimetypes/application-x-executable.png b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/application-x-executable.png
index 166939f5..166939f5 100644
--- a/icon-themes/HighContrastLargePrint/48x48/mimetypes/application-x-executable.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/application-x-executable.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/mimetypes/audio-x-generic.png b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/audio-x-generic.png
index a53ef5ce..a53ef5ce 100755
--- a/icon-themes/HighContrastLargePrint/48x48/mimetypes/audio-x-generic.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/audio-x-generic.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/mimetypes/font-x-generic.png b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/font-x-generic.png
index efb02748..efb02748 100755
--- a/icon-themes/HighContrastLargePrint/48x48/mimetypes/font-x-generic.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/font-x-generic.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/mimetypes/image-x-generic.png b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/image-x-generic.png
index a53ef5ce..a53ef5ce 100755
--- a/icon-themes/HighContrastLargePrint/48x48/mimetypes/image-x-generic.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/image-x-generic.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/mimetypes/mate-mime-application-x-core-file.png b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/mate-mime-application-x-core-file.png
index bb9157ec..bb9157ec 100644
--- a/icon-themes/HighContrastLargePrint/48x48/mimetypes/mate-mime-application-x-core-file.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/mate-mime-application-x-core-file.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/mimetypes/package-x-generic.png b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/package-x-generic.png
index 7c511aae..7c511aae 100755
--- a/icon-themes/HighContrastLargePrint/48x48/mimetypes/package-x-generic.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/package-x-generic.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/mimetypes/symlinks.dat b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/symlinks.dat
index 4ae72d02..4ae72d02 100644
--- a/icon-themes/HighContrastLargePrint/48x48/mimetypes/symlinks.dat
+++ b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/symlinks.dat
diff --git a/icon-themes/HighContrastLargePrint/48x48/mimetypes/text-x-generic.png b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/text-x-generic.png
index a53ef5ce..a53ef5ce 100755
--- a/icon-themes/HighContrastLargePrint/48x48/mimetypes/text-x-generic.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/text-x-generic.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/mimetypes/text-x-preview.png b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/text-x-preview.png
index a53ef5ce..a53ef5ce 100755
--- a/icon-themes/HighContrastLargePrint/48x48/mimetypes/text-x-preview.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/text-x-preview.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/mimetypes/video-x-generic.png b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/video-x-generic.png
index a53ef5ce..a53ef5ce 100755
--- a/icon-themes/HighContrastLargePrint/48x48/mimetypes/video-x-generic.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/video-x-generic.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/mimetypes/x-office-address-book.png b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/x-office-address-book.png
index 325118f2..325118f2 100755
--- a/icon-themes/HighContrastLargePrint/48x48/mimetypes/x-office-address-book.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/mimetypes/x-office-address-book.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/places/Makefile.am b/icon-themes/ContrastHighLargePrint/48x48/places/Makefile.am
index acad2a68..7dc136f7 100644
--- a/icon-themes/HighContrastLargePrint/48x48/places/Makefile.am
+++ b/icon-themes/ContrastHighLargePrint/48x48/places/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrint
+themedir = $(datadir)/icons/ContrastHighLargePrint
 size = 48x48
 context = places
 
diff --git a/icon-themes/HighContrastLargePrint/48x48/places/folder-remote.png b/icon-themes/ContrastHighLargePrint/48x48/places/folder-remote.png
index 5ce6f117..5ce6f117 100644
--- a/icon-themes/HighContrastLargePrint/48x48/places/folder-remote.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/places/folder-remote.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/places/folder.icon b/icon-themes/ContrastHighLargePrint/48x48/places/folder.icon
index ecd9b7be..ecd9b7be 100644
--- a/icon-themes/HighContrastLargePrint/48x48/places/folder.icon
+++ b/icon-themes/ContrastHighLargePrint/48x48/places/folder.icon
diff --git a/icon-themes/HighContrastLargePrint/48x48/places/folder.png b/icon-themes/ContrastHighLargePrint/48x48/places/folder.png
index e8a0a47c..e8a0a47c 100644
--- a/icon-themes/HighContrastLargePrint/48x48/places/folder.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/places/folder.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/places/network-server.png b/icon-themes/ContrastHighLargePrint/48x48/places/network-server.png
index 3b585cad..3b585cad 100755
--- a/icon-themes/HighContrastLargePrint/48x48/places/network-server.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/places/network-server.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/places/network-workgroup.png b/icon-themes/ContrastHighLargePrint/48x48/places/network-workgroup.png
index b0c82e33..b0c82e33 100644
--- a/icon-themes/HighContrastLargePrint/48x48/places/network-workgroup.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/places/network-workgroup.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/places/start-here.png b/icon-themes/ContrastHighLargePrint/48x48/places/start-here.png
index f7d79177..f7d79177 100755
--- a/icon-themes/HighContrastLargePrint/48x48/places/start-here.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/places/start-here.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/places/user-desktop.png b/icon-themes/ContrastHighLargePrint/48x48/places/user-desktop.png
index 40bb56a4..40bb56a4 100755
--- a/icon-themes/HighContrastLargePrint/48x48/places/user-desktop.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/places/user-desktop.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/places/user-home.png b/icon-themes/ContrastHighLargePrint/48x48/places/user-home.png
index 1e6916f5..1e6916f5 100644
--- a/icon-themes/HighContrastLargePrint/48x48/places/user-home.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/places/user-home.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/places/user-trash.png b/icon-themes/ContrastHighLargePrint/48x48/places/user-trash.png
index f553c81f..f553c81f 100644
--- a/icon-themes/HighContrastLargePrint/48x48/places/user-trash.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/places/user-trash.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/Makefile.am b/icon-themes/ContrastHighLargePrint/48x48/status/Makefile.am
index b2c93ad2..e1e2cffd 100644
--- a/icon-themes/HighContrastLargePrint/48x48/status/Makefile.am
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrint
+themedir = $(datadir)/icons/ContrastHighLargePrint
 size = 48x48
 context = status
 
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/audio-volume-high.png b/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-high.png
index 5cfe9f69..5cfe9f69 100644
--- a/icon-themes/HighContrastLargePrint/48x48/status/audio-volume-high.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-high.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/audio-volume-low.png b/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-low.png
index efa72c20..efa72c20 100644
--- a/icon-themes/HighContrastLargePrint/48x48/status/audio-volume-low.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-low.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/audio-volume-medium.png b/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-medium.png
index a63bf561..a63bf561 100644
--- a/icon-themes/HighContrastLargePrint/48x48/status/audio-volume-medium.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-medium.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/audio-volume-muted.png b/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-muted.png
index be22e2bd..be22e2bd 100644
--- a/icon-themes/HighContrastLargePrint/48x48/status/audio-volume-muted.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-muted.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/folder-drag-accept.icon b/icon-themes/ContrastHighLargePrint/48x48/status/folder-drag-accept.icon
index 810fbb6f..810fbb6f 100644
--- a/icon-themes/HighContrastLargePrint/48x48/status/folder-drag-accept.icon
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/folder-drag-accept.icon
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/folder-drag-accept.png b/icon-themes/ContrastHighLargePrint/48x48/status/folder-drag-accept.png
index dad53d03..dad53d03 100755
--- a/icon-themes/HighContrastLargePrint/48x48/status/folder-drag-accept.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/folder-drag-accept.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/network-error.png b/icon-themes/ContrastHighLargePrint/48x48/status/network-error.png
index eff2738f..eff2738f 100644
--- a/icon-themes/HighContrastLargePrint/48x48/status/network-error.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/network-error.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/network-idle.png b/icon-themes/ContrastHighLargePrint/48x48/status/network-idle.png
index 67ea042c..67ea042c 100644
--- a/icon-themes/HighContrastLargePrint/48x48/status/network-idle.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/network-idle.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/network-offline.png b/icon-themes/ContrastHighLargePrint/48x48/status/network-offline.png
index c8476a32..c8476a32 100644
--- a/icon-themes/HighContrastLargePrint/48x48/status/network-offline.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/network-offline.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/network-receive.png b/icon-themes/ContrastHighLargePrint/48x48/status/network-receive.png
index 38e545c4..38e545c4 100644
--- a/icon-themes/HighContrastLargePrint/48x48/status/network-receive.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/network-receive.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/network-transmit-receive.png b/icon-themes/ContrastHighLargePrint/48x48/status/network-transmit-receive.png
index 47172156..47172156 100644
--- a/icon-themes/HighContrastLargePrint/48x48/status/network-transmit-receive.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/network-transmit-receive.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/network-transmit.png b/icon-themes/ContrastHighLargePrint/48x48/status/network-transmit.png
index 3fff320f..3fff320f 100644
--- a/icon-themes/HighContrastLargePrint/48x48/status/network-transmit.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/network-transmit.png
diff --git a/icon-themes/HighContrastLargePrint/48x48/status/user-trash-full.png b/icon-themes/ContrastHighLargePrint/48x48/status/user-trash-full.png
index 65a6d337..65a6d337 100644
--- a/icon-themes/HighContrastLargePrint/48x48/status/user-trash-full.png
+++ b/icon-themes/ContrastHighLargePrint/48x48/status/user-trash-full.png
diff --git a/icon-themes/HighContrastLargePrint/Makefile.am b/icon-themes/ContrastHighLargePrint/Makefile.am
index 3bc68677..7cfdd422 100644
--- a/icon-themes/HighContrastLargePrint/Makefile.am
+++ b/icon-themes/ContrastHighLargePrint/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/MateHighContrastLargePrint
+themedir = $(datadir)/icons/MateContrastHighLargePrint
 
 SUBDIRS = 36x36 48x48
 
diff --git a/icon-themes/HighContrastLargePrint/index.theme.in b/icon-themes/ContrastHighLargePrint/index.theme.in
index 055e8653..055e8653 100755
--- a/icon-themes/HighContrastLargePrint/index.theme.in
+++ b/icon-themes/ContrastHighLargePrint/index.theme.in
diff --git a/icon-themes/HighContrastLargePrintInverse/36x36/Makefile.am b/icon-themes/ContrastHighLargePrintInverse/36x36/Makefile.am
index 599d058b..599d058b 100644
--- a/icon-themes/HighContrastLargePrintInverse/36x36/Makefile.am
+++ b/icon-themes/ContrastHighLargePrintInverse/36x36/Makefile.am
diff --git a/icon-themes/HighContrastLargePrintInverse/36x36/animations/Makefile.am b/icon-themes/ContrastHighLargePrintInverse/36x36/animations/Makefile.am
index 2d38d97a..8217ad33 100644
--- a/icon-themes/HighContrastLargePrintInverse/36x36/animations/Makefile.am
+++ b/icon-themes/ContrastHighLargePrintInverse/36x36/animations/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrintInverse
+themedir = $(datadir)/icons/ContrastHighLargePrintInverse
 size = 36x36
 context = animations
 
diff --git a/icon-themes/HighContrastLargePrintInverse/36x36/animations/process-idle.png b/icon-themes/ContrastHighLargePrintInverse/36x36/animations/process-idle.png
index 8f759cef..8f759cef 100755
--- a/icon-themes/HighContrastLargePrintInverse/36x36/animations/process-idle.png
+++ b/icon-themes/ContrastHighLargePrintInverse/36x36/animations/process-idle.png
diff --git a/icon-themes/HighContrastLargePrintInverse/36x36/animations/process-working.png b/icon-themes/ContrastHighLargePrintInverse/36x36/animations/process-working.png
index ec836514..ec836514 100755
--- a/icon-themes/HighContrastLargePrintInverse/36x36/animations/process-working.png
+++ b/icon-themes/ContrastHighLargePrintInverse/36x36/animations/process-working.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/Makefile.am b/icon-themes/ContrastHighLargePrintInverse/48x48/Makefile.am
index 838df2a7..838df2a7 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/Makefile.am
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/Makefile.am
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/actions/Makefile.am b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/Makefile.am
index b3a07eef..6c911288 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/actions/Makefile.am
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrintInverse
+themedir = $(datadir)/icons/ContrastHighLargePrintInverse
 size = 48x48
 context = actions
 
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/actions/go-home.png b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/go-home.png
index ae052038..ae052038 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/actions/go-home.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/go-home.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/actions/insert-image.png b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/insert-image.png
index 32035d36..32035d36 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/actions/insert-image.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/insert-image.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/actions/insert-text.png b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/insert-text.png
index 769d80b2..769d80b2 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/actions/insert-text.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/insert-text.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/actions/mail-send-receive.png b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/mail-send-receive.png
index 1af309b0..1af309b0 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/actions/mail-send-receive.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/mail-send-receive.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/actions/media-playback-pause.png b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/media-playback-pause.png
index 82aa2387..82aa2387 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/actions/media-playback-pause.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/media-playback-pause.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/actions/stock_new-tab.png b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/stock_new-tab.png
index 300688d8..300688d8 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/actions/stock_new-tab.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/stock_new-tab.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/actions/system-log-out.png b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/system-log-out.png
index f55f1feb..f55f1feb 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/actions/system-log-out.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/system-log-out.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/actions/system-run.png b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/system-run.png
index 33a4fbac..33a4fbac 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/actions/system-run.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/system-run.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/actions/system-search.png b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/system-search.png
index 89e0c8ac..89e0c8ac 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/actions/system-search.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/system-search.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/actions/system-shutdown.png b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/system-shutdown.png
index 9d8f70a8..9d8f70a8 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/actions/system-shutdown.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/system-shutdown.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/actions/view-refresh.png b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/view-refresh.png
index dca477d3..dca477d3 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/actions/view-refresh.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/actions/view-refresh.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/Makefile.am b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/Makefile.am
index a80ecfa6..4a35b8ba 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/Makefile.am
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrintInverse
+themedir = $(datadir)/icons/ContrastHighLargePrintInverse
 size = 48x48
 context = apps
 
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/accessories-calculator.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/accessories-calculator.png
index 38b7596f..38b7596f 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/accessories-calculator.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/accessories-calculator.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/accessories-character-map.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/accessories-character-map.png
index 4900857c..4900857c 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/accessories-character-map.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/accessories-character-map.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/accessories-dictionary.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/accessories-dictionary.png
index b5d0f299..b5d0f299 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/accessories-dictionary.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/accessories-dictionary.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/accessories-text-editor.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/accessories-text-editor.png
index d25e9fd0..d25e9fd0 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/accessories-text-editor.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/accessories-text-editor.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/advanced-directory.png
index 8cecf42c..8cecf42c 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/advanced-directory.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/advanced-directory.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/applets-screenshooter.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/applets-screenshooter.png
index 3aa4b30b..3aa4b30b 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/applets-screenshooter.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/applets-screenshooter.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/ax-applet.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/ax-applet.png
index f31fdfaa..f31fdfaa 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/ax-applet.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/ax-applet.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/brasero.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/brasero.png
index 3bec10d4..3bec10d4 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/brasero.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/brasero.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/charpick.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/charpick.png
index d89bb94e..d89bb94e 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/charpick.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/charpick.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/clock.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/clock.png
index 6b8ded5a..6b8ded5a 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/clock.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/clock.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/display-capplet.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/display-capplet.png
index 22d43e79..22d43e79 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/display-capplet.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/display-capplet.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/eog.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/eog.png
index ef8a1284..ef8a1284 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/eog.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/eog.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/evince.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/evince.png
index eef12438..eef12438 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/evince.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/evince.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/evolution.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/evolution.png
index dad14b16..dad14b16 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/evolution.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/evolution.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/file-roller.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/file-roller.png
index f3d422a0..f3d422a0 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/file-roller.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/file-roller.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/firefox-icon.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/firefox-icon.png
index bc9a5a91..bc9a5a91 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/firefox-icon.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/firefox-icon.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/ghex.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/ghex.png
index 28a5f23a..28a5f23a 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/ghex.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/ghex.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/gimp.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/gimp.png
index 7042cc18..7042cc18 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/gimp.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/gimp.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/gkb.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/gkb.png
index 7aaabd17..7aaabd17 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/gkb.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/gkb.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/gok.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/gok.png
index 1fe18a9d..1fe18a9d 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/gok.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/gok.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/gtkam-camera.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/gtkam-camera.png
index 58aedaba..58aedaba 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/gtkam-camera.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/gtkam-camera.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/help-browser.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/help-browser.png
index 3ca78d06..3ca78d06 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/help-browser.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/help-browser.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/launcher-program.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/launcher-program.png
index 778c34d4..778c34d4 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/launcher-program.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/launcher-program.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-application-generic.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-application-generic.png
index cb9461f8..cb9461f8 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-application-generic.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-application-generic.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-audio2.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-audio2.png
index 244fec80..244fec80 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-audio2.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-audio2.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-calc3.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-calc3.png
index 38b7596f..38b7596f 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-calc3.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-calc3.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-ccmime.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-ccmime.png
index b9616af3..b9616af3 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-ccmime.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-ccmime.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-ccscreensaver.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-ccscreensaver.png
index ce36f5b6..ce36f5b6 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-ccscreensaver.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-ccscreensaver.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-cd.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-cd.png
index ddc5a88c..ddc5a88c 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-cd.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-cd.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-folder-generic.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-folder-generic.png
index 7e5486f5..7e5486f5 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-folder-generic.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-folder-generic.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-grecord.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-grecord.png
index 244fec80..244fec80 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-grecord.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-grecord.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-home.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-home.png
index 80d82157..80d82157 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-home.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-home.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-info.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-info.png
index fc17f8f9..fc17f8f9 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-info.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-info.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-log.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-log.png
index d767fd9e..d767fd9e 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-log.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-log.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-logo-icon-transparent.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-logo-icon-transparent.png
index ebafbf0f..ebafbf0f 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-logo-icon-transparent.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-logo-icon-transparent.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-mailcheck.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-mailcheck.png
index 2e422af8..2e422af8 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-mailcheck.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-mailcheck.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-mini-commander.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-mini-commander.png
index c7cf2f65..c7cf2f65 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-mini-commander.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-mini-commander.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-mixer-applet.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-mixer-applet.png
index e44bb82b..e44bb82b 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-mixer-applet.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-mixer-applet.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-palm.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-palm.png
index 436c00ea..436c00ea 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-palm.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-palm.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-panel.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-panel.png
index e2d09144..e2d09144 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-panel.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-panel.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-searchtool-animation-rest.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-searchtool-animation-rest.png
index 89e0c8ac..89e0c8ac 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-searchtool-animation-rest.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-searchtool-animation-rest.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-searchtool-animation.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-searchtool-animation.png
index 1addf84a..1addf84a 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-searchtool-animation.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-searchtool-animation.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-settings-accessibility-keyboard.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-settings-accessibility-keyboard.png
index 1fe18a9d..1fe18a9d 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-settings-accessibility-keyboard.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-settings-accessibility-keyboard.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-settings-default-applications.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-settings-default-applications.png
index fbded323..fbded323 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-settings-default-applications.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-settings-default-applications.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-settings-ui-behavior.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-settings-ui-behavior.png
index 61819b70..61819b70 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-settings-ui-behavior.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-settings-ui-behavior.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-starthere.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-starthere.png
index 4f7bbe63..4f7bbe63 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-starthere.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-starthere.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-windows.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-windows.png
index c61febda..c61febda 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-windows.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-windows.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-workspace.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-workspace.png
index 26509de9..26509de9 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mate-workspace.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mate-workspace.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mozilla-icon.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mozilla-icon.png
index bc9a5a91..bc9a5a91 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/mozilla-icon.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/mozilla-icon.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/multimedia-volume-control.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/multimedia-volume-control.png
index e44bb82b..e44bb82b 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/multimedia-volume-control.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/multimedia-volume-control.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/orca.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/orca.png
index bb6d94a8..bb6d94a8 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/orca.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/orca.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/panel-drawer.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/panel-drawer.png
index 96220265..96220265 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/panel-drawer.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/panel-drawer.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/panel-force-quit.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/panel-force-quit.png
index f1a055f3..f1a055f3 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/panel-force-quit.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/panel-force-quit.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/perfmeter.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/perfmeter.png
index 848bec40..848bec40 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/perfmeter.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/perfmeter.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/pidgin.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/pidgin.png
index a28d4821..a28d4821 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/pidgin.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/pidgin.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-accessibility.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-accessibility.png
index 31307f14..31307f14 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-accessibility.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-accessibility.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-font.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-font.png
index 27f713a3..27f713a3 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-font.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-font.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-keyboard-shortcuts.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-keyboard-shortcuts.png
index 12f403d0..12f403d0 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-keyboard-shortcuts.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-keyboard-shortcuts.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-keyboard.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-keyboard.png
index 1fe18a9d..1fe18a9d 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-keyboard.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-keyboard.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-locale.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-locale.png
index 862fd0e3..862fd0e3 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-locale.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-locale.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-sound.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-sound.png
index 244fec80..244fec80 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-sound.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-sound.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-theme.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-theme.png
index b655f485..b655f485 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-theme.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-theme.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-wallpaper.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-wallpaper.png
index 47d59277..47d59277 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-desktop-wallpaper.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-desktop-wallpaper.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-system-session.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-system-session.png
index 3d9f4676..3d9f4676 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-system-session.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-system-session.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-system-windows.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-system-windows.png
index b53f3cb8..b53f3cb8 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/preferences-system-windows.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/preferences-system-windows.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/rhythmbox.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/rhythmbox.png
index 3ecab2d3..3ecab2d3 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/rhythmbox.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/rhythmbox.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/smc.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/smc.png
index b27bd259..b27bd259 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/smc.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/smc.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/sound-juicer.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/sound-juicer.png
index ddc5a88c..ddc5a88c 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/sound-juicer.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/sound-juicer.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/star.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/star.png
index 20706793..20706793 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/star.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/star.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/symlinks.dat b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/symlinks.dat
index bd53871b..bd53871b 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/symlinks.dat
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/symlinks.dat
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/system-file-manager.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/system-file-manager.png
index 8a028073..8a028073 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/system-file-manager.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/system-file-manager.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/thunderbird-icon.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/thunderbird-icon.png
index e1dac12f..e1dac12f 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/thunderbird-icon.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/thunderbird-icon.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/totem.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/totem.png
index 69805584..69805584 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/totem.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/totem.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/utilities-system-monitor.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/utilities-system-monitor.png
index 1c0aa644..1c0aa644 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/utilities-system-monitor.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/utilities-system-monitor.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/utilities-terminal.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/utilities-terminal.png
index f2ef64a7..f2ef64a7 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/utilities-terminal.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/utilities-terminal.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/apps/window-capplet.png b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/window-capplet.png
index af7ec0fc..af7ec0fc 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/apps/window-capplet.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/apps/window-capplet.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/Makefile.am b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/Makefile.am
index 213c9162..5de97383 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/Makefile.am
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrintInverse
+themedir = $(datadir)/icons/ContrastHighLargePrintInverse
 size = 48x48
 context = categories
 
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-accessories.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-accessories.png
index 611140f9..611140f9 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-accessories.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-accessories.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-development.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-development.png
index 33d02165..33d02165 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-development.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-development.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-engineering.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-engineering.png
index 33d02165..33d02165 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-engineering.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-engineering.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-games.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-games.png
index 4b7f6188..4b7f6188 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-games.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-games.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-graphics.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-graphics.png
index 7042cc18..7042cc18 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-graphics.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-graphics.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-internet.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-internet.png
index bc9a5a91..bc9a5a91 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-internet.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-internet.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-multimedia.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-multimedia.png
index 9a292a98..9a292a98 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-multimedia.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-multimedia.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-office.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-office.png
index e9c608f3..e9c608f3 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-office.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-office.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-other.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-other.png
index 9d12826f..9d12826f 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-other.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-other.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-science.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-science.png
index 9d12826f..9d12826f 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-science.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-science.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-system.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-system.png
index 9d12826f..9d12826f 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-system.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-system.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-utilities.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-utilities.png
index 611140f9..611140f9 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/applications-utilities.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/applications-utilities.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/preferences-desktop-peripherals.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/preferences-desktop-peripherals.png
index 1e95144e..1e95144e 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/preferences-desktop-peripherals.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/preferences-desktop-peripherals.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/preferences-desktop-personal.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/preferences-desktop-personal.png
index 1e95144e..1e95144e 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/preferences-desktop-personal.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/preferences-desktop-personal.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/preferences-desktop.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/preferences-desktop.png
index 1e95144e..1e95144e 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/preferences-desktop.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/preferences-desktop.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/preferences-other.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/preferences-other.png
index 1e95144e..1e95144e 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/preferences-other.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/preferences-other.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/preferences-system-network.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/preferences-system-network.png
index 9d12826f..9d12826f 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/preferences-system-network.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/preferences-system-network.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/categories/preferences-system.png b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/preferences-system.png
index 9d12826f..9d12826f 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/categories/preferences-system.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/categories/preferences-system.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/Makefile.am b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/Makefile.am
index d5c0053a..feeea5aa 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/Makefile.am
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrintInverse
+themedir = $(datadir)/icons/ContrastHighLargePrintInverse
 size = 48x48
 context = devices
 
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/computer.png b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/computer.png
index 9d12826f..9d12826f 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/computer.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/computer.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/drive-harddisk.png b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/drive-harddisk.png
index 937ca439..937ca439 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/drive-harddisk.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/drive-harddisk.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/drive-optical.png b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/drive-optical.png
index 937ca439..937ca439 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/drive-optical.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/drive-optical.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/drive-removable-media.png b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/drive-removable-media.png
index 937ca439..937ca439 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/drive-removable-media.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/drive-removable-media.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/input-keyboard.png b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/input-keyboard.png
index 1fe18a9d..1fe18a9d 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/input-keyboard.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/input-keyboard.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/input-mouse.png b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/input-mouse.png
index 705260f0..705260f0 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/input-mouse.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/input-mouse.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/mate-dev-printer-network.png b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/mate-dev-printer-network.png
index 7fa0f8a9..7fa0f8a9 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/mate-dev-printer-network.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/mate-dev-printer-network.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/mate-dev-printer-new.png b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/mate-dev-printer-new.png
index e1c6572b..e1c6572b 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/mate-dev-printer-new.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/mate-dev-printer-new.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/media-floppy.png b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/media-floppy.png
index cb7b3ba3..cb7b3ba3 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/media-floppy.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/media-floppy.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/media-optical.png b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/media-optical.png
index 0edc5919..0edc5919 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/media-optical.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/media-optical.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/network-wireless.png b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/network-wireless.png
index 1d57b05e..1d57b05e 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/network-wireless.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/network-wireless.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/pda.png b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/pda.png
index d37a2dbb..d37a2dbb 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/pda.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/pda.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/printer.png b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/printer.png
index 5b638d23..5b638d23 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/printer.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/printer.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/devices/symlinks.dat b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/symlinks.dat
index 58bf09db..58bf09db 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/devices/symlinks.dat
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/devices/symlinks.dat
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/Makefile.am b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/Makefile.am
index 4c6d3e1c..b3d7064a 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/Makefile.am
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrintInverse
+themedir = $(datadir)/icons/ContrastHighLargePrintInverse
 size = 48x48
 context = emblems
 
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/emblem-default.png b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/emblem-default.png
index 12975a71..12975a71 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/emblem-default.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/emblem-default.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/emblem-desktop.png b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/emblem-desktop.png
index 19fe6320..19fe6320 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/emblem-desktop.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/emblem-desktop.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/emblem-important.png b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/emblem-important.png
index cbea1baa..cbea1baa 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/emblem-important.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/emblem-important.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/emblem-personal.png b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/emblem-personal.png
index daf67348..daf67348 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/emblem-personal.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/emblem-personal.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/emblem-special.png b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/emblem-special.png
index e76bb299..e76bb299 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/emblem-special.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/emblem-special.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/emblem-unreadable.png b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/emblem-unreadable.png
index d902fb15..d902fb15 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/emblems/emblem-unreadable.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/emblems/emblem-unreadable.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/Makefile.am b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/Makefile.am
index 9e5983dd..8dd14e6a 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/Makefile.am
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrintInverse
+themedir = $(datadir)/icons/ContrastHighLargePrintInverse
 size = 48x48
 context = mimetypes
 
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/application-x-executable.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/application-x-executable.png
index cb9461f8..cb9461f8 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/application-x-executable.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/application-x-executable.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/audio-x-generic.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/audio-x-generic.png
index aec40a31..aec40a31 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/audio-x-generic.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/audio-x-generic.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/font-x-generic.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/font-x-generic.png
index 14abb2e6..14abb2e6 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/font-x-generic.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/font-x-generic.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/image-x-generic.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/image-x-generic.png
index aec40a31..aec40a31 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/image-x-generic.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/image-x-generic.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/mate-mime-application-x-core-file.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/mate-mime-application-x-core-file.png
index c3e056a2..c3e056a2 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/mate-mime-application-x-core-file.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/mate-mime-application-x-core-file.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/package-x-generic.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/package-x-generic.png
index f3d422a0..f3d422a0 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/package-x-generic.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/package-x-generic.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/symlinks.dat b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/symlinks.dat
index 4ae72d02..4ae72d02 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/symlinks.dat
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/symlinks.dat
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/text-x-generic-template.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/text-x-generic-template.png
index 88e41275..88e41275 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/text-x-generic-template.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/text-x-generic-template.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/text-x-generic.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/text-x-generic.png
index aec40a31..aec40a31 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/text-x-generic.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/text-x-generic.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/text-x-preview.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/text-x-preview.png
index aec40a31..aec40a31 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/text-x-preview.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/text-x-preview.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/video-x-generic.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/video-x-generic.png
index aec40a31..aec40a31 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/video-x-generic.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/video-x-generic.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/x-office-address-book.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/x-office-address-book.png
index 438c82c1..438c82c1 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/x-office-address-book.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/x-office-address-book.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/x-office-calendar.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/x-office-calendar.png
index 141e97c8..141e97c8 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/x-office-calendar.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/x-office-calendar.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/x-office-document.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/x-office-document.png
index 5c2de58d..5c2de58d 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/x-office-document.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/x-office-document.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/x-office-presentation.png b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/x-office-presentation.png
index 69068a2f..69068a2f 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/mimetypes/x-office-presentation.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/mimetypes/x-office-presentation.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/places/Makefile.am b/icon-themes/ContrastHighLargePrintInverse/48x48/places/Makefile.am
index b48a9f46..e1ec34e4 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/places/Makefile.am
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/places/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrintInverse
+themedir = $(datadir)/icons/ContrastHighLargePrintInverse
 size = 48x48
 context = places
 
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/places/folder-remote.png b/icon-themes/ContrastHighLargePrintInverse/48x48/places/folder-remote.png
index 6c3ad8e9..6c3ad8e9 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/places/folder-remote.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/places/folder-remote.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/places/folder.icon b/icon-themes/ContrastHighLargePrintInverse/48x48/places/folder.icon
index ecd9b7be..ecd9b7be 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/places/folder.icon
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/places/folder.icon
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/places/folder.png b/icon-themes/ContrastHighLargePrintInverse/48x48/places/folder.png
index 8a028073..8a028073 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/places/folder.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/places/folder.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/places/network-server.png b/icon-themes/ContrastHighLargePrintInverse/48x48/places/network-server.png
index 9d12826f..9d12826f 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/places/network-server.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/places/network-server.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/places/network-workgroup.png b/icon-themes/ContrastHighLargePrintInverse/48x48/places/network-workgroup.png
index 685ad6eb..685ad6eb 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/places/network-workgroup.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/places/network-workgroup.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/places/start-here.png b/icon-themes/ContrastHighLargePrintInverse/48x48/places/start-here.png
index ebafbf0f..ebafbf0f 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/places/start-here.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/places/start-here.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/places/user-desktop.png b/icon-themes/ContrastHighLargePrintInverse/48x48/places/user-desktop.png
index 7a296343..7a296343 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/places/user-desktop.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/places/user-desktop.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/places/user-home.png b/icon-themes/ContrastHighLargePrintInverse/48x48/places/user-home.png
index 0f669761..0f669761 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/places/user-home.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/places/user-home.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/places/user-trash.png b/icon-themes/ContrastHighLargePrintInverse/48x48/places/user-trash.png
index 74fcdf7d..74fcdf7d 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/places/user-trash.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/places/user-trash.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/Makefile.am b/icon-themes/ContrastHighLargePrintInverse/48x48/status/Makefile.am
index 9b270df3..0e8b52d0 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/Makefile.am
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/HighContrastLargePrintInverse
+themedir = $(datadir)/icons/ContrastHighLargePrintInverse
 size = 48x48
 context = status
 
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/audio-volume-high.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/audio-volume-high.png
index df0d80da..df0d80da 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/audio-volume-high.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/audio-volume-high.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/audio-volume-low.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/audio-volume-low.png
index 1eaa6eea..1eaa6eea 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/audio-volume-low.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/audio-volume-low.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/audio-volume-medium.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/audio-volume-medium.png
index b3384987..b3384987 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/audio-volume-medium.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/audio-volume-medium.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/audio-volume-muted.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/audio-volume-muted.png
index 9ec92758..9ec92758 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/audio-volume-muted.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/audio-volume-muted.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/battery-caution.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/battery-caution.png
index 57807783..57807783 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/battery-caution.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/battery-caution.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/battery-low.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/battery-low.png
index 32b8b358..32b8b358 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/battery-low.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/battery-low.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.icon b/icon-themes/ContrastHighLargePrintInverse/48x48/status/folder-drag-accept.icon
index 810fbb6f..810fbb6f 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.icon
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/folder-drag-accept.icon
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/folder-drag-accept.png
index 7e5486f5..7e5486f5 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/folder-drag-accept.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/folder-drag-accept.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/media-playlist-repeat.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/media-playlist-repeat.png
index 3f18e93d..3f18e93d 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/media-playlist-repeat.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/media-playlist-repeat.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/media-playlist-shuffle.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/media-playlist-shuffle.png
index 3d1f9aa5..3d1f9aa5 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/media-playlist-shuffle.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/media-playlist-shuffle.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/network-error.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/network-error.png
index 208899e1..208899e1 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/network-error.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/network-error.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/network-idle.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/network-idle.png
index 831e6fdc..831e6fdc 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/network-idle.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/network-idle.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/network-offline.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/network-offline.png
index 65411479..65411479 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/network-offline.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/network-offline.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/network-receive.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/network-receive.png
index b5e14e19..b5e14e19 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/network-receive.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/network-receive.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/network-transmit-receive.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/network-transmit-receive.png
index ffb7ba2b..ffb7ba2b 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/network-transmit-receive.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/network-transmit-receive.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/network-transmit.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/network-transmit.png
index d911a89f..d911a89f 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/network-transmit.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/network-transmit.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/printer-error.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/printer-error.png
index 3c889c15..3c889c15 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/printer-error.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/printer-error.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/printer-printing.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/printer-printing.png
index 8dd8c79e..8dd8c79e 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/printer-printing.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/printer-printing.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/user-trash-full.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/user-trash-full.png
index e8a58e03..e8a58e03 100755
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/user-trash-full.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/user-trash-full.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-clear-night.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-clear-night.png
index 1637f7f6..1637f7f6 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-clear-night.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-clear-night.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-clear.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-clear.png
index 0b808c9d..0b808c9d 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-clear.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-clear.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-few-clouds-night.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-few-clouds-night.png
index 269fd96a..269fd96a 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-few-clouds-night.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-few-clouds-night.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-few-clouds.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-few-clouds.png
index c1da21ff..c1da21ff 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-few-clouds.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-few-clouds.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-fog.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-fog.png
index 53d05e48..53d05e48 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-fog.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-fog.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-overcast.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-overcast.png
index 160f4f05..160f4f05 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-overcast.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-overcast.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-showers-scattered.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-showers-scattered.png
index 72cd90fb..72cd90fb 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-showers-scattered.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-showers-scattered.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-showers.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-showers.png
index 3421377f..3421377f 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-showers.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-showers.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-snow.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-snow.png
index 7289a41c..7289a41c 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-snow.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-snow.png
diff --git a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-storm.png b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-storm.png
index 7ba52bf7..7ba52bf7 100644
--- a/icon-themes/HighContrastLargePrintInverse/48x48/status/weather-storm.png
+++ b/icon-themes/ContrastHighLargePrintInverse/48x48/status/weather-storm.png
diff --git a/icon-themes/HighContrastLargePrintInverse/Makefile.am b/icon-themes/ContrastHighLargePrintInverse/Makefile.am
index 3a01a46c..d024c101 100644
--- a/icon-themes/HighContrastLargePrintInverse/Makefile.am
+++ b/icon-themes/ContrastHighLargePrintInverse/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/icons/MateHighContrastLargePrintInverse
+themedir = $(datadir)/icons/MateContrastHighLargePrintInverse
 
 SUBDIRS = 36x36 48x48
 
diff --git a/icon-themes/HighContrastLargePrintInverse/index.theme.in b/icon-themes/ContrastHighLargePrintInverse/index.theme.in
index cca9b192..cca9b192 100755
--- a/icon-themes/HighContrastLargePrintInverse/index.theme.in
+++ b/icon-themes/ContrastHighLargePrintInverse/index.theme.in
diff --git a/icon-themes/Makefile.am b/icon-themes/Makefile.am
index e5a7c9ff..3147c220 100644
--- a/icon-themes/Makefile.am
+++ b/icon-themes/Makefile.am
@@ -1,10 +1,10 @@
 SUBDIRS = \
 	Quid \
-	HighContrast \
-	HighContrastInverse \
-	HighContrastLargePrint \
-	HighContrastLargePrintInverse \
-	HighContrast-SVG \
+	ContrastHigh \
+	ContrastHighInverse \
+	ContrastHighLargePrint \
+	ContrastHighLargePrintInverse \
+	ContrastHigh-SVG \
 	LargePrint \
 	Fog