move contrast icon theme to contrasthigh, where it belongs

172 files changed, 14 insertions, 14 deletions

diff --git a/icon-themes/ContrastHighLargePrint/36x36/Makefile.am b/icon-themes/ContrastHigh/36x36/Makefile.am
index 599d058b..599d058b 100644
--- a/icon-themes/ContrastHighLargePrint/36x36/Makefile.am
+++ b/icon-themes/ContrastHigh/36x36/Makefile.am
diff --git a/icon-themes/ContrastHighLargePrint/36x36/animations/Makefile.am b/icon-themes/ContrastHigh/36x36/animations/Makefile.am
index 72ea925d..45650b6d 100644
--- a/icon-themes/ContrastHighLargePrint/36x36/animations/Makefile.am
+++ b/icon-themes/ContrastHigh/36x36/animations/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/ContrastHighLargePrint
+themedir = $(datadir)/icons/ContrastHigh
 size = 36x36
 context = animations
 
diff --git a/icon-themes/ContrastHighLargePrint/36x36/animations/process-idle.png b/icon-themes/ContrastHigh/36x36/animations/process-idle.png
index ce158bbe..ce158bbe 100755
--- a/icon-themes/ContrastHighLargePrint/36x36/animations/process-idle.png
+++ b/icon-themes/ContrastHigh/36x36/animations/process-idle.png
diff --git a/icon-themes/ContrastHighLargePrint/36x36/animations/process-working.png b/icon-themes/ContrastHigh/36x36/animations/process-working.png
index 8085afb8..8085afb8 100755
--- a/icon-themes/ContrastHighLargePrint/36x36/animations/process-working.png
+++ b/icon-themes/ContrastHigh/36x36/animations/process-working.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/Makefile.am b/icon-themes/ContrastHigh/48x48/Makefile.am
index 838df2a7..838df2a7 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/Makefile.am
+++ b/icon-themes/ContrastHigh/48x48/Makefile.am
diff --git a/icon-themes/ContrastHighLargePrint/48x48/actions/Makefile.am b/icon-themes/ContrastHigh/48x48/actions/Makefile.am
index 418e9b0a..0f5adbb3 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/actions/Makefile.am
+++ b/icon-themes/ContrastHigh/48x48/actions/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/ContrastHighLargePrint
+themedir = $(datadir)/icons/ContrastHigh
 size = 48x48
 context = actions
 
