10 files changed, 227 insertions, 297 deletions
diff --git a/Makefile.am b/Makefile.am
index 6d8e8565..bf21dc6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = \
 icon-themes \
 desktop-themes \
 cursor-themes \
- common \
 po
 
 EXTRA_DIST = \
diff --git a/common/Makefile.am b/common/Makefile.am
deleted file mode 100644
index bfb48e48..00000000
--- a/common/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRA_DIST = all-stock-icons.data \
- gtk-stock-icons.rc \
- media-stock-icons.rc \
- panel-stock-icons.rc \
- mkiconlinks.sh
diff --git a/common/all-stock-icons.data b/common/all-stock-icons.data
deleted file mode 100644
index 205d0a0c..00000000
--- a/common/all-stock-icons.data
+++ /dev/null
@@ -1,60 +0,0 @@
-NULL=
-
-pixmap_DATA = \
- stock_about.png stock_add.png stock_apply.png \
- stock_attach.png stock_bold.png stock_book.png \
- stock_cancel.png stock_cdrom.png stock_clear.png \
- stock_close.png stock_connect.png stock_convert.png \
- stock_copy.png stock_cut.png stock_delete.png \
- stock_dialog_error.png stock_dialog_info.png \
- stock_dialog_question.png stock_dialog_warning.png \
- stock_disconnect.png stock_edit.png stock_empty.png \
- stock_execute.png stock_export.png \
- stock_find-and-replace.png stock_find.png \
- stock_floppy.png stock_go-back.png \
- stock_go-down.png stock_go-forward.png \
- stock_go-up.png stock_goto-bottom.png \
- stock_goto-first.png stock_goto-last.png \
- stock_goto-top.png stock_help.png stock_home.png \
- stock_import.png stock_index.png \
- stock_insert-image.png stock_insert-object.png \
- stock_insert-table.png stock_italic.png \
- stock_jump-to.png stock_justify-center.png \
- stock_justify-fill.png stock_justify-left.png \
- stock_justify-right.png stock_line-in.png \
- stock_mic.png stock_missing-image.png stock_new.png \
- stock_ok.png stock_open.png stock_paste.png \
- stock_preferences.png stock_print-preview.png \
- stock_print.png stock_properties.png stock_quit.png \
- stock_redo.png stock_refresh.png stock_remove.png \
- stock_revert-to-saved.png stock_save-as.png \
- stock_save.png stock_select-color.png \
- stock_select-font.png stock_sort-ascending.png \
- stock_sort-descending.png stock_spell-check.png \
- stock_stop.png stock_strikethrough.png \
- stock_undelete.png stock_underline.png \
- stock_undo.png stock_volume.png stock_zoom-100.png \
- stock_zoom-fit.png stock_zoom-in.png \
- stock_zoom-out.png stock_yes.png stock_no.png \
- stock_dnd.png stock_dnd_multiple.png \
- stock_run.png stock_searchtool.png stock_lockscreen.png \
- stock_logout.png stock_mate-logo.png stock_cde-menu.png \
- stock_internet.png stock_mate-util.png \
- stock_launcher-program.png stock_multimedia.png \
- stock_drawer.png stock_screenshot.png \
- stock_amusements.png stock_accessories.png \
- stock_commandline-browser.xpm stock_commandline-history.xpm\
- media-prev.png media-next.png \
- media-stop.png media-eject.png \
- media-play.png media-pause.png media-record.png \
- media-backward.png media-forward.png \
- volume-mute.png volume-zero.png \
- volume-min.png volume-medium.png volume-max.png \
- double-click-on.png double-click-off.png double-click-maybe.png \
- printer-default.png printer-broken.png printer-inkjet.png \
- printer-personal-laser.png printer-workgroup-laser.png \
- marco-minimize.png marco-maximize.png \
- marco-delete.png \
- stock_info.png stock_harddisk.png \
- $(NULL)
-
diff --git a/common/gtk-stock-icons.rc b/common/gtk-stock-icons.rc
deleted file mode 100644
index 18411bb6..00000000
--- a/common/gtk-stock-icons.rc
+++ /dev/null
@@ -1,107 +0,0 @@
-
- stock["mate-stock-about"] = {{ "stock_about.png" }}
- stock["mate-stock-volume"] = {{ "stock_volume.png" }}
- stock["mate-stock-mic"] = {{ "stock_mic.png" }}
- stock["mate-stock-line-in"] = {{ "stock_line-in.png" }}
- stock["mate-stock-attach"] = {{ "stock_attach.png" }}
- stock["mate-stock-book-blue"] = {{ "stock_book.png" }}
- stock["mate-stock-book-green"] = {{ "stock_book.png" }}
- stock["mate-stock-book-red"] = {{ "stock_book.png" }}
- stock["mate-stock-book-yellow"] = {{ "stock_book.png" }}
-
- stock["gtk-dialog-info"] = {{ "stock_dialog_info.png" }}
- stock["gtk-dialog-question"] = {{ "stock_dialog_question.png" }}
- stock["gtk-dialog-error"] = {{ "stock_dialog_error.png" }}
- stock["gtk-dialog-warning"] = {{ "stock_dialog_warning.png" }}
- stock["gtk-dialog-authentication"] = {{ "stock_lockscreen.png" }}
-
- stock["gtk-dnd"] = {{ "stock_dnd.png" }} 
- stock["gtk-dnd-multiple"] = {{ "stock_dnd_multiple.png" }} 
-
- stock["gtk-about"] = {{ "stock_about.png" }}
- stock["gtk-add"] = {{ "stock_add.png" }}
- stock["gtk-apply"] = {{ "stock_apply.png" }}
- stock["gtk-bold"] = {{ "stock_bold.png" }} 
- stock["gtk-cancel"] = {{ "stock_cancel.png" }}
- stock["gtk-cdrom"] = {{ "stock_cdrom.png" }}
- stock["gtk-clear"] = {{ "stock_clear.png" }}
- stock["gtk-close"] = {{ "stock_close.png" }}
- stock["gtk-connect"] = {{ "stock_connect.png" }}
- stock["gtk-convert"] = {{ "stock_convert.png" }}
- stock["gtk-copy"] = {{ "stock_copy.png" }}
- stock["gtk-cut"] = {{ "stock_cut.png" }}
- stock["gtk-delete"] = {{ "stock_delete.png" }}
- stock["gtk-disconnect"] = {{ "stock_disconnect.png" }}
- stock["gtk-directory"] = {{ "stock_open.png" }}
- stock["gtk-edit"] = {{ "stock_edit.png" }}
- stock["gtk-execute"] = {{ "stock_execute.png" }}
- stock["gtk-find"] = {{ "stock_find.png" }}
- stock["gtk-find-and-replace"] = {{ "stock_find-and-replace.png" }}
- stock["gtk-floppy"] = {{ "stock_floppy.png" }}
- stock["gtk-goto-bottom"] = {{ "stock_goto-bottom.png" }}
- stock["gtk-goto-first"] = {{ "stock_goto-first.png" }}
- stock["gtk-goto-last"] = {{ "stock_goto-last.png" }}
- stock["gtk-goto-top"] = {{ "stock_goto-top.png" }}
- stock["gtk-go-back"] = {{ "stock_go-back.png" }}
- stock["gtk-go-down"] = {{ "stock_go-down.png" }}
- stock["gtk-go-forward"] = {{ "stock_go-forward.png" }}
- stock["gtk-go-up"] = {{ "stock_go-up.png" }}
- stock["gtk-help"] = {{ "stock_help.png" }}
- stock["gtk-harddisk"] = {{ "stock_harddisk.png" }}
- stock["gtk-home"] = {{ "stock_home.png" }}
- stock["gtk-index"] = {{ "stock_index.png" }}
- stock["gtk-info"] = {{ "stock_info.png" }}
- stock["gtk-italic"] = {{ "stock_italic.png" }}
-
- stock["gtk-jump-to"] = {{ "stock_jump-to.png" }}
- stock["gtk-justify-center"] = {{ "stock_justify-center.png" }}
- stock["gtk-justify-fill"] = {{ "stock_justify-fill.png" }}
- stock["gtk-justify-left"] = {{ "stock_justify-left.png" }}
- stock["gtk-justify-right"] = {{ "stock_justify-right.png" }}
- stock["gtk-missing-image"] = {{ "stock_missing-image.png" }}
- stock["gtk-media-forward"] = {{ "media-forward.png" }}
- stock["gtk-media-next"] = {{ "media-next.png" }}
- stock["gtk-media-pause"] = {{ "media-pause.png" }}
- stock["gtk-media-play"] = {{ "media-play.png" }}
- stock["gtk-media-previous"] = {{ "media-prev.png" }}
- stock["gtk-media-record"] = {{ "media-record.png" }}
- stock["gtk-media-rewind"] = {{ "media-backward.png" }}
- stock["gtk-media-stop"] = {{ "media-stop.png" }}
- stock["gtk-new"] = {{ "stock_new.png" }}
- stock["gtk-no"] = {{ "stock_no.png" }} 
- stock["gtk-ok"] = {{ "stock_ok.png" }}
- stock["gtk-open"] = {{ "stock_open.png" }} 
- stock["gtk-paste"] = {{ "stock_paste.png" }}
- stock["gtk-print"] = {{ "stock_print.png" }}
- stock["gtk-print-preview"] = {{ "stock_print-preview.png" }}
- stock["gtk-preferences"] = {{ "stock_preferences.png" }}
- stock["gtk-properties"] = {{ "stock_properties.png" }}
- stock["gtk-quit"] = {{ "stock_quit.png" }}
- stock["gtk-redo"] = {{ "stock_redo.png" }}
- stock["gtk-refresh"] = {{ "stock_refresh.png" }}
- stock["gtk-remove"] = {{ "stock_remove.png" }}
- stock["gtk-revert-to-saved"] ={{ "stock_revert-to-saved.png" }}
- stock["gtk-save"] = {{ "stock_save.png" }}
- stock["gtk-save-as"] = {{ "stock_save-as.png" }}
- stock["gtk-select-color"] = {{ "stock_select-color.png" }}
- stock["gtk-select-font"] = {{ "stock_select-font.png" }}
- stock["gtk-sort-ascending"] = {{ "stock_sort-ascending.png" }}
- stock["gtk-sort-descending"] ={{ "stock_sort-descending.png" }}
- stock["gtk-spell-check"] = {{ "stock_spell-check.png" }}
- stock["gtk-stop"] = {{ "stock_stop.png" }}
- stock["gtk-strikethrough"] = {{ "stock_strikethrough.png" }}
- stock["gtk-undelete"] = {{ "stock_undelete.png" }}
- stock["gtk-underline"] = {{ "stock_underline.png" }}
- stock["gtk-undo"] = {{ "stock_undo.png" }}
- stock["gtk-yes"] = {{ "stock_yes.png" }} 
- stock["gtk-zoom-100"] = {{ "stock_zoom-100.png" }}
- stock["gtk-zoom-fit"] = {{ "stock_zoom-fit.png" }}
- stock["gtk-zoom-in"] = {{ "stock_zoom-in.png" }}
- stock["gtk-zoom-out"] = {{ "stock_zoom-out.png" }}
-
- stock["terminal-edit"] = {{ "stock_preferences.png" }}
- stock["session-stock-edit"] = {{ "stock_preferences.png" }}
-}
-
-class "GtkWidget" style "default"
-
diff --git a/common/media-stock-icons.rc b/common/media-stock-icons.rc
deleted file mode 100644
index 27a44424..00000000
--- a/common/media-stock-icons.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-style "media-icons"
-{
-
- stock ["media-stop"] = {{"media-stop.png"}}
- stock ["media-play"] = {{"media-play.png"}}
- stock ["media-pause"] = {{"media-pause.png"}}
- stock ["media-prev"] = {{"media-prev.png"}}
- stock ["media-next"] = {{"media-next.png"}}
- stock ["media-eject"] = {{"media-eject.png"}}
- stock ["media-record"] = {{"media-record.png"}}
-
- stock ["volume-mute"] = {{"volume-mute.png"}}
- stock ["volume-zero"] = {{"volume-zero.png"}}
- stock ["volume-min"] = {{"volume-min.png"}}
- stock ["volume-med"] = {{"volume-medium.png"}}
- stock ["volume-max"] = {{"volume-max.png"}}
-
-}
-class "GtkWidget" style "media-icons"
-
diff --git a/common/mkiconlinks.sh b/common/mkiconlinks.sh
deleted file mode 100755
index b5249e42..00000000
--- a/common/mkiconlinks.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# usage:
-# mkiconlinks linkdata icondir
-#
-# Linkdata file consists of lines of the form:
-# filename1: filename2 filename3 ... filenameN
-#
-# For each line in the data file, the script creates a symbolic link to 
-# $(icondir)/filename1 from each of $(icondir)/filename2, 
-# $(icondir)/filename3 ... $(icondir)/filenameN.
-
-exec < $1
-cd $2
-
-read NEXTLINE 
-while [ ! -z "$NEXTLINE" ] ; do
-
- # Skip lines beginning with '#'
- if ! echo "$NEXTLINE" | grep -q '^#'; then
- #Extract first field, minus its trailing colon
- ORIG_FILE=`echo $NEXTLINE | awk '/:/{print $1}' | sed -e 's/://'`
-
- #Extract list of following fields
- LINKTO=`echo $NEXTLINE | awk '/:/{for (i=2; i<=NF; i++) print $i}'`
-
- if [ ! -z "$LINKTO" ] ; then
- echo "Creating symlinks to `pwd`/$ORIG_FILE"
- fi
-
- fi
-
- #Link each pair in turn
- for i in $LINKTO ; do
- ln -s -f "$ORIG_FILE" "$i"
- done
-
- read NEXTLINE 
-done
-exit 0
diff --git a/common/panel-stock-icons.rc b/common/panel-stock-icons.rc
deleted file mode 100644
index a6fd11cc..00000000
--- a/common/panel-stock-icons.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-style "panel-icons"
-{
- stock ["panel-run"] = {{"stock_run.png"}}
- stock ["panel-searchtool"] = {{"stock_searchtool.png"}}
- stock ["panel-screenshot"] = {{"stock_screenshot.png"}}
- stock ["panel-lockscreen"] = {{"stock_lockscreen.png"}}
- stock ["panel-logout"] = {{"stock_logout.png"}}
- stock ["panel-mate-logo"] = {{"stock_mate-logo.png"}}
-
- stock ["panel-cde"] = {{"stock_cde-menu.png"}}
-#TBD stock ["panel-debian"] = {{""}}
-#TBD stock ["panel-kde"] = {{""}}
-#TBD stock ["panel-suse"] = {{""}}
-
- stock ["panel-amusements"] = {{"stock_amusements.png"}}
- stock ["panel-accessories"] = {{"stock_accessories.png"}}
- stock ["panel-multimedia"] = {{"stock_multimedia.png"}}
-
- stock ["panel-internet"] = {{"stock_internet.png"}}
- stock ["panel-utility"] = {{"stock_mate-util.png"}}
-
-# stock ["panel-corner-type"] = {{"stock_corner-panel.png"}}
-# stock ["panel-edge-type"] = {{"stock_edge-panel.png"}}
-# stock ["panel-floating-type"] = {{"stock_floating-panel.png"}}
-# stock ["panel-sliding-type"] = {{"stock_sliding-panel.png"}}
-# stock ["panel-menu-type"] = {{"stock_menu-panel.png"}}
-
- stock ["panel-launcher"] = {{"stock_launcher-program.png"}}
-
- stock ["panel-drawer"] = {{"stock_drawer.png"}}
-# stock ["mate-panel-applet"] = {{""}}
-# stock ["panel-desktop"] = {{""}}
-
-# stock ["panel-arrow-left"] = {{"stock_panel_hide_left.png"}}
-# stock ["panel-arrow-right"] = {{"stock_panel_hide_right.png"}}
-# stock ["panel-arrow-up"] = {{"stock_panel_hide_up.png"}}
-# stock ["panel-arrow-down"] = {{"stock_panel_hide_down.png"}}
-
- stock ["commandline-browser"] = {{"stock_commandline-browser.xpm"}}
- stock ["commandline-history"] = {{"stock_commandline-history.xpm"}}
-
-}
-class "GtkWidget" style "panel-icons"
diff --git a/configure.ac b/configure.ac
index 44b41ec0..c43e7f7a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,24 +26,8 @@ PKG_CHECK_MODULES(THEME_ENGINE,
 [gtk+-2.0 >= 2.0.0 dnl
 gdk-pixbuf-2.0 >= 2.0.0 ])
 
-GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
-AC_SUBST(GTK_VERSION)
-
-dnl used to substitute in common sections of theme gtkrc files
-gtk_stock_icons_rc=${srcdir}/common/gtk-stock-icons.rc
-panel_stock_icons_rc=${srcdir}/common/panel-stock-icons.rc
-media_stock_icons_rc=${srcdir}/common/media-stock-icons.rc
-capplet_stock_icons_rc=${srcdir}/common/capplet-stock-icons.rc
-marco_stock_icons_rc=${srcdir}/common/marco-stock-icons.rc
-AC_SUBST_FILE(gtk_stock_icons_rc)
-AC_SUBST_FILE(panel_stock_icons_rc)
-AC_SUBST_FILE(media_stock_icons_rc)
-AC_SUBST_FILE(capplet_stock_icons_rc)
-AC_SUBST_FILE(marco_stock_icons_rc)
-
 AC_CONFIG_FILES([
 Makefile
-common/Makefile
 cursor-themes/Makefile
 cursor-themes/mate-white/Makefile
 cursor-themes/mate-white/cursors/Makefile
diff --git a/desktop-themes/HighContrastInverse/gtk-2.0/gtkrc.in b/desktop-themes/HighContrastInverse/gtk-2.0/gtkrc.in
index 678f111f..2d5e2254 100755
--- a/desktop-themes/HighContrastInverse/gtk-2.0/gtkrc.in
+++ b/desktop-themes/HighContrastInverse/gtk-2.0/gtkrc.in
@@ -89,11 +89,175 @@ style "default"
 bg[SELECTED] = "#ffffff"
 base[SELECTED] = "#ffcccc"
 
-@gtk_stock_icons_rc@
-@panel_stock_icons_rc@
-@media_stock_icons_rc@
-@capplet_stock_icons_rc@
-@marco_stock_icons_rc@
+ stock["mate-stock-about"] = {{ "stock_about.png" }}
+ stock["mate-stock-volume"] = {{ "stock_volume.png" }}
+ stock["mate-stock-mic"] = {{ "stock_mic.png" }}
+ stock["mate-stock-line-in"] = {{ "stock_line-in.png" }}
+ stock["mate-stock-attach"] = {{ "stock_attach.png" }}
+ stock["mate-stock-book-blue"] = {{ "stock_book.png" }}
+ stock["mate-stock-book-green"] = {{ "stock_book.png" }}
+ stock["mate-stock-book-red"] = {{ "stock_book.png" }}
+ stock["mate-stock-book-yellow"] = {{ "stock_book.png" }}
+
+ stock["gtk-dialog-info"] = {{ "stock_dialog_info.png" }}
+ stock["gtk-dialog-question"] = {{ "stock_dialog_question.png" }}
+ stock["gtk-dialog-error"] = {{ "stock_dialog_error.png" }}
+ stock["gtk-dialog-warning"] = {{ "stock_dialog_warning.png" }}
+ stock["gtk-dialog-authentication"] = {{ "stock_lockscreen.png" }}
+
+ stock["gtk-dnd"] = {{ "stock_dnd.png" }} 
+ stock["gtk-dnd-multiple"] = {{ "stock_dnd_multiple.png" }} 
+
+ stock["gtk-about"] = {{ "stock_about.png" }}
+ stock["gtk-add"] = {{ "stock_add.png" }}
+ stock["gtk-apply"] = {{ "stock_apply.png" }}
+ stock["gtk-bold"] = {{ "stock_bold.png" }} 
+ stock["gtk-cancel"] = {{ "stock_cancel.png" }}
+ stock["gtk-cdrom"] = {{ "stock_cdrom.png" }}
+ stock["gtk-clear"] = {{ "stock_clear.png" }}
+ stock["gtk-close"] = {{ "stock_close.png" }}
+ stock["gtk-connect"] = {{ "stock_connect.png" }}
+ stock["gtk-convert"] = {{ "stock_convert.png" }}
+ stock["gtk-copy"] = {{ "stock_copy.png" }}
+ stock["gtk-cut"] = {{ "stock_cut.png" }}
+ stock["gtk-delete"] = {{ "stock_delete.png" }}
+ stock["gtk-disconnect"] = {{ "stock_disconnect.png" }}
+ stock["gtk-directory"] = {{ "stock_open.png" }}
+ stock["gtk-edit"] = {{ "stock_edit.png" }}
+ stock["gtk-execute"] = {{ "stock_execute.png" }}
+ stock["gtk-find"] = {{ "stock_find.png" }}
+ stock["gtk-find-and-replace"] = {{ "stock_find-and-replace.png" }}
+ stock["gtk-floppy"] = {{ "stock_floppy.png" }}
+ stock["gtk-goto-bottom"] = {{ "stock_goto-bottom.png" }}
+ stock["gtk-goto-first"] = {{ "stock_goto-first.png" }}
+ stock["gtk-goto-last"] = {{ "stock_goto-last.png" }}
+ stock["gtk-goto-top"] = {{ "stock_goto-top.png" }}
+ stock["gtk-go-back"] = {{ "stock_go-back.png" }}
+ stock["gtk-go-down"] = {{ "stock_go-down.png" }}
+ stock["gtk-go-forward"] = {{ "stock_go-forward.png" }}
+ stock["gtk-go-up"] = {{ "stock_go-up.png" }}
+ stock["gtk-help"] = {{ "stock_help.png" }}
+ stock["gtk-harddisk"] = {{ "stock_harddisk.png" }}
+ stock["gtk-home"] = {{ "stock_home.png" }}
+ stock["gtk-index"] = {{ "stock_index.png" }}
+ stock["gtk-info"] = {{ "stock_info.png" }}
+ stock["gtk-italic"] = {{ "stock_italic.png" }}
+
+ stock["gtk-jump-to"] = {{ "stock_jump-to.png" }}
+ stock["gtk-justify-center"] = {{ "stock_justify-center.png" }}
+ stock["gtk-justify-fill"] = {{ "stock_justify-fill.png" }}
+ stock["gtk-justify-left"] = {{ "stock_justify-left.png" }}
+ stock["gtk-justify-right"] = {{ "stock_justify-right.png" }}
+ stock["gtk-missing-image"] = {{ "stock_missing-image.png" }}
+ stock["gtk-media-forward"] = {{ "media-forward.png" }}
+ stock["gtk-media-next"] = {{ "media-next.png" }}
+ stock["gtk-media-pause"] = {{ "media-pause.png" }}
+ stock["gtk-media-play"] = {{ "media-play.png" }}
+ stock["gtk-media-previous"] = {{ "media-prev.png" }}
+ stock["gtk-media-record"] = {{ "media-record.png" }}
+ stock["gtk-media-rewind"] = {{ "media-backward.png" }}
+ stock["gtk-media-stop"] = {{ "media-stop.png" }}
+ stock["gtk-new"] = {{ "stock_new.png" }}
+ stock["gtk-no"] = {{ "stock_no.png" }} 
+ stock["gtk-ok"] = {{ "stock_ok.png" }}
+ stock["gtk-open"] = {{ "stock_open.png" }} 
+ stock["gtk-paste"] = {{ "stock_paste.png" }}
+ stock["gtk-print"] = {{ "stock_print.png" }}
+ stock["gtk-print-preview"] = {{ "stock_print-preview.png" }}
+ stock["gtk-preferences"] = {{ "stock_preferences.png" }}
+ stock["gtk-properties"] = {{ "stock_properties.png" }}
+ stock["gtk-quit"] = {{ "stock_quit.png" }}
+ stock["gtk-redo"] = {{ "stock_redo.png" }}
+ stock["gtk-refresh"] = {{ "stock_refresh.png" }}
+ stock["gtk-remove"] = {{ "stock_remove.png" }}
+ stock["gtk-revert-to-saved"] = {{ "stock_revert-to-saved.png" }}
+ stock["gtk-save"] = {{ "stock_save.png" }}
+ stock["gtk-save-as"] = {{ "stock_save-as.png" }}
+ stock["gtk-select-color"] = {{ "stock_select-color.png" }}
+ stock["gtk-select-font"] = {{ "stock_select-font.png" }}
+ stock["gtk-sort-ascending"] = {{ "stock_sort-ascending.png" }}
+ stock["gtk-sort-descending"] = {{ "stock_sort-descending.png" }}
+ stock["gtk-spell-check"] = {{ "stock_spell-check.png" }}
+ stock["gtk-stop"] = {{ "stock_stop.png" }}
+ stock["gtk-strikethrough"] = {{ "stock_strikethrough.png" }}
+ stock["gtk-undelete"] = {{ "stock_undelete.png" }}
+ stock["gtk-underline"] = {{ "stock_underline.png" }}
+ stock["gtk-undo"] = {{ "stock_undo.png" }}
+ stock["gtk-yes"] = {{ "stock_yes.png" }} 
+ stock["gtk-zoom-100"] = {{ "stock_zoom-100.png" }}
+ stock["gtk-zoom-fit"] = {{ "stock_zoom-fit.png" }}
+ stock["gtk-zoom-in"] = {{ "stock_zoom-in.png" }}
+ stock["gtk-zoom-out"] = {{ "stock_zoom-out.png" }}
+
+ stock["terminal-edit"] = {{ "stock_preferences.png" }}
+ stock["session-stock-edit"] = {{ "stock_preferences.png" }}
+}
+
+class "GtkWidget" style "default"
+
+style "panel-icons"
+{
+ stock ["panel-run"] = {{"stock_run.png"}}
+ stock ["panel-searchtool"] = {{"stock_searchtool.png"}}
+ stock ["panel-screenshot"] = {{"stock_screenshot.png"}}
+ stock ["panel-lockscreen"] = {{"stock_lockscreen.png"}}
+ stock ["panel-logout"] = {{"stock_logout.png"}}
+ stock ["panel-mate-logo"] = {{"stock_mate-logo.png"}}
+
+ stock ["panel-cde"] = {{"stock_cde-menu.png"}}
+#TBD stock ["panel-debian"] = {{""}}
+#TBD stock ["panel-kde"] = {{""}}
+#TBD stock ["panel-suse"] = {{""}}
+
+ stock ["panel-amusements"] = {{"stock_amusements.png"}}
+ stock ["panel-accessories"] = {{"stock_accessories.png"}}
+ stock ["panel-multimedia"] = {{"stock_multimedia.png"}}
+
+ stock ["panel-internet"] = {{"stock_internet.png"}}
+ stock ["panel-utility"] = {{"stock_mate-util.png"}}
+
+# stock ["panel-corner-type"] = {{"stock_corner-panel.png"}}
+# stock ["panel-edge-type"] = {{"stock_edge-panel.png"}}
+# stock ["panel-floating-type"] = {{"stock_floating-panel.png"}}
+# stock ["panel-sliding-type"] = {{"stock_sliding-panel.png"}}
+# stock ["panel-menu-type"] = {{"stock_menu-panel.png"}}
+
+ stock ["panel-launcher"] = {{"stock_launcher-program.png"}}
+
+ stock ["panel-drawer"] = {{"stock_drawer.png"}}
+# stock ["mate-panel-applet"] = {{""}}
+# stock ["panel-desktop"] = {{""}}
+
+# stock ["panel-arrow-left"] = {{"stock_panel_hide_left.png"}}
+# stock ["panel-arrow-right"] = {{"stock_panel_hide_right.png"}}
+# stock ["panel-arrow-up"] = {{"stock_panel_hide_up.png"}}
+# stock ["panel-arrow-down"] = {{"stock_panel_hide_down.png"}}
+
+ stock ["commandline-browser"] = {{"stock_commandline-browser.xpm"}}
+ stock ["commandline-history"] = {{"stock_commandline-history.xpm"}}
+
+}
+class "GtkWidget" style "panel-icons"
+
+style "media-icons"
+{
+
+ stock ["media-stop"] = {{"media-stop.png"}}
+ stock ["media-play"] = {{"media-play.png"}}
+ stock ["media-pause"] = {{"media-pause.png"}}
+ stock ["media-prev"] = {{"media-prev.png"}}
+ stock ["media-next"] = {{"media-next.png"}}
+ stock ["media-eject"] = {{"media-eject.png"}}
+ stock ["media-record"] = {{"media-record.png"}}
+
+ stock ["volume-mute"] = {{"volume-mute.png"}}
+ stock ["volume-zero"] = {{"volume-zero.png"}}
+ stock ["volume-min"] = {{"volume-min.png"}}
+ stock ["volume-med"] = {{"volume-medium.png"}}
+ stock ["volume-max"] = {{"volume-max.png"}}
+
+}
+class "GtkWidget" style "media-icons"
 
 #caja improvements
 
diff --git a/desktop-themes/HighContrastInverse/pixmaps/Makefile.am b/desktop-themes/HighContrastInverse/pixmaps/Makefile.am
index 1a1e164a..9aeda0d0 100644
--- a/desktop-themes/HighContrastInverse/pixmaps/Makefile.am
+++ b/desktop-themes/HighContrastInverse/pixmaps/Makefile.am
@@ -2,4 +2,61 @@ pixmapdir= $(datadir)/themes/HighContrastInverse/pixmaps
 
 EXTRA_DIST= $(pixmap_DATA)
 
-include $(top_srcdir)/common/all-stock-icons.data
+pixmap_DATA = \
+ stock_about.png stock_add.png stock_apply.png \
+ stock_attach.png stock_bold.png stock_book.png \
+ stock_cancel.png stock_cdrom.png stock_clear.png \
+ stock_close.png stock_connect.png stock_convert.png \
+ stock_copy.png stock_cut.png stock_delete.png \
+ stock_dialog_error.png stock_dialog_info.png \
+ stock_dialog_question.png stock_dialog_warning.png \
+ stock_disconnect.png stock_edit.png stock_empty.png \
+ stock_execute.png stock_export.png \
+ stock_find-and-replace.png stock_find.png \
+ stock_floppy.png stock_go-back.png \
+ stock_go-down.png stock_go-forward.png \
+ stock_go-up.png stock_goto-bottom.png \
+ stock_goto-first.png stock_goto-last.png \
+ stock_goto-top.png stock_help.png stock_home.png \
+ stock_import.png stock_index.png \
+ stock_insert-image.png stock_insert-object.png \
+ stock_insert-table.png stock_italic.png \
+ stock_jump-to.png stock_justify-center.png \
+ stock_justify-fill.png stock_justify-left.png \
+ stock_justify-right.png stock_line-in.png \
+ stock_mic.png stock_missing-image.png stock_new.png \
+ stock_ok.png stock_open.png stock_paste.png \
+ stock_preferences.png stock_print-preview.png \
+ stock_print.png stock_properties.png stock_quit.png \
+ stock_redo.png stock_refresh.png stock_remove.png \
+ stock_revert-to-saved.png stock_save-as.png \
+ stock_save.png stock_select-color.png \
+ stock_select-font.png stock_sort-ascending.png \
+ stock_sort-descending.png stock_spell-check.png \
+ stock_stop.png stock_strikethrough.png \
+ stock_undelete.png stock_underline.png \
+ stock_undo.png stock_volume.png stock_zoom-100.png \
+ stock_zoom-fit.png stock_zoom-in.png \
+ stock_zoom-out.png stock_yes.png stock_no.png \
+ stock_dnd.png stock_dnd_multiple.png \
+ stock_run.png stock_searchtool.png stock_lockscreen.png \
+ stock_logout.png stock_mate-logo.png stock_cde-menu.png \
+ stock_internet.png stock_mate-util.png \
+ stock_launcher-program.png stock_multimedia.png \
+ stock_drawer.png stock_screenshot.png \
+ stock_amusements.png stock_accessories.png \
+ stock_commandline-browser.xpm stock_commandline-history.xpm\
+ media-prev.png media-next.png \
+ media-stop.png media-eject.png \
+ media-play.png media-pause.png media-record.png \
+ media-backward.png media-forward.png \
+ volume-mute.png volume-zero.png \
+ volume-min.png volume-medium.png volume-max.png \
+ double-click-on.png double-click-off.png double-click-maybe.png \
+ printer-default.png printer-broken.png printer-inkjet.png \
+ printer-personal-laser.png printer-workgroup-laser.png \
+ marco-minimize.png marco-maximize.png \
+ marco-delete.png \
+ stock_info.png stock_harddisk.png \
+ $(NULL)
+