diff --git a/icon-themes/ContrastHighLargePrint/48x48/actions/go-home.png b/icon-themes/ContrastHigh/48x48/actions/go-home.png
index 72f155be..72f155be 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/actions/go-home.png
+++ b/icon-themes/ContrastHigh/48x48/actions/go-home.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/actions/media-playback-pause.png b/icon-themes/ContrastHigh/48x48/actions/media-playback-pause.png
index d9c9cad9..d9c9cad9 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/actions/media-playback-pause.png
+++ b/icon-themes/ContrastHigh/48x48/actions/media-playback-pause.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/actions/stock_new-tab.png b/icon-themes/ContrastHigh/48x48/actions/stock_new-tab.png
index 39a6f0c8..39a6f0c8 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/actions/stock_new-tab.png
+++ b/icon-themes/ContrastHigh/48x48/actions/stock_new-tab.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/actions/system-log-out.png b/icon-themes/ContrastHigh/48x48/actions/system-log-out.png
index 80408ced..80408ced 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/actions/system-log-out.png
+++ b/icon-themes/ContrastHigh/48x48/actions/system-log-out.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/actions/system-run.png b/icon-themes/ContrastHigh/48x48/actions/system-run.png
index f9bb92c0..f9bb92c0 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/actions/system-run.png
+++ b/icon-themes/ContrastHigh/48x48/actions/system-run.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/actions/system-search.png b/icon-themes/ContrastHigh/48x48/actions/system-search.png
index 609ff8fd..609ff8fd 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/actions/system-search.png
+++ b/icon-themes/ContrastHigh/48x48/actions/system-search.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/actions/system-shutdown.png b/icon-themes/ContrastHigh/48x48/actions/system-shutdown.png
index 57cd5a1a..57cd5a1a 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/actions/system-shutdown.png
+++ b/icon-themes/ContrastHigh/48x48/actions/system-shutdown.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/actions/view-refresh.png b/icon-themes/ContrastHigh/48x48/actions/view-refresh.png
index 63f1956a..63f1956a 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/actions/view-refresh.png
+++ b/icon-themes/ContrastHigh/48x48/actions/view-refresh.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/Makefile.am b/icon-themes/ContrastHigh/48x48/apps/Makefile.am
index 45145ae7..a4fb4ff9 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/Makefile.am
+++ b/icon-themes/ContrastHigh/48x48/apps/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/ContrastHighLargePrint
+themedir = $(datadir)/icons/ContrastHigh
 size = 48x48
 context = apps
 
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-calculator.png b/icon-themes/ContrastHigh/48x48/apps/accessories-calculator.png
index b486015a..b486015a 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-calculator.png
+++ b/icon-themes/ContrastHigh/48x48/apps/accessories-calculator.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-character-map.png b/icon-themes/ContrastHigh/48x48/apps/accessories-character-map.png
index 12888464..12888464 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-character-map.png
+++ b/icon-themes/ContrastHigh/48x48/apps/accessories-character-map.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-dictionary.png b/icon-themes/ContrastHigh/48x48/apps/accessories-dictionary.png
index 06a9f6e5..06a9f6e5 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-dictionary.png
+++ b/icon-themes/ContrastHigh/48x48/apps/accessories-dictionary.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-text-editor.png b/icon-themes/ContrastHigh/48x48/apps/accessories-text-editor.png
index 9402d048..9402d048 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/accessories-text-editor.png
+++ b/icon-themes/ContrastHigh/48x48/apps/accessories-text-editor.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/advanced-directory.png b/icon-themes/ContrastHigh/48x48/apps/advanced-directory.png
index 4a145e72..4a145e72 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/advanced-directory.png
+++ b/icon-themes/ContrastHigh/48x48/apps/advanced-directory.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/applets-screenshooter.png b/icon-themes/ContrastHigh/48x48/apps/applets-screenshooter.png
index 719a0a08..719a0a08 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/applets-screenshooter.png
+++ b/icon-themes/ContrastHigh/48x48/apps/applets-screenshooter.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/ax-applet.png b/icon-themes/ContrastHigh/48x48/apps/ax-applet.png
index e8a25aba..e8a25aba 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/ax-applet.png
+++ b/icon-themes/ContrastHigh/48x48/apps/ax-applet.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/brasero.png b/icon-themes/ContrastHigh/48x48/apps/brasero.png
index aba6c53d..aba6c53d 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/brasero.png
+++ b/icon-themes/ContrastHigh/48x48/apps/brasero.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/charpick.png b/icon-themes/ContrastHigh/48x48/apps/charpick.png
index 57dc13ee..57dc13ee 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/charpick.png
+++ b/icon-themes/ContrastHigh/48x48/apps/charpick.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/clock.png b/icon-themes/ContrastHigh/48x48/apps/clock.png
index 521b3e4b..521b3e4b 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/clock.png
+++ b/icon-themes/ContrastHigh/48x48/apps/clock.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/display-capplet.png b/icon-themes/ContrastHigh/48x48/apps/display-capplet.png
index e7ee88d5..e7ee88d5 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/display-capplet.png
+++ b/icon-themes/ContrastHigh/48x48/apps/display-capplet.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/eog.png b/icon-themes/ContrastHigh/48x48/apps/eog.png
index 0875d5f5..0875d5f5 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/eog.png
+++ b/icon-themes/ContrastHigh/48x48/apps/eog.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/evince.png b/icon-themes/ContrastHigh/48x48/apps/evince.png
index f3cf1105..f3cf1105 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/evince.png
+++ b/icon-themes/ContrastHigh/48x48/apps/evince.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/evolution.png b/icon-themes/ContrastHigh/48x48/apps/evolution.png
index 655cb1cd..655cb1cd 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/evolution.png
+++ b/icon-themes/ContrastHigh/48x48/apps/evolution.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/file-roller.png b/icon-themes/ContrastHigh/48x48/apps/file-roller.png
index dc7ec041..dc7ec041 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/file-roller.png
+++ b/icon-themes/ContrastHigh/48x48/apps/file-roller.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/firefox-icon.png b/icon-themes/ContrastHigh/48x48/apps/firefox-icon.png
index 2d157480..2d157480 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/firefox-icon.png
+++ b/icon-themes/ContrastHigh/48x48/apps/firefox-icon.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/ghex.png b/icon-themes/ContrastHigh/48x48/apps/ghex.png
index df5504ff..df5504ff 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/ghex.png
+++ b/icon-themes/ContrastHigh/48x48/apps/ghex.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/gimp.png b/icon-themes/ContrastHigh/48x48/apps/gimp.png
index 475d9f35..475d9f35 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/gimp.png
+++ b/icon-themes/ContrastHigh/48x48/apps/gimp.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/gkb.png b/icon-themes/ContrastHigh/48x48/apps/gkb.png
index 3ba478dd..3ba478dd 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/gkb.png
+++ b/icon-themes/ContrastHigh/48x48/apps/gkb.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/gok.png b/icon-themes/ContrastHigh/48x48/apps/gok.png
index e78d7c54..e78d7c54 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/gok.png
+++ b/icon-themes/ContrastHigh/48x48/apps/gok.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/gtkam-camera.png b/icon-themes/ContrastHigh/48x48/apps/gtkam-camera.png
index 719a0a08..719a0a08 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/gtkam-camera.png
+++ b/icon-themes/ContrastHigh/48x48/apps/gtkam-camera.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/help-browser.png b/icon-themes/ContrastHigh/48x48/apps/help-browser.png
index 4ac63f17..4ac63f17 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/help-browser.png
+++ b/icon-themes/ContrastHigh/48x48/apps/help-browser.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/launcher-program.png b/icon-themes/ContrastHigh/48x48/apps/launcher-program.png
index 7996e411..7996e411 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/launcher-program.png
+++ b/icon-themes/ContrastHigh/48x48/apps/launcher-program.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-application-generic.png b/icon-themes/ContrastHigh/48x48/apps/mate-application-generic.png
index 166939f5..166939f5 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-application-generic.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-application-generic.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-audio2.png b/icon-themes/ContrastHigh/48x48/apps/mate-audio2.png
index 6ace9978..6ace9978 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-audio2.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-audio2.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-calc3.png b/icon-themes/ContrastHigh/48x48/apps/mate-calc3.png
index b486015a..b486015a 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-calc3.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-calc3.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-ccmime.png b/icon-themes/ContrastHigh/48x48/apps/mate-ccmime.png
index 3d83774a..3d83774a 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-ccmime.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-ccmime.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-ccscreensaver.png b/icon-themes/ContrastHigh/48x48/apps/mate-ccscreensaver.png
index 25ca1e2d..25ca1e2d 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-ccscreensaver.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-ccscreensaver.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-cd.png b/icon-themes/ContrastHigh/48x48/apps/mate-cd.png
index 6a56953a..6a56953a 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-cd.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-cd.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-folder-generic.png b/icon-themes/ContrastHigh/48x48/apps/mate-folder-generic.png
index a62c8f51..a62c8f51 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-folder-generic.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-folder-generic.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-grecord.png b/icon-themes/ContrastHigh/48x48/apps/mate-grecord.png
index 6ace9978..6ace9978 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-grecord.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-grecord.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-home.png b/icon-themes/ContrastHigh/48x48/apps/mate-home.png
index 74be271a..74be271a 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-home.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-home.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-info.png b/icon-themes/ContrastHigh/48x48/apps/mate-info.png
index 685c1d3d..685c1d3d 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-info.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-info.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-log.png b/icon-themes/ContrastHigh/48x48/apps/mate-log.png
index 04a13b75..04a13b75 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-log.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-log.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-logo-icon-transparent.png b/icon-themes/ContrastHigh/48x48/apps/mate-logo-icon-transparent.png
index 825288cf..825288cf 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-logo-icon-transparent.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-logo-icon-transparent.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-mailcheck.png b/icon-themes/ContrastHigh/48x48/apps/mate-mailcheck.png
index 996c8d64..996c8d64 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-mailcheck.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-mailcheck.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-mini-commander.png b/icon-themes/ContrastHigh/48x48/apps/mate-mini-commander.png
index 9c5a26cb..9c5a26cb 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-mini-commander.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-mini-commander.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-mixer-applet.png b/icon-themes/ContrastHigh/48x48/apps/mate-mixer-applet.png
index bb375318..bb375318 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-mixer-applet.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-mixer-applet.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-palm.png b/icon-themes/ContrastHigh/48x48/apps/mate-palm.png
index ba1df0c8..ba1df0c8 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-palm.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-palm.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-panel.png b/icon-themes/ContrastHigh/48x48/apps/mate-panel.png
index 5cd5081e..5cd5081e 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-panel.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-panel.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-searchtool-animation-rest.png b/icon-themes/ContrastHigh/48x48/apps/mate-searchtool-animation-rest.png
index 609ff8fd..609ff8fd 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-searchtool-animation-rest.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-searchtool-animation-rest.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-searchtool-animation.png b/icon-themes/ContrastHigh/48x48/apps/mate-searchtool-animation.png
index ec7b384f..ec7b384f 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-searchtool-animation.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-searchtool-animation.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-settings-accessibility-keyboard.png b/icon-themes/ContrastHigh/48x48/apps/mate-settings-accessibility-keyboard.png
index e78d7c54..e78d7c54 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-settings-accessibility-keyboard.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-settings-accessibility-keyboard.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-settings-default-applications.png b/icon-themes/ContrastHigh/48x48/apps/mate-settings-default-applications.png
index a76a8bce..a76a8bce 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-settings-default-applications.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-settings-default-applications.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-settings-ui-behavior.png b/icon-themes/ContrastHigh/48x48/apps/mate-settings-ui-behavior.png
index 137edf97..137edf97 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-settings-ui-behavior.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-settings-ui-behavior.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-starthere.png b/icon-themes/ContrastHigh/48x48/apps/mate-starthere.png
index 2a9e6631..2a9e6631 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-starthere.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-starthere.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-windows.png b/icon-themes/ContrastHigh/48x48/apps/mate-windows.png
index 50e474ef..50e474ef 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-windows.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-windows.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-workspace.png b/icon-themes/ContrastHigh/48x48/apps/mate-workspace.png
index b80f57bd..b80f57bd 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mate-workspace.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mate-workspace.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/mozilla-icon.png b/icon-themes/ContrastHigh/48x48/apps/mozilla-icon.png
index 2d157480..2d157480 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/mozilla-icon.png
+++ b/icon-themes/ContrastHigh/48x48/apps/mozilla-icon.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/multimedia-volume-control.png b/icon-themes/ContrastHigh/48x48/apps/multimedia-volume-control.png
index bb375318..bb375318 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/multimedia-volume-control.png
+++ b/icon-themes/ContrastHigh/48x48/apps/multimedia-volume-control.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/orca.png b/icon-themes/ContrastHigh/48x48/apps/orca.png
index e47002fa..e47002fa 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/orca.png
+++ b/icon-themes/ContrastHigh/48x48/apps/orca.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/panel-drawer.png b/icon-themes/ContrastHigh/48x48/apps/panel-drawer.png
index 7e382e53..7e382e53 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/panel-drawer.png
+++ b/icon-themes/ContrastHigh/48x48/apps/panel-drawer.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/panel-force-quit.png b/icon-themes/ContrastHigh/48x48/apps/panel-force-quit.png
index 30e131ac..30e131ac 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/panel-force-quit.png
+++ b/icon-themes/ContrastHigh/48x48/apps/panel-force-quit.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/perfmeter.png b/icon-themes/ContrastHigh/48x48/apps/perfmeter.png
index cf046798..cf046798 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/perfmeter.png
+++ b/icon-themes/ContrastHigh/48x48/apps/perfmeter.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/pidgin.png b/icon-themes/ContrastHigh/48x48/apps/pidgin.png
index 88b9cc2c..88b9cc2c 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/pidgin.png
+++ b/icon-themes/ContrastHigh/48x48/apps/pidgin.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-accessibility.png b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-accessibility.png
index fcc98714..fcc98714 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-accessibility.png
+++ b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-accessibility.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-font.png b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-font.png
index 54d0c653..54d0c653 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-font.png
+++ b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-font.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-keyboard-shortcuts.png b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-keyboard-shortcuts.png
index 01389332..01389332 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-keyboard-shortcuts.png
+++ b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-keyboard-shortcuts.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-keyboard.png b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-keyboard.png
index e78d7c54..e78d7c54 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-keyboard.png
+++ b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-keyboard.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-locale.png b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-locale.png
index d791419f..d791419f 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-locale.png
+++ b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-locale.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-sound.png b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-sound.png
index 6ace9978..6ace9978 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-sound.png
+++ b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-sound.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-theme.png b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-theme.png
index fee5e3bb..fee5e3bb 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-theme.png
+++ b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-theme.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-wallpaper.png b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-wallpaper.png
index 508a05b3..508a05b3 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-desktop-wallpaper.png
+++ b/icon-themes/ContrastHigh/48x48/apps/preferences-desktop-wallpaper.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-system-session.png b/icon-themes/ContrastHigh/48x48/apps/preferences-system-session.png
index 0bfdfced..0bfdfced 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-system-session.png
+++ b/icon-themes/ContrastHigh/48x48/apps/preferences-system-session.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-system-windows.png b/icon-themes/ContrastHigh/48x48/apps/preferences-system-windows.png
index cbd83b1c..cbd83b1c 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/preferences-system-windows.png
+++ b/icon-themes/ContrastHigh/48x48/apps/preferences-system-windows.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/rhythmbox.png b/icon-themes/ContrastHigh/48x48/apps/rhythmbox.png
index 2f30d8b4..2f30d8b4 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/rhythmbox.png
+++ b/icon-themes/ContrastHigh/48x48/apps/rhythmbox.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/smc.png b/icon-themes/ContrastHigh/48x48/apps/smc.png
index 9bdd39d8..9bdd39d8 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/smc.png
+++ b/icon-themes/ContrastHigh/48x48/apps/smc.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/sound-juicer.png b/icon-themes/ContrastHigh/48x48/apps/sound-juicer.png
index 6a56953a..6a56953a 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/sound-juicer.png
+++ b/icon-themes/ContrastHigh/48x48/apps/sound-juicer.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/star.png b/icon-themes/ContrastHigh/48x48/apps/star.png
index 40551661..40551661 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/star.png
+++ b/icon-themes/ContrastHigh/48x48/apps/star.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/symlinks.dat b/icon-themes/ContrastHigh/48x48/apps/symlinks.dat
index bd53871b..bd53871b 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/symlinks.dat
+++ b/icon-themes/ContrastHigh/48x48/apps/symlinks.dat
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/system-file-manager.png b/icon-themes/ContrastHigh/48x48/apps/system-file-manager.png
index 421947ec..421947ec 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/system-file-manager.png
+++ b/icon-themes/ContrastHigh/48x48/apps/system-file-manager.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/thunderbird-icon.png b/icon-themes/ContrastHigh/48x48/apps/thunderbird-icon.png
index 655cb1cd..655cb1cd 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/thunderbird-icon.png
+++ b/icon-themes/ContrastHigh/48x48/apps/thunderbird-icon.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/totem.png b/icon-themes/ContrastHigh/48x48/apps/totem.png
index c43c5b77..c43c5b77 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/totem.png
+++ b/icon-themes/ContrastHigh/48x48/apps/totem.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/utilities-system-monitor.png b/icon-themes/ContrastHigh/48x48/apps/utilities-system-monitor.png
index 7a97eed2..7a97eed2 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/utilities-system-monitor.png
+++ b/icon-themes/ContrastHigh/48x48/apps/utilities-system-monitor.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/utilities-terminal.png b/icon-themes/ContrastHigh/48x48/apps/utilities-terminal.png
index d31dff89..d31dff89 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/utilities-terminal.png
+++ b/icon-themes/ContrastHigh/48x48/apps/utilities-terminal.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/apps/window-capplet.png b/icon-themes/ContrastHigh/48x48/apps/window-capplet.png
index fc8fd62e..fc8fd62e 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/apps/window-capplet.png
+++ b/icon-themes/ContrastHigh/48x48/apps/window-capplet.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/Makefile.am b/icon-themes/ContrastHigh/48x48/categories/Makefile.am
index 1c669a51..4ca62c54 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/Makefile.am
+++ b/icon-themes/ContrastHigh/48x48/categories/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/ContrastHighLargePrint
+themedir = $(datadir)/icons/ContrastHigh
 size = 48x48
 context = categories
 
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-accessories.png b/icon-themes/ContrastHigh/48x48/categories/applications-accessories.png
index f26e2ea4..f26e2ea4 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-accessories.png
+++ b/icon-themes/ContrastHigh/48x48/categories/applications-accessories.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-development.png b/icon-themes/ContrastHigh/48x48/categories/applications-development.png
index 42364704..42364704 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-development.png
+++ b/icon-themes/ContrastHigh/48x48/categories/applications-development.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-engineering.png b/icon-themes/ContrastHigh/48x48/categories/applications-engineering.png
index 42364704..42364704 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-engineering.png
+++ b/icon-themes/ContrastHigh/48x48/categories/applications-engineering.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-games.png b/icon-themes/ContrastHigh/48x48/categories/applications-games.png
index 47bf1373..47bf1373 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-games.png
+++ b/icon-themes/ContrastHigh/48x48/categories/applications-games.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-graphics.png b/icon-themes/ContrastHigh/48x48/categories/applications-graphics.png
index 475d9f35..475d9f35 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-graphics.png
+++ b/icon-themes/ContrastHigh/48x48/categories/applications-graphics.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-internet.png b/icon-themes/ContrastHigh/48x48/categories/applications-internet.png
index 2d157480..2d157480 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-internet.png
+++ b/icon-themes/ContrastHigh/48x48/categories/applications-internet.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-multimedia.png b/icon-themes/ContrastHigh/48x48/categories/applications-multimedia.png
index 2f47deb6..2f47deb6 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-multimedia.png
+++ b/icon-themes/ContrastHigh/48x48/categories/applications-multimedia.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-office.png b/icon-themes/ContrastHigh/48x48/categories/applications-office.png
index 11afab87..11afab87 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-office.png
+++ b/icon-themes/ContrastHigh/48x48/categories/applications-office.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-other.png b/icon-themes/ContrastHigh/48x48/categories/applications-other.png
index 6d7b0624..6d7b0624 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-other.png
+++ b/icon-themes/ContrastHigh/48x48/categories/applications-other.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-science.png b/icon-themes/ContrastHigh/48x48/categories/applications-science.png
index 6d7b0624..6d7b0624 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-science.png
+++ b/icon-themes/ContrastHigh/48x48/categories/applications-science.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-system.png b/icon-themes/ContrastHigh/48x48/categories/applications-system.png
index 6d7b0624..6d7b0624 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-system.png
+++ b/icon-themes/ContrastHigh/48x48/categories/applications-system.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-utilities.png b/icon-themes/ContrastHigh/48x48/categories/applications-utilities.png
index f26e2ea4..f26e2ea4 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/applications-utilities.png
+++ b/icon-themes/ContrastHigh/48x48/categories/applications-utilities.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-desktop-peripherals.png b/icon-themes/ContrastHigh/48x48/categories/preferences-desktop-peripherals.png
index 19980aa8..19980aa8 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-desktop-peripherals.png
+++ b/icon-themes/ContrastHigh/48x48/categories/preferences-desktop-peripherals.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-desktop-personal.png b/icon-themes/ContrastHigh/48x48/categories/preferences-desktop-personal.png
index 19980aa8..19980aa8 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-desktop-personal.png
+++ b/icon-themes/ContrastHigh/48x48/categories/preferences-desktop-personal.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-desktop.png b/icon-themes/ContrastHigh/48x48/categories/preferences-desktop.png
index 19980aa8..19980aa8 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-desktop.png
+++ b/icon-themes/ContrastHigh/48x48/categories/preferences-desktop.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-other.png b/icon-themes/ContrastHigh/48x48/categories/preferences-other.png
index 19980aa8..19980aa8 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-other.png
+++ b/icon-themes/ContrastHigh/48x48/categories/preferences-other.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-system-network.png b/icon-themes/ContrastHigh/48x48/categories/preferences-system-network.png
index 6d7b0624..6d7b0624 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-system-network.png
+++ b/icon-themes/ContrastHigh/48x48/categories/preferences-system-network.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-system.png b/icon-themes/ContrastHigh/48x48/categories/preferences-system.png
index 6d7b0624..6d7b0624 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/categories/preferences-system.png
+++ b/icon-themes/ContrastHigh/48x48/categories/preferences-system.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/Makefile.am b/icon-themes/ContrastHigh/48x48/devices/Makefile.am
index 7ef451f1..80574d94 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/Makefile.am
+++ b/icon-themes/ContrastHigh/48x48/devices/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/ContrastHighLargePrint
+themedir = $(datadir)/icons/ContrastHigh
 size = 48x48
 context = devices
 
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/computer.png b/icon-themes/ContrastHigh/48x48/devices/computer.png
index 6d7b0624..6d7b0624 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/computer.png
+++ b/icon-themes/ContrastHigh/48x48/devices/computer.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/drive-harddisk.png b/icon-themes/ContrastHigh/48x48/devices/drive-harddisk.png
index 83f72cc3..83f72cc3 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/drive-harddisk.png
+++ b/icon-themes/ContrastHigh/48x48/devices/drive-harddisk.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/drive-optical.png b/icon-themes/ContrastHigh/48x48/devices/drive-optical.png
index 3f9dd8b7..3f9dd8b7 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/drive-optical.png
+++ b/icon-themes/ContrastHigh/48x48/devices/drive-optical.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/drive-removable-media.png b/icon-themes/ContrastHigh/48x48/devices/drive-removable-media.png
index 9ea32efa..9ea32efa 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/drive-removable-media.png
+++ b/icon-themes/ContrastHigh/48x48/devices/drive-removable-media.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/input-keyboard.png b/icon-themes/ContrastHigh/48x48/devices/input-keyboard.png
index e78d7c54..e78d7c54 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/input-keyboard.png
+++ b/icon-themes/ContrastHigh/48x48/devices/input-keyboard.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/input-mouse.png b/icon-themes/ContrastHigh/48x48/devices/input-mouse.png
index 78fc44bd..78fc44bd 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/input-mouse.png
+++ b/icon-themes/ContrastHigh/48x48/devices/input-mouse.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/mate-dev-printer-network.png b/icon-themes/ContrastHigh/48x48/devices/mate-dev-printer-network.png
index 26b511b9..26b511b9 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/mate-dev-printer-network.png
+++ b/icon-themes/ContrastHigh/48x48/devices/mate-dev-printer-network.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/mate-dev-printer-new.png b/icon-themes/ContrastHigh/48x48/devices/mate-dev-printer-new.png
index 6e910ed8..6e910ed8 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/mate-dev-printer-new.png
+++ b/icon-themes/ContrastHigh/48x48/devices/mate-dev-printer-new.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/media-floppy.png b/icon-themes/ContrastHigh/48x48/devices/media-floppy.png
index a1627c7b..a1627c7b 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/media-floppy.png
+++ b/icon-themes/ContrastHigh/48x48/devices/media-floppy.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/media-optical.png b/icon-themes/ContrastHigh/48x48/devices/media-optical.png
index 59310054..59310054 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/media-optical.png
+++ b/icon-themes/ContrastHigh/48x48/devices/media-optical.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/pda.png b/icon-themes/ContrastHigh/48x48/devices/pda.png
index ba1df0c8..ba1df0c8 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/pda.png
+++ b/icon-themes/ContrastHigh/48x48/devices/pda.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/printer.png b/icon-themes/ContrastHigh/48x48/devices/printer.png
index 7e165220..7e165220 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/printer.png
+++ b/icon-themes/ContrastHigh/48x48/devices/printer.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/devices/symlinks.dat b/icon-themes/ContrastHigh/48x48/devices/symlinks.dat
index 58bf09db..58bf09db 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/devices/symlinks.dat
+++ b/icon-themes/ContrastHigh/48x48/devices/symlinks.dat
diff --git a/icon-themes/ContrastHighLargePrint/48x48/emblems/Makefile.am b/icon-themes/ContrastHigh/48x48/emblems/Makefile.am
index e2183441..ce22b9df 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/emblems/Makefile.am
+++ b/icon-themes/ContrastHigh/48x48/emblems/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/ContrastHighLargePrint
+themedir = $(datadir)/icons/ContrastHigh
 size = 48x48
 context = emblems
 
diff --git a/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-default.png b/icon-themes/ContrastHigh/48x48/emblems/emblem-default.png
index 759aaefc..759aaefc 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-default.png
+++ b/icon-themes/ContrastHigh/48x48/emblems/emblem-default.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-desktop.png b/icon-themes/ContrastHigh/48x48/emblems/emblem-desktop.png
index 9d5cd6c9..9d5cd6c9 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-desktop.png
+++ b/icon-themes/ContrastHigh/48x48/emblems/emblem-desktop.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-important.png b/icon-themes/ContrastHigh/48x48/emblems/emblem-important.png
index 0f38079b..0f38079b 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-important.png
+++ b/icon-themes/ContrastHigh/48x48/emblems/emblem-important.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-personal.png b/icon-themes/ContrastHigh/48x48/emblems/emblem-personal.png
index 6de92c5f..6de92c5f 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-personal.png
+++ b/icon-themes/ContrastHigh/48x48/emblems/emblem-personal.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-special.png b/icon-themes/ContrastHigh/48x48/emblems/emblem-special.png
index ee283896..ee283896 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-special.png
+++ b/icon-themes/ContrastHigh/48x48/emblems/emblem-special.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-unreadable.png b/icon-themes/ContrastHigh/48x48/emblems/emblem-unreadable.png
index 1ebe1ae4..1ebe1ae4 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/emblems/emblem-unreadable.png
+++ b/icon-themes/ContrastHigh/48x48/emblems/emblem-unreadable.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/Makefile.am b/icon-themes/ContrastHigh/48x48/mimetypes/Makefile.am
index e67dd4a8..19eb79af 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/Makefile.am
+++ b/icon-themes/ContrastHigh/48x48/mimetypes/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/ContrastHighLargePrint
+themedir = $(datadir)/icons/ContrastHigh
 size = 48x48
 context = mimetypes
 
diff --git a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/application-x-executable.png b/icon-themes/ContrastHigh/48x48/mimetypes/application-x-executable.png
index 166939f5..166939f5 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/application-x-executable.png
+++ b/icon-themes/ContrastHigh/48x48/mimetypes/application-x-executable.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/audio-x-generic.png b/icon-themes/ContrastHigh/48x48/mimetypes/audio-x-generic.png
index a53ef5ce..a53ef5ce 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/audio-x-generic.png
+++ b/icon-themes/ContrastHigh/48x48/mimetypes/audio-x-generic.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/font-x-generic.png b/icon-themes/ContrastHigh/48x48/mimetypes/font-x-generic.png
index efb02748..efb02748 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/font-x-generic.png
+++ b/icon-themes/ContrastHigh/48x48/mimetypes/font-x-generic.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/image-x-generic.png b/icon-themes/ContrastHigh/48x48/mimetypes/image-x-generic.png
index a53ef5ce..a53ef5ce 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/image-x-generic.png
+++ b/icon-themes/ContrastHigh/48x48/mimetypes/image-x-generic.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/mate-mime-application-x-core-file.png b/icon-themes/ContrastHigh/48x48/mimetypes/mate-mime-application-x-core-file.png
index bb9157ec..bb9157ec 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/mate-mime-application-x-core-file.png
+++ b/icon-themes/ContrastHigh/48x48/mimetypes/mate-mime-application-x-core-file.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/package-x-generic.png b/icon-themes/ContrastHigh/48x48/mimetypes/package-x-generic.png
index 7c511aae..7c511aae 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/package-x-generic.png
+++ b/icon-themes/ContrastHigh/48x48/mimetypes/package-x-generic.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/symlinks.dat b/icon-themes/ContrastHigh/48x48/mimetypes/symlinks.dat
index 4ae72d02..4ae72d02 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/symlinks.dat
+++ b/icon-themes/ContrastHigh/48x48/mimetypes/symlinks.dat
diff --git a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/text-x-generic.png b/icon-themes/ContrastHigh/48x48/mimetypes/text-x-generic.png
index a53ef5ce..a53ef5ce 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/text-x-generic.png
+++ b/icon-themes/ContrastHigh/48x48/mimetypes/text-x-generic.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/text-x-preview.png b/icon-themes/ContrastHigh/48x48/mimetypes/text-x-preview.png
index a53ef5ce..a53ef5ce 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/text-x-preview.png
+++ b/icon-themes/ContrastHigh/48x48/mimetypes/text-x-preview.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/video-x-generic.png b/icon-themes/ContrastHigh/48x48/mimetypes/video-x-generic.png
index a53ef5ce..a53ef5ce 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/video-x-generic.png
+++ b/icon-themes/ContrastHigh/48x48/mimetypes/video-x-generic.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/x-office-address-book.png b/icon-themes/ContrastHigh/48x48/mimetypes/x-office-address-book.png
index 325118f2..325118f2 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/mimetypes/x-office-address-book.png
+++ b/icon-themes/ContrastHigh/48x48/mimetypes/x-office-address-book.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/places/Makefile.am b/icon-themes/ContrastHigh/48x48/places/Makefile.am
index 7dc136f7..1c2c6ec6 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/places/Makefile.am
+++ b/icon-themes/ContrastHigh/48x48/places/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/ContrastHighLargePrint
+themedir = $(datadir)/icons/ContrastHigh
 size = 48x48
 context = places
 
diff --git a/icon-themes/ContrastHighLargePrint/48x48/places/folder-remote.png b/icon-themes/ContrastHigh/48x48/places/folder-remote.png
index 560163be..560163be 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/places/folder-remote.png
+++ b/icon-themes/ContrastHigh/48x48/places/folder-remote.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/places/folder.icon b/icon-themes/ContrastHigh/48x48/places/folder.icon
index ecd9b7be..ecd9b7be 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/places/folder.icon
+++ b/icon-themes/ContrastHigh/48x48/places/folder.icon
diff --git a/icon-themes/ContrastHighLargePrint/48x48/places/folder.png b/icon-themes/ContrastHigh/48x48/places/folder.png
index c43ec1a2..c43ec1a2 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/places/folder.png
+++ b/icon-themes/ContrastHigh/48x48/places/folder.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/places/network-server.png b/icon-themes/ContrastHigh/48x48/places/network-server.png
index 3b585cad..3b585cad 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/places/network-server.png
+++ b/icon-themes/ContrastHigh/48x48/places/network-server.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/places/network-workgroup.png b/icon-themes/ContrastHigh/48x48/places/network-workgroup.png
index b0c82e33..b0c82e33 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/places/network-workgroup.png
+++ b/icon-themes/ContrastHigh/48x48/places/network-workgroup.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/places/start-here.png b/icon-themes/ContrastHigh/48x48/places/start-here.png
index 825288cf..825288cf 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/places/start-here.png
+++ b/icon-themes/ContrastHigh/48x48/places/start-here.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/places/user-desktop.png b/icon-themes/ContrastHigh/48x48/places/user-desktop.png
index 40bb56a4..40bb56a4 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/places/user-desktop.png
+++ b/icon-themes/ContrastHigh/48x48/places/user-desktop.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/places/user-home.png b/icon-themes/ContrastHigh/48x48/places/user-home.png
index 1e6916f5..1e6916f5 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/places/user-home.png
+++ b/icon-themes/ContrastHigh/48x48/places/user-home.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/places/user-trash.png b/icon-themes/ContrastHigh/48x48/places/user-trash.png
index f553c81f..f553c81f 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/places/user-trash.png
+++ b/icon-themes/ContrastHigh/48x48/places/user-trash.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/Makefile.am b/icon-themes/ContrastHigh/48x48/status/Makefile.am
index e1e2cffd..75618861 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/status/Makefile.am
+++ b/icon-themes/ContrastHigh/48x48/status/Makefile.am
@@ -1,6 +1,6 @@
 NULL=
 
-themedir = $(datadir)/icons/ContrastHighLargePrint
+themedir = $(datadir)/icons/ContrastHigh
 size = 48x48
 context = status
 
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-high.png b/icon-themes/ContrastHigh/48x48/status/audio-volume-high.png
index 5cfe9f69..5cfe9f69 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-high.png
+++ b/icon-themes/ContrastHigh/48x48/status/audio-volume-high.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-low.png b/icon-themes/ContrastHigh/48x48/status/audio-volume-low.png
index efa72c20..efa72c20 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-low.png
+++ b/icon-themes/ContrastHigh/48x48/status/audio-volume-low.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-medium.png b/icon-themes/ContrastHigh/48x48/status/audio-volume-medium.png
index a63bf561..a63bf561 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-medium.png
+++ b/icon-themes/ContrastHigh/48x48/status/audio-volume-medium.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-muted.png b/icon-themes/ContrastHigh/48x48/status/audio-volume-muted.png
index be22e2bd..be22e2bd 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/status/audio-volume-muted.png
+++ b/icon-themes/ContrastHigh/48x48/status/audio-volume-muted.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/folder-drag-accept.icon b/icon-themes/ContrastHigh/48x48/status/folder-drag-accept.icon
index 810fbb6f..810fbb6f 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/status/folder-drag-accept.icon
+++ b/icon-themes/ContrastHigh/48x48/status/folder-drag-accept.icon
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/folder-drag-accept.png b/icon-themes/ContrastHigh/48x48/status/folder-drag-accept.png
index e273b71d..e273b71d 100755
--- a/icon-themes/ContrastHighLargePrint/48x48/status/folder-drag-accept.png
+++ b/icon-themes/ContrastHigh/48x48/status/folder-drag-accept.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/network-error.png b/icon-themes/ContrastHigh/48x48/status/network-error.png
index eff2738f..eff2738f 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/status/network-error.png
+++ b/icon-themes/ContrastHigh/48x48/status/network-error.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/network-idle.png b/icon-themes/ContrastHigh/48x48/status/network-idle.png
index 67ea042c..67ea042c 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/status/network-idle.png
+++ b/icon-themes/ContrastHigh/48x48/status/network-idle.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/network-offline.png b/icon-themes/ContrastHigh/48x48/status/network-offline.png
index c8476a32..c8476a32 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/status/network-offline.png
+++ b/icon-themes/ContrastHigh/48x48/status/network-offline.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/network-receive.png b/icon-themes/ContrastHigh/48x48/status/network-receive.png
index 38e545c4..38e545c4 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/status/network-receive.png
+++ b/icon-themes/ContrastHigh/48x48/status/network-receive.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/network-transmit-receive.png b/icon-themes/ContrastHigh/48x48/status/network-transmit-receive.png
index 47172156..47172156 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/status/network-transmit-receive.png
+++ b/icon-themes/ContrastHigh/48x48/status/network-transmit-receive.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/network-transmit.png b/icon-themes/ContrastHigh/48x48/status/network-transmit.png
index 3fff320f..3fff320f 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/status/network-transmit.png
+++ b/icon-themes/ContrastHigh/48x48/status/network-transmit.png
diff --git a/icon-themes/ContrastHighLargePrint/48x48/status/user-trash-full.png b/icon-themes/ContrastHigh/48x48/status/user-trash-full.png
index 65a6d337..65a6d337 100644
--- a/icon-themes/ContrastHighLargePrint/48x48/status/user-trash-full.png
+++ b/icon-themes/ContrastHigh/48x48/status/user-trash-full.png
diff --git a/icon-themes/ContrastHigh/Makefile.am b/icon-themes/ContrastHigh/Makefile.am
index 831f1247..7b35bafd 100644
--- a/icon-themes/ContrastHigh/Makefile.am
+++ b/icon-themes/ContrastHigh/Makefile.am
@@ -1,5 +1,7 @@
 indexthemedir =	$(datadir)/icons/ContrastHigh/
 
+SUBDIRS = 36x36 48x48
+
 indextheme_DATA = index.theme
 
 EXTRA_DIST=	$(indextheme_DATA)
diff --git a/icon-themes/ContrastHigh/index.theme b/icon-themes/ContrastHigh/index.theme
index ba4ba67f..06346ed1 100755
--- a/icon-themes/ContrastHigh/index.theme
+++ b/icon-themes/ContrastHigh/index.theme
@@ -1,7 +1,7 @@
 [Icon Theme]
 Name=ContrastHigh
 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
+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/categories,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/places,48x48/status,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=mate
 
 [16x16/actions]
diff --git a/icon-themes/ContrastHighInverse/index.theme b/icon-themes/ContrastHighInverse/index.theme
index 4e46a6be..21888b2c 100755
--- a/icon-themes/ContrastHighInverse/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=ContrastHighLargePrintInverse,mate
+Inherits=ContrastHigh,mate
 
 [16x16/actions]
 Size=16
diff --git a/icon-themes/ContrastHighLargePrint/Makefile.am b/icon-themes/ContrastHighLargePrint/Makefile.am
index effe8269..58d99b7b 100644
--- a/icon-themes/ContrastHighLargePrint/Makefile.am
+++ b/icon-themes/ContrastHighLargePrint/Makefile.am
@@ -1,7 +1,5 @@
 themedir = $(datadir)/icons/ContrastHighLargePrint
 
-SUBDIRS = 36x36 48x48
-
 THEME_IN_FILES = index.theme.in
 
 %.theme:   %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
diff --git a/icon-themes/ContrastHighLargePrint/index.theme.in b/icon-themes/ContrastHighLargePrint/index.theme.in
index 055e8653..d37f25ea 100755
--- a/icon-themes/ContrastHighLargePrint/index.theme.in
+++ b/icon-themes/ContrastHighLargePrint/index.theme.in
@@ -5,7 +5,7 @@ Hidden=true
 
 Directories=36x36/animations,48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/places,48x48/status
 
-Inherits=mate
+Inherits=ContrastHigh,mate
 
 [36x36/animations]
 Size=36