replace res/commandimagelist with cmd in artworkfeature/calc-multiline-input

9 files changed, 679 insertions, 679 deletions

diff --git a/ooo_custom_images/human/CopyrightsHuman b/ooo_custom_images/human/CopyrightsHuman
index c3a37679..3d676bb9 100644
--- a/ooo_custom_images/human/CopyrightsHuman
+++ b/ooo_custom_images/human/CopyrightsHuman
@@ -1,53 +1,53 @@
 Copyright 2006-2007 by Gabriel Hurley. Available under the terms of the LGPL
-/res/commandimagelist/sc_incrementsublevels.png
-/res/commandimagelist/sc_decrementsublevels.png
+/cmd/sc_incrementsublevels.png
+/cmd/sc_decrementsublevels.png
 
 Copyright 2009 by Daniel Foré <Daniel.p.Fore@gmail.com>, Jonian Guveli <jonian.guveli@gmail.com>, and K.Vishnoo Charan Reddy<vish@ubuntu.com>. Available under the terms of the GPL (Source: humanity-icon-theme)
-/res/commandimagelist/sc_printpreview.png
-/res/commandimagelist/lc_undo.png
-/res/commandimagelist/lc_redo.png
-/res/commandimagelist/sc_undo.png
-/res/commandimagelist/sc_redo.png
-/res/commandimagelist/lc_print.png
-/res/commandimagelist/sc_print.png
-/res/commandimagelist/lc_printdefault.png
-/res/commandimagelist/sc_printdefault.png
-/res/commandimagelist/lc_open.png
-/res/commandimagelist/sc_open.png
-/res/commandimagelist/lc_save.png
-/res/commandimagelist/sc_save.png
-/res/commandimagelist/lc_savebasicas.png
-/res/commandimagelist/lc_saveas.png
-/res/commandimagelist/lc_helpindex.png
-/res/commandimagelist/sc_helpindex.png
-/res/commandimagelist/sc_saveas.png
-/res/commandimagelist/sc_savebasicas.png
-/res/commandimagelist/lc_copy.png
-/res/commandimagelist/sc_copy.png
-/res/commandimagelist/lc_paste.png
-/res/commandimagelist/sc_paste.png
-/res/commandimagelist/lc_paste.png
-/res/commandimagelist/sc_paste.png
-/res/commandimagelist/lc_browsebackward.png
-/res/commandimagelist/sc_browsebackward.png
-/res/commandimagelist/lc_browseforward.png
-/res/commandimagelist/sc_browseforward.png
-/res/commandimagelist/lc_decrementlevel.png
-/res/commandimagelist/lc_helpbookmark.png
-/res/commandimagelist/lc_incrementlevel.png
-/res/commandimagelist/sc_decrementlevel.png
-/res/commandimagelist/sc_incrementlevel.png
-/res/commandimagelist/lc_moveup.png
-/res/commandimagelist/lc_movedown.png
-/res/commandimagelist/lc_outlineleft.png
-/res/commandimagelist/sc_outlineleft.png
-/res/commandimagelist/lc_outlineright.png
-/res/commandimagelist/sc_outlineright.png
-/res/commandimagelist/lc_outlineup.png
-/res/commandimagelist/sc_outlineup.png
-/res/commandimagelist/lc_outlinedown.png
-/res/commandimagelist/sc_outlinedown.png
-/res/commandimagelist/lc_firstrecord
+/cmd/sc_printpreview.png
+/cmd/lc_undo.png
+/cmd/lc_redo.png
+/cmd/sc_undo.png
+/cmd/sc_redo.png
+/cmd/lc_print.png
+/cmd/sc_print.png
+/cmd/lc_printdefault.png
+/cmd/sc_printdefault.png
+/cmd/lc_open.png
+/cmd/sc_open.png
+/cmd/lc_save.png
+/cmd/sc_save.png
+/cmd/lc_savebasicas.png
+/cmd/lc_saveas.png
+/cmd/lc_helpindex.png
+/cmd/sc_helpindex.png
+/cmd/sc_saveas.png
+/cmd/sc_savebasicas.png
+/cmd/lc_copy.png
+/cmd/sc_copy.png
+/cmd/lc_paste.png
+/cmd/sc_paste.png
+/cmd/lc_paste.png
+/cmd/sc_paste.png
+/cmd/lc_browsebackward.png
+/cmd/sc_browsebackward.png
+/cmd/lc_browseforward.png
+/cmd/sc_browseforward.png
+/cmd/lc_decrementlevel.png
+/cmd/lc_helpbookmark.png
+/cmd/lc_incrementlevel.png
+/cmd/sc_decrementlevel.png
+/cmd/sc_incrementlevel.png
+/cmd/lc_moveup.png
+/cmd/lc_movedown.png
+/cmd/lc_outlineleft.png
+/cmd/sc_outlineleft.png
+/cmd/lc_outlineright.png
+/cmd/sc_outlineright.png
+/cmd/lc_outlineup.png
+/cmd/sc_outlineup.png
+/cmd/lc_outlinedown.png
+/cmd/sc_outlinedown.png
+/cmd/lc_firstrecord
 /res/fileopen.png
 /res/foldercl.png
 /res/folderop.png
@@ -76,46 +76,46 @@ Copyright 2009 by Daniel Foré <Daniel.p.Fore@gmail.com>, Jonian Guveli <jonian.
 /sfx2/res/favourite_big.png
 
 Copyright 2009 by Daniel Foré <Daniel.p.Fore@gmail.com>, Jonian Guveli <jonian.guveli@gmail.com>, and K.Vishnoo Charan Reddy<vish@ubuntu.com>. , Modifications Copyright 2009 by Gabriel Hurley. Available under the terms of the GPL (Source: humanity-icon-theme)
-/res/commandimagelist/lc_recsearch.png
-/res/commandimagelist/sc_recsearch.png
-res/commandimagelist/lc_decrementsublevels.png
-res/commandimagelist/lc_incrementsublevels.png
-res/commandimagelist/lc_movedownsubitems.png
-res/commandimagelist/lc_moveupsubitems.png
-res/commandimagelist/lc_newrecord.png
-res/commandimagelist/lc_deleterecord.png
+/cmd/lc_recsearch.png
+/cmd/sc_recsearch.png
+cmd/lc_decrementsublevels.png
+cmd/lc_incrementsublevels.png
+cmd/lc_movedownsubitems.png
+cmd/lc_moveupsubitems.png
+cmd/lc_newrecord.png
+cmd/lc_deleterecord.png
 
 
 Copyright 2005-2006 by Jakub Steiner and Novell Inc., Copyright 2009 by Daniel Foré <Daniel.p.Fore@gmail.com>, Jonian Guveli <jonian.guveli@gmail.com>, and K.Vishnoo Charan Reddy<vish@ubuntu.com>, Combined by Gabriel Hurley 2006. Available under the terms of the GPL (combination of humanity-icon-
 theme and OpenOffice Tango Icons)
-/res/commandimagelist/lc_crop.png
-/res/commandimagelist/sc_crop.png
-/res/commandimagelist/lc_firstpage.png
-/res/commandimagelist/lc_firstrecord.png
-/res/commandimagelist/lc_printersetup.png
-/res/commandimagelist/lc_previewprintoptions.png
-/res/commandimagelist/lc_printpagepreview.png
-/res/commandimagelist/sc_printersetup.png
-/res/commandimagelist/sc_previewprintoptions.png
-/res/commandimagelist/sc_printpagepreview.png
-/res/commandimagelist/lc_recundo.png
-/res/commandimagelist/sc_recundo.png
-/res/commandimagelist/lc_helpsearch.png
-/res/commandimagelist/sc_helpsearch.png
-/res/commandimagelist/lc_lastpage.png
-/res/commandimagelist/lc_lastrecord.png
-/res/commandimagelist/lc_nextrecord.png
-/res/commandimagelist/lc_prevrecord.png
-res/commandimagelist/lc_printpreview.png
-/res/commandimagelist/lc_compilebasic.png
-/res/commandimagelist/sc_changebezier.png
-/res/commandimagelist/lc_changebezier.png
-/res/commandimagelist/lc_changepolygon.png
-/res/commandimagelist/lc_gotoendofdoc.png
-/res/commandimagelist/lc_gotostartofdoc.png
-/res/commandimagelist/lc_firstpage
-/res/commandimagelist/lc_filecontrol.png
-/res/commandimagelist/lc_dbformopen.png
+/cmd/lc_crop.png
+/cmd/sc_crop.png
+/cmd/lc_firstpage.png
+/cmd/lc_firstrecord.png
+/cmd/lc_printersetup.png
+/cmd/lc_previewprintoptions.png
+/cmd/lc_printpagepreview.png
+/cmd/sc_printersetup.png
+/cmd/sc_previewprintoptions.png
+/cmd/sc_printpagepreview.png
+/cmd/lc_recundo.png
+/cmd/sc_recundo.png
+/cmd/lc_helpsearch.png
+/cmd/sc_helpsearch.png
+/cmd/lc_lastpage.png
+/cmd/lc_lastrecord.png
+/cmd/lc_nextrecord.png
+/cmd/lc_prevrecord.png
+cmd/lc_printpreview.png
+/cmd/lc_compilebasic.png
+/cmd/sc_changebezier.png
+/cmd/lc_changebezier.png
+/cmd/lc_changepolygon.png
+/cmd/lc_gotoendofdoc.png
+/cmd/lc_gotostartofdoc.png
+/cmd/lc_firstpage
+/cmd/lc_filecontrol.png
+/cmd/lc_dbformopen.png
 /res/lc10630.png
 /res/sc10630.png
 /res/sc10724.png
@@ -123,12 +123,12 @@ res/commandimagelist/lc_printpreview.png
 
 
 Copyright 2002-2004 by Novell Inc., Copyright 2009 by Daniel Foré <Daniel.p.Fore@gmail.com>, Jonian Guveli <jonian.guveli@gmail.com>, and K.Vishnoo Charan Reddy<vish@ubuntu.com>, Combined by Gabriel Hurley 2006. Available under the terms of the GPL (combination of humanity-icon-theme and OpenOffice Industrial Icons)
-/res/commandimagelist/lc_runbasic.png
-/res/commandimagelist/sc_insertctrl.png
-/res/commandimagelist/lc_insertctrl.png
-/res/commandimagelist/lc_insertfieldctrl.png
-/res/commandimagelist/sc_insertfieldctrl.png
-/res/commandimagelist/lc_dbqueryopen.png
-/res/commandimagelist/lc_dbreportopen.png
-/res/commandimagelist/lc_dbtableopen.png
-/res/commandimagelist/lc_loadbasic.png
+/cmd/lc_runbasic.png
+/cmd/sc_insertctrl.png
+/cmd/lc_insertctrl.png
+/cmd/lc_insertfieldctrl.png
+/cmd/sc_insertfieldctrl.png
+/cmd/lc_dbqueryopen.png
+/cmd/lc_dbreportopen.png
+/cmd/lc_dbtableopen.png
+/cmd/lc_loadbasic.png
diff --git a/ooo_custom_images/human/CopyrightsTango b/ooo_custom_images/human/CopyrightsTango
index 534e1280..056bf180 100644
--- a/ooo_custom_images/human/CopyrightsTango
+++ b/ooo_custom_images/human/CopyrightsTango
@@ -2,141 +2,141 @@ All of the icons in this icon package are Copyright 2005-2007 Novell, Inc., with
 
 Copyright 2006 Jakub Steiner, Novell Inc. Available under the terms of MIT License (license at http://www.opensource.org/licenses/mit-license.php)
 (source at http://jimmac.musichall.cz/themes.php?skin=7)
-/res/commandimagelist/lc_drawselect.png
+/cmd/lc_drawselect.png
 
 Copyright 2006 Jakub Steiner. Available under the terms of the GPL. (source: http://tango.freedesktop.org/ArtLibreSet)
-/res/commandimagelist/lc_toggleobjectrotatemode.png
-/res/commandimagelist/sc_toggleobjectrotatemode.png
-/res/commandimagelist/lc_advancedmode.png
-/res/commandimagelist/sc_advancedmode.png
-/res/commandimagelist/lc_bmpmask.png
+/cmd/lc_toggleobjectrotatemode.png
+/cmd/sc_toggleobjectrotatemode.png
+/cmd/lc_advancedmode.png
+/cmd/sc_advancedmode.png
+/cmd/lc_bmpmask.png
 
 Copyright 2006-2007 Andreas Nilsson. Available under the terms of the GPL (source: http://tango.freedesktop.org/ArtLibreSet)
-/res/commandimagelist/lc_aligncenter.png
-/res/commandimagelist/lc_aligndown.png
-/res/commandimagelist/lc_alignmiddle.png
-/res/commandimagelist/lc_alignup.png
-/res/commandimagelist/lc_objectalign.png
-/res/commandimagelist/lc_objectalignleft.png
-/res/commandimagelist/lc_objectalignright.png
-/res/commandimagelist/sc_aligncenter.png
-/res/commandimagelist/sc_aligndown.png
-/res/commandimagelist/sc_alignmiddle.png
-/res/commandimagelist/sc_alignup.png
-/res/commandimagelist/sc_objectalign.png
-/res/commandimagelist/sc_objectalignleft.png
-/res/commandimagelist/sc_objectalignright.png
+/cmd/lc_aligncenter.png
+/cmd/lc_aligndown.png
+/cmd/lc_alignmiddle.png
+/cmd/lc_alignup.png
+/cmd/lc_objectalign.png
+/cmd/lc_objectalignleft.png
+/cmd/lc_objectalignright.png
+/cmd/sc_aligncenter.png
+/cmd/sc_aligndown.png
+/cmd/sc_alignmiddle.png
+/cmd/sc_alignup.png
+/cmd/sc_objectalign.png
+/cmd/sc_objectalignleft.png
+/cmd/sc_objectalignright.png
 
 
 Copyright 2006 Jakub Steiner & Andreas Nilsson Available under the terms of the GPL
-/res/commandimagelist/lc_basicstop.png
-/res/commandimagelist/sc_basicstop.png
+/cmd/lc_basicstop.png
+/cmd/sc_basicstop.png
 
 
 2006-2007 by Gabriel Hurley. Available under the terms of the LGPL
-/res/commandimagelist/sc_spacepara1.png
-/res/commandimagelist/sc_spacepara15.png
-/res/commandimagelist/sc_spacepara2.png
-/res/commandimagelist/lc_spacepara1.png
-/res/commandimagelist/lc_spacepara15.png
-/res/commandimagelist/lc_spacepara2.png
-/res/commandimagelist/lc_removebullets.png
-/res/commandimagelist/lc_insertreferencefield
-/res/commandimagelist/lc_helplinesuse.png
-/res/commandimagelist/lc_splitcell.png
-/res/commandimagelist/lc_insertsection.png
-/res/commandimagelist/lc_insertobjectfloatingframe.png
+/cmd/sc_spacepara1.png
+/cmd/sc_spacepara15.png
+/cmd/sc_spacepara2.png
+/cmd/lc_spacepara1.png
+/cmd/lc_spacepara15.png
+/cmd/lc_spacepara2.png
+/cmd/lc_removebullets.png
+/cmd/lc_insertreferencefield
+/cmd/lc_helplinesuse.png
+/cmd/lc_splitcell.png
+/cmd/lc_insertsection.png
+/cmd/lc_insertobjectfloatingframe.png
 
 Copyright 2005-2006 by Jakub Steiner and Novell Inc., Modifications Copyright 2006-2007 by Gabriel Hurley. Available under the terms of the LGPL (Original Source: http://jimmac.musichall.cz/i.php?i=Tango-OOo)
-/res/commandimagelist/sc_convertinto3dlathefast.png
-/res/commandimagelist/lc_choosepolygon.png
-/res/commandimagelist/lc_showmultiplepages.png
-/res/commandimagelist/lc_dbnewquery.png
-/res/commandimagelist/lc_dbreportedit.png
-/res/commandimagelist/lc_dbnewform.png
-/res/commandimagelist/lc_dbtableedit.png
-/res/commandimagelist/lc_dbqueryedit.png
-/res/commandimagelist/lc_flipvertical.png
-/res/commandimagelist/lc_fliphorizontal.png
-/res/commandimagelist/lc_showbookview.png
-/res/commandimagelist/lc_showtwopages.png
-/res/commandimagelist/lc_showfmexplorer.png
-/res/commandimagelist/lc_snapborder.png
-/res/commandimagelist/lc_dbtableedit.png
-/res/commandimagelist/lc_dbtabledelete.png
-/res/commandimagelist/lc_defaultbullet.png
-/res/commandimagelist/lc_formproperties.png
+/cmd/sc_convertinto3dlathefast.png
+/cmd/lc_choosepolygon.png
+/cmd/lc_showmultiplepages.png
+/cmd/lc_dbnewquery.png
+/cmd/lc_dbreportedit.png
+/cmd/lc_dbnewform.png
+/cmd/lc_dbtableedit.png
+/cmd/lc_dbqueryedit.png
+/cmd/lc_flipvertical.png
+/cmd/lc_fliphorizontal.png
+/cmd/lc_showbookview.png
+/cmd/lc_showtwopages.png
+/cmd/lc_showfmexplorer.png
+/cmd/lc_snapborder.png
+/cmd/lc_dbtableedit.png
+/cmd/lc_dbtabledelete.png
+/cmd/lc_defaultbullet.png
+/cmd/lc_formproperties.png
 
 Copyright 2002-2004 by Novell Inc., Modifications Copyright 2006-2007 by Gabriel Hurley. Available under the terms of the LGPL
-/res/commandimagelist/lc_dbformedit.png
-/res/commandimagelist/lc_definename.png
-/res/commandimagelist/lc_deletecolumns.png
-/res/commandimagelist/lc_deleterows.png
-/res/commandimagelist/lc_dbformrename.png
-/res/commandimagelist/lc_dbtableedit.png
-/res/commandimagelist/lc_dbtablerename.png
-/res/commandimagelist/lc_dbtabledelete.png
-/res/commandimagelist/lc_dsbinsertcolumns.png
-/res/commandimagelist/lc_entirecolumn.png
-/res/commandimagelist/lc_entirerow.png
-/res/commandimagelist/lc_sbabrwinsert.png
-/res/commandimagelist/lc_paraspaceincrease.png
-/res/commandimagelist/lc_paraspacedecrease.png
-/res/commandimagelist/lc_sendtoback.png
-/res/commandimagelist/lc_bringtofront.png
-/res/commandimagelist/sc_sendtoback.png
-/res/commandimagelist/sc_bringtofront.png
-/res/commandimagelist/lc_bulletsandnumberingdialog.png
-/res/commandimagelist/lc_numberingstart.png
-/res/commandimagelist/lc_beforeobject.png
-/res/commandimagelist/lc_backward.png
-/res/commandimagelist/lc_forward.png
-/res/commandimagelist/lc_insertfootnote.png
-/res/commandimagelist/lc_insertfield.png
-/res/commandimagelist/lc_insertcolumns.png
-/res/commandimagelist/lc_insertneutralparagraph.png
-/res/commandimagelist/lc_insertobjectstarmath.png
-/res/commandimagelist/lc_insertmath.png
-/res/commandimagelist/lc_insertcolumns.png
-/res/commandimagelist/lc_setobjecttoforeground.png
-/res/commandimagelist/lc_setobjecttobackground.png
-/res/commandimagelist/lc_reverseorder.png
+/cmd/lc_dbformedit.png
+/cmd/lc_definename.png
+/cmd/lc_deletecolumns.png
+/cmd/lc_deleterows.png
+/cmd/lc_dbformrename.png
+/cmd/lc_dbtableedit.png
+/cmd/lc_dbtablerename.png
+/cmd/lc_dbtabledelete.png
+/cmd/lc_dsbinsertcolumns.png
+/cmd/lc_entirecolumn.png
+/cmd/lc_entirerow.png
+/cmd/lc_sbabrwinsert.png
+/cmd/lc_paraspaceincrease.png
+/cmd/lc_paraspacedecrease.png
+/cmd/lc_sendtoback.png
+/cmd/lc_bringtofront.png
+/cmd/sc_sendtoback.png
+/cmd/sc_bringtofront.png
+/cmd/lc_bulletsandnumberingdialog.png
+/cmd/lc_numberingstart.png
+/cmd/lc_beforeobject.png
+/cmd/lc_backward.png
+/cmd/lc_forward.png
+/cmd/lc_insertfootnote.png
+/cmd/lc_insertfield.png
+/cmd/lc_insertcolumns.png
+/cmd/lc_insertneutralparagraph.png
+/cmd/lc_insertobjectstarmath.png
+/cmd/lc_insertmath.png
+/cmd/lc_insertcolumns.png
+/cmd/lc_setobjecttoforeground.png
+/cmd/lc_setobjecttobackground.png
+/cmd/lc_reverseorder.png
 
 Copyright 2002-2004 by Novell Inc., Modifications Copyright 2008 by Gabriel Hurley. Available under the terms of the LGPL
-/res/commandimagelist/lc_flowchartshapes.flowchart-alternate-process.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-collate.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-connector.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-data.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-decision.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-delay.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-direct-access-storage.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-document.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-extract.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-internal-storage.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-predefined-process.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-process.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-sort.png
-/res/commandimagelist/lc_flowchartshapes.png
+/cmd/lc_flowchartshapes.flowchart-alternate-process.png
+/cmd/lc_flowchartshapes.flowchart-collate.png
+/cmd/lc_flowchartshapes.flowchart-connector.png
+/cmd/lc_flowchartshapes.flowchart-data.png
+/cmd/lc_flowchartshapes.flowchart-decision.png
+/cmd/lc_flowchartshapes.flowchart-delay.png
+/cmd/lc_flowchartshapes.flowchart-direct-access-storage.png
+/cmd/lc_flowchartshapes.flowchart-document.png
+/cmd/lc_flowchartshapes.flowchart-extract.png
+/cmd/lc_flowchartshapes.flowchart-internal-storage.png
+/cmd/lc_flowchartshapes.flowchart-predefined-process.png
+/cmd/lc_flowchartshapes.flowchart-process.png
+/cmd/lc_flowchartshapes.flowchart-sort.png
+/cmd/lc_flowchartshapes.png
 
 Copyright 2002-2004 by Novell Inc., Modifications Copyright 2009 by Gabriel Hurley. Available under the terms of the LGPL
-/res/commandimagelist/lc_starshapes.png
-/res/commandimagelist/lc_starshapes.star5.png
-/res/commandimagelist/lc_symbolshapes.png
-/res/commandimagelist/lc_symbolshapes.smiley.png
+/cmd/lc_starshapes.png
+/cmd/lc_starshapes.star5.png
+/cmd/lc_symbolshapes.png
+/cmd/lc_symbolshapes.smiley.png
 
 Copyright 2009 by Jesús David. Available under the terms of the GPL
-/res/commandimagelist/lc_freeline_unfilled.png
-/res/commandimagelist/lc_drawtext.png
-/res/commandimagelist/lc_text.png
-/res/commandimagelist/lc_texttoolbox.png
-/res/commandimagelist/ko/lc_drawtext.png
-/res/commandimagelist/ko/lc_text.png
-/res/commandimagelist/ko/lc_texttoolbox.png
+/cmd/lc_freeline_unfilled.png
+/cmd/lc_drawtext.png
+/cmd/lc_text.png
+/cmd/lc_texttoolbox.png
+/cmd/ko/lc_drawtext.png
+/cmd/ko/lc_text.png
+/cmd/ko/lc_texttoolbox.png
 
 
 Copyright 2009 by Jesús David & Gabriel Hurley. Available under the terms of the GPL
-/res/commandimagelist/lc_freeline.png
+/cmd/lc_freeline.png
 
 
-All icons under the /res/commandimagelist/ directory, with filenames beginning with "lc_arrowshapes", "lc_calloutshapes", or "lc_basicshapes" are:
+All icons under the /cmd/ directory, with filenames beginning with "lc_arrowshapes", "lc_calloutshapes", or "lc_basicshapes" are:
 Copyright 2002-2004 by Novell Inc., Modifications Copyright 2006-2007 by Gabriel Hurley. Available under the terms of the LGPL
diff --git a/ooo_custom_images/industrial/TODO b/ooo_custom_images/industrial/TODO
index dd00d378..ffbcab77 100644
--- a/ooo_custom_images/industrial/TODO
+++ b/ooo_custom_images/industrial/TODO
@@ -1,6 +1,6 @@
 To Do:
 	An incomplete list of missing and/or not-yet-mapped icons:
-	Most of these icons live in res/commandimagelist/
+	Most of these icons live in cmd/
 
 * Mapping/hacking errors
 	+ 'New' button with 'database' icon (most odd)
diff --git a/ooo_custom_images/oxygen/CopyrightsHuman b/ooo_custom_images/oxygen/CopyrightsHuman
index 7cec016c..452ccb2c 100644
--- a/ooo_custom_images/oxygen/CopyrightsHuman
+++ b/ooo_custom_images/oxygen/CopyrightsHuman
@@ -1,27 +1,27 @@
 Copyright 2006-2007 by Gabriel Hurley. Available under the terms of the LGPL
-/res/commandimagelist/sc_incrementsublevels.png
-/res/commandimagelist/sc_decrementsublevels.png
+/cmd/sc_incrementsublevels.png
+/cmd/sc_decrementsublevels.png
 
 Copyright 2005-2006 by Jakub Steiner and Novell Inc., Modifications Copyright 2006-2007 by Gabriel Hurley. Available under the terms of the LGPL (Original Source: http://jimmac.musichall.cz/i.php?i=Tango-OOo)
-/res/commandimagelist/lc_compilebasic.png
+/cmd/lc_compilebasic.png
 
 Copyright 2002-2004 by Novell Inc., Modifications Copyright 2006-2007 by Gabriel Hurley. Available under the terms of the LGPL
-res/commandimagelist/lc_decrementsublevels.png
-res/commandimagelist/lc_incrementsublevels.png
-res/commandimagelist/lc_movedownsubitems.png 
-res/commandimagelist/lc_moveupsubitems.png 
+cmd/lc_decrementsublevels.png
+cmd/lc_incrementsublevels.png
+cmd/lc_movedownsubitems.png 
+cmd/lc_moveupsubitems.png 
 
 Copyright 2004-2006 by Canonical Ltd. Available under the terms of the Creative Commons Attribution-ShareAlike 2.5 License (Source: human-icon-theme, tangerine-icon-theme)
-/res/commandimagelist/lc_decrementlevel.png
-/res/commandimagelist/lc_helpbookmark.png
-/res/commandimagelist/lc_incrementlevel.png
-/res/commandimagelist/sc_decrementlevel.png
-/res/commandimagelist/sc_incrementlevel.png
-/res/commandimagelist/lc_outlinedown.png
-/res/commandimagelist/sc_outlinedown.png
-/res/commandimagelist/sc_savebasicas.png
-/res/commandimagelist/lch_helpindex.png
-/res/commandimagelist/lc_recsearch.png
+/cmd/lc_decrementlevel.png
+/cmd/lc_helpbookmark.png
+/cmd/lc_incrementlevel.png
+/cmd/sc_decrementlevel.png
+/cmd/sc_incrementlevel.png
+/cmd/lc_outlinedown.png
+/cmd/sc_outlinedown.png
+/cmd/sc_savebasicas.png
+/cmd/lch_helpindex.png
+/cmd/lc_recsearch.png
 /res/fileopen.png
 /res/foldercl.png
 /res/folderop.png
@@ -40,40 +40,40 @@ Copyright 2004-2006 by Canonical Ltd, Modifications Copyright 2007 by Gabriel Hu
 /res/sc05508.png
 
 Copyright 2005-2006 by Jakub Steiner and Novell Inc., Copyright 2004-2006 by Canonical Ltd., Combined by Gabriel Hurley 2006. Available under the terms of the LGPL (combination of human-icon-theme and OpenOffice Industrial Icons)
-/res/commandimagelist/lc_convertinto3d.png
-/res/commandimagelist/lc_extrusiontoggle.png
-/res/commandimagelist/sc_insertctrl.png
-/res/commandimagelist/sc_insertfieldctrl.png
-/res/commandimagelist/lc_controlproperties.png
-/res/commandimagelist/lc_dbformopen.png
-/res/commandimagelist/lc_insertctrl.png
-/res/commandimagelist/lc_insertfieldctrl.png
-/res/commandimagelist/lc_recsave.png 
-/res/commandimagelist/lc_formproperties.png
-/res/commandimagelist/lc_gotoendofdoc.png 
-/res/commandimagelist/lc_gotostartofdoc.png 
+/cmd/lc_convertinto3d.png
+/cmd/lc_extrusiontoggle.png
+/cmd/sc_insertctrl.png
+/cmd/sc_insertfieldctrl.png
+/cmd/lc_controlproperties.png
+/cmd/lc_dbformopen.png
+/cmd/lc_insertctrl.png
+/cmd/lc_insertfieldctrl.png
+/cmd/lc_recsave.png 
+/cmd/lc_formproperties.png
+/cmd/lc_gotoendofdoc.png 
+/cmd/lc_gotostartofdoc.png 
 /res/browse.png 
 /res/lc10627.png 
 /res/lc10630.png 
 /res/sc10630.png 
 
 Copyright 2005-2006 by Jakub Steiner and Novell Inc., Copyright 2004-2006 by Canonical Ltd., Combined by Gabriel Hurley 2006. Available under the terms of the LGPL (combination of human-icon-theme and OpenOffice Tango Icons)
-/res/commandimagelist/lc_recundo.png
-/res/commandimagelist/sc_recundo.png
-/res/commandimagelist/lc_changepolygon.png
-/res/commandimagelist/lc_convertinto3dlathefast.png
-/res/commandimagelist/lc_printersetup.png 
-/res/commandimagelist/lc_previewprintoptions.png 
-/res/commandimagelist/lc_savebasicas.png 
-/res/commandimagelist/lc_refresh.png
+/cmd/lc_recundo.png
+/cmd/sc_recundo.png
+/cmd/lc_changepolygon.png
+/cmd/lc_convertinto3dlathefast.png
+/cmd/lc_printersetup.png 
+/cmd/lc_previewprintoptions.png 
+/cmd/lc_savebasicas.png 
+/cmd/lc_refresh.png
 
 Copyright 2005-2006 by Jakub Steiner and Novell Inc., Copyright 2004-2006 by Canonical Ltd., Combined by Gabriel Hurley 2007. Available under the terms of the LGPL  Available under the terms of the LGPL (combination of human-icon-theme and OpenOffice Industrial Icons)
-/res/commandimagelist/lc_filecontrol.png
-/res/commandimagelist/lc_dbreportopen.png
-/res/commandimagelist/lc_dbtableopen.png
-/res/commandimagelist/lc_dbqueryopen.png
-/res/commandimagelist/lc_loadbasic.png
-/res/commandimagelist/lc_showbrowser.png
-/res/commandimagelist/lc_runbasic.png
+/cmd/lc_filecontrol.png
+/cmd/lc_dbreportopen.png
+/cmd/lc_dbtableopen.png
+/cmd/lc_dbqueryopen.png
+/cmd/lc_loadbasic.png
+/cmd/lc_showbrowser.png
+/cmd/lc_runbasic.png
 
 
diff --git a/ooo_custom_images/oxygen/CopyrightsOxygen b/ooo_custom_images/oxygen/CopyrightsOxygen
index c5b6f869..799d260d 100644
--- a/ooo_custom_images/oxygen/CopyrightsOxygen
+++ b/ooo_custom_images/oxygen/CopyrightsOxygen
@@ -50,278 +50,278 @@ Clarification:
 
   kde-artists [at] kde.org
 
-/res/commandimagelist/lc_spellingandgrammardialog.png
-/res/commandimagelist/sc_spellingandgrammardialog.png
-/res/commandimagelist/lc_addbookmark.png
-/res/commandimagelist/sc_addbookmark.png
-/res/commandimagelist/lc_insertbookmark.png
-/res/commandimagelist/sc_insertbookmark.png
-/res/commandimagelist/lc_aligndown.png
-/res/commandimagelist/sc_aligndown.png
-/res/commandimagelist/lc_alignmiddle.png
-/res/commandimagelist/sc_alignmiddle.png
-/res/commandimagelist/lc_alignup.png
-/res/commandimagelist/sc_alignup.png
-/res/commandimagelist/lc_objectalignleft.png
-/res/commandimagelist/sc_objectalignleft.png
-/res/commandimagelist/lc_objectalign.png
-/res/commandimagelist/sc_objectalign.png
-/res/commandimagelist/lc_objectalignright.png
-/res/commandimagelist/sc_objectalignright.png
-/res/commandimagelist/lc_aligncenter.png
-/res/commandimagelist/sc_aligncenter.png
-/res/commandimagelist/lc_save.png
-/res/commandimagelist/sc_save.png
-/res/commandimagelist/lc_saveas.png
-/res/commandimagelist/sc_saveas.png
-/res/commandimagelist/lc_open.png
-/res/commandimagelist/sc_open.png
-/res/commandimagelist/lc_openreadonly.png
-/res/commandimagelist/sc_openreadonly.png
-/res/commandimagelist/lc_sendmail.png
-/res/commandimagelist/sc_sendmail.png
-/res/commandimagelist/lc_newdoc.png
-/res/commandimagelist/sc_newdoc.png
-/res/commandimagelist/lc_editdoc.png
-/res/commandimagelist/sc_editdoc.png
-/res/commandimagelist/lc_dsbeditdoc.png
-/res/commandimagelist/sc_dsbeditdoc.png
-/res/commandimagelist/lc_exportdirecttopdf.png
-/res/commandimagelist/sc_exportdirecttopdf.png
-/res/commandimagelist/lc_print.png
-/res/commandimagelist/sc_print.png
-/res/commandimagelist/lc_printpreview.png
-/res/commandimagelist/sc_printpreview.png
-/res/commandimagelist/lc_cut.png
-/res/commandimagelist/sc_cut.png
-/res/commandimagelist/lc_copy.png
-/res/commandimagelist/sc_copy.png
-/res/commandimagelist/lc_paste.png
-/res/commandimagelist/sc_paste.png
-/res/commandimagelist/lc_undo.png
-/res/commandimagelist/sc_undo.png
-/res/commandimagelist/lc_redo.png
-/res/commandimagelist/sc_redo.png
-/res/commandimagelist/lc_hyperlinkdialog.png
-/res/commandimagelist/sc_hyperlinkdialog.png
-/res/commandimagelist/lc_printdefault.png
-/res/commandimagelist/sc_printdefault.png
-/res/commandimagelist/lc_inserttable.png
-/res/commandimagelist/sc_inserttable.png
-/res/commandimagelist/lc_addtable.png
-/res/commandimagelist/sc_addtable.png
-/res/commandimagelist/lc_helperdialog.png
-/res/commandimagelist/sc_helperdialog.png
-/res/commandimagelist/lc_helpindex.png
-/res/commandimagelist/sc_helpindex.png
-/res/commandimagelist/lc_help.png
-/res/commandimagelist/sc_help.png
-/res/commandimagelist/lc_helpmenu.png
-/res/commandimagelist/sc_helpmenu.png
-/res/commandimagelist/lc_bold.png
-/res/commandimagelist/sc_bold.png
-/res/commandimagelist/lc_italic.png
-/res/commandimagelist/sc_italic.png
-/res/commandimagelist/lc_strikeout.png
-/res/commandimagelist/sc_strikeout.png
-/res/commandimagelist/lc_subscript.png
-/res/commandimagelist/sc_subscript.png
-/res/commandimagelist/lc_superscript.png
-/res/commandimagelist/sc_superscript.png
-/res/commandimagelist/lc_underline.png
-/res/commandimagelist/sc_underline.png
-/res/commandimagelist/lc_color.png
-/res/commandimagelist/sc_color.png
-/res/commandimagelist/lc_fontcolor.png
-/res/commandimagelist/sc_fontcolor.png
-/res/commandimagelist/lc_xlinecolor.png
-/res/commandimagelist/sc_xlinecolor.png
-/res/commandimagelist/lc_backgroundcolor.png
-/res/commandimagelist/sc_backgroundcolor.png
-/res/commandimagelist/lc_alignblock.png
-/res/commandimagelist/sc_alignblock.png
-/res/commandimagelist/lc_alignleft.png
-/res/commandimagelist/sc_alignleft.png
-/res/commandimagelist/lc_alignhorizontalcenter.png
-/res/commandimagelist/sc_alignhorizontalcenter.png
-/res/commandimagelist/lc_alignright.png
-/res/commandimagelist/sc_alignright.png
-/res/commandimagelist/lc_decrementindent.png
-/res/commandimagelist/sc_decrementindent.png
-/res/commandimagelist/lc_incrementindent.png
-/res/commandimagelist/sc_incrementindent.png
-/res/commandimagelist/lc_defaultbullet.png
-/res/commandimagelist/sc_defaultbullet.png
-/res/commandimagelist/lc_defaultbullet.png
-/res/commandimagelist/sc_defaultbullet.png
-/res/commandimagelist/lc_defaultnumbering.png
-/res/commandimagelist/sc_defaultnumbering.png
-/res/commandimagelist/lc_closedoc.png
-/res/commandimagelist/sc_closedoc.png
-/res/commandimagelist/lc_closedocs.png
-/res/commandimagelist/sc_closedocs.png
-/res/commandimagelist/lc_fullscreen.png
-/res/commandimagelist/sc_fullscreen.png
-/res/commandimagelist/lc_adddatefield.png
-/res/commandimagelist/sc_adddatefield.png
-/res/commandimagelist/lc_browsebackward.png
-/res/commandimagelist/sc_browsebackward.png
-/res/commandimagelist/lc_browseforward.png
-/res/commandimagelist/sc_browseforward.png
-/res/commandimagelist/lc_reload.png
-/res/commandimagelist/sc_reload.png
-/res/commandimagelist/lc_zoomin.png
-/res/commandimagelist/sc_zoomin.png
-/res/commandimagelist/lc_zoomplus.png
-/res/commandimagelist/sc_zoomplus.png
-/res/commandimagelist/lc_zoomout.png
-/res/commandimagelist/sc_zoomout.png
-/res/commandimagelist/lc_zoomminus.png
-/res/commandimagelist/sc_zoomminus.png
-/res/commandimagelist/lc_zoompage.png
-/res/commandimagelist/sc_zoompage.png
-/res/commandimagelist/lc_zoompagewidth.png
-/res/commandimagelist/sc_zoompagewidth.png
-/res/commandimagelist/lc_zoom100percent.png
-/res/commandimagelist/sc_zoom100percent.png
-/res/commandimagelist/lc_zoom.png
-/res/commandimagelist/sc_zoom.png
-/res/commandimagelist/lc_exportto.png
-/res/commandimagelist/sc_exportto.png
-/res/commandimagelist/lc_previewzoom.png
-/res/commandimagelist/sc_previewzoom.png
-/res/commandimagelist/lc_formatarea.png
-/res/commandimagelist/sc_formatarea.png
-/res/commandimagelist/lc_datefield.png
-/res/commandimagelist/sc_datefield.png
-/res/commandimagelist/lc_adddatefield.png
-/res/commandimagelist/sc_adddatefield.png
-/res/commandimagelist/lc_insertdatefield.png
-/res/commandimagelist/sc_insertdatefield.png
-/res/commandimagelist/lc_apply.png
-/res/commandimagelist/sc_apply.png
-/res/commandimagelist/lc_fliphorizontal.png
-/res/commandimagelist/sc_fliphorizontal.png
-/res/commandimagelist/lc_flipvertical.png
-/res/commandimagelist/sc_flipvertical.png
-/res/commandimagelist/lc_avmediaplayer.png
-/res/commandimagelist/sc_avmediaplayer.png
-/res/commandimagelist/lc_cancel.png
-/res/commandimagelist/sc_cancel.png
-/res/commandimagelist/lc_centerpara.png
-/res/commandimagelist/sc_centerpara.png
-/res/commandimagelist/lc_drawchart.png
-/res/commandimagelist/sc_drawchart.png
-/res/commandimagelist/lc_insertannotation.png
-/res/commandimagelist/sc_insertannotation.png
-/res/commandimagelist/lc_movedown.png
-/res/commandimagelist/sc_movedown.png
-/res/commandimagelist/lc_moveup.png
-/res/commandimagelist/sc_moveup.png
-/res/commandimagelist/lc_leftpara.png
-/res/commandimagelist/sc_leftpara.png
-/res/commandimagelist/lc_rightpara.png
-/res/commandimagelist/sc_rightpara.png
-/res/commandimagelist/lc_justifypara.png
-/res/commandimagelist/sc_justifypara.png
-/res/commandimagelist/lc_timefield.png
-/res/commandimagelist/sc_timefield.png
-/res/commandimagelist/lc_inserttimefield.png
-/res/commandimagelist/sc_inserttimefield.png
-/res/commandimagelist/lc_searchdialog.png
-/res/commandimagelist/sc_searchdialog.png
-/res/commandimagelist/lc_extendedhelp.png
-/res/commandimagelist/sc_extendedhelp.png
-/res/commandimagelist/lc_helpzoomin.png
-/res/commandimagelist/sc_helpzoomin.png
-/res/commandimagelist/lc_helpzoomout.png
-/res/commandimagelist/sc_helpzoomout.png
-/res/commandimagelist/lc_helpsearch.png
-/res/commandimagelist/sc_helpsearch.png
-/res/commandimagelist/lc_deletemasterpage.png
-/res/commandimagelist/sc_deletemasterpage.png
-/res/commandimagelist/lc_delete.png
-/res/commandimagelist/sc_delete.png
-/res/commandimagelist/lc_spacepara1.png
-/res/commandimagelist/sc_spacepara1.png
-/res/commandimagelist/lc_spacepara15.png
-/res/commandimagelist/sc_spacepara15.png
-/res/commandimagelist/lc_spacepara2.png
-/res/commandimagelist/sc_spacepara2.png
-/res/commandimagelist/lc_drawtext.png
-/res/commandimagelist/sc_drawtext.png
-/res/commandimagelist/lc_firstrecord.png
-/res/commandimagelist/sc_firstrecord.png
-/res/commandimagelist/lc_freeline_unfilled.png
-/res/commandimagelist/sc_freeline_unfilled.png
-/res/commandimagelist/lc_grow.png
-/res/commandimagelist/sc_grow.png
-/res/commandimagelist/lc_shrink.png
-/res/commandimagelist/sc_shrink.png
-/res/commandimagelist/lc_lastrecord.png
-/res/commandimagelist/sc_lastrecord.png
-/res/commandimagelist/lc_nextrecord.png
-/res/commandimagelist/sc_nextrecord.png
-/res/commandimagelist/lc_prevrecord.png
-/res/commandimagelist/sc_prevrecord.png
-/res/commandimagelist/lc_previouspage.png
-/res/commandimagelist/sc_previouspage.png
-/res/commandimagelist/lc_nextpage.png
-/res/commandimagelist/sc_nextpage.png
-/res/commandimagelist/lc_firstpage.png
-/res/commandimagelist/sc_firstpage.png
-/res/commandimagelist/lc_lastpage.png
-/res/commandimagelist/sc_lastpage.png
-/res/commandimagelist/lc_importfromfile.png
-/res/commandimagelist/sc_importfromfile.png
-/res/commandimagelist/lc_insertavmedia.png
-/res/commandimagelist/sc_insertavmedia.png
-/res/commandimagelist/lc_inserthyperlink.png
-/res/commandimagelist/sc_inserthyperlink.png
-/res/commandimagelist/lc_insertimagecontrol.png
-/res/commandimagelist/sc_insertimagecontrol.png
-/res/commandimagelist/lc_insertobjectchart.png
-/res/commandimagelist/sc_insertobjectchart.png
-/res/commandimagelist/lc_backward.png
-/res/commandimagelist/sc_backward.png
-/res/commandimagelist/lc_sendtoback.png
-/res/commandimagelist/sc_sendtoback.png
-/res/commandimagelist/lc_bringtofront.png
-/res/commandimagelist/sc_bringtofront.png
-/res/commandimagelist/lc_forward.png
-/res/commandimagelist/sc_forward.png
-/res/commandimagelist/lc_insertvideo.png
-/res/commandimagelist/sc_insertvideo.png
-/res/commandimagelist/lc_macrorecorder.png
-/res/commandimagelist/sc_macrorecorder.png
-/res/commandimagelist/lc_spelldialog.png
-/res/commandimagelist/sc_spelldialog.png
-/res/commandimagelist/lc_spellingandgrammardialog.png
-/res/commandimagelist/sc_spellingandgrammardialog.png
-/res/commandimagelist/lc_spelling.png
-/res/commandimagelist/sc_spelling.png
-/res/commandimagelist/lc_starchartdialog.png
-/res/commandimagelist/sc_starchartdialog.png
-/res/commandimagelist/lc_stop.png
-/res/commandimagelist/sc_stop.png
-/res/commandimagelist/lc_view100.png
-/res/commandimagelist/sc_view100.png
-/res/commandimagelist/lc_symbolcatalogue.png
-/res/commandimagelist/sc_symbolcatalogue.png
-/res/commandimagelist/lc_insertsymbol.png
-/res/commandimagelist/sc_insertsymbol.png
-/res/commandimagelist/lc_inserttimefield.png
-/res/commandimagelist/sc_inserttimefield.png
-/res/commandimagelist/lc_timefield.png
-/res/commandimagelist/sc_timefield.png
-/res/commandimagelist/lc_config.png
-/res/commandimagelist/sc_config.png
-/res/commandimagelist/lc_printpagepreview.png
-/res/commandimagelist/sc_printpagepreview.png
-/res/commandimagelist/lc_formatgroup.png
-/res/commandimagelist/sc_formatgroup.png
-/res/commandimagelist/lc_formatungroup.png
-/res/commandimagelist/sc_formatungroup.png
+/cmd/lc_spellingandgrammardialog.png
+/cmd/sc_spellingandgrammardialog.png
+/cmd/lc_addbookmark.png
+/cmd/sc_addbookmark.png
+/cmd/lc_insertbookmark.png
+/cmd/sc_insertbookmark.png
+/cmd/lc_aligndown.png
+/cmd/sc_aligndown.png
+/cmd/lc_alignmiddle.png
+/cmd/sc_alignmiddle.png
+/cmd/lc_alignup.png
+/cmd/sc_alignup.png
+/cmd/lc_objectalignleft.png
+/cmd/sc_objectalignleft.png
+/cmd/lc_objectalign.png
+/cmd/sc_objectalign.png
+/cmd/lc_objectalignright.png
+/cmd/sc_objectalignright.png
+/cmd/lc_aligncenter.png
+/cmd/sc_aligncenter.png
+/cmd/lc_save.png
+/cmd/sc_save.png
+/cmd/lc_saveas.png
+/cmd/sc_saveas.png
+/cmd/lc_open.png
+/cmd/sc_open.png
+/cmd/lc_openreadonly.png
+/cmd/sc_openreadonly.png
+/cmd/lc_sendmail.png
+/cmd/sc_sendmail.png
+/cmd/lc_newdoc.png
+/cmd/sc_newdoc.png
+/cmd/lc_editdoc.png
+/cmd/sc_editdoc.png
+/cmd/lc_dsbeditdoc.png
+/cmd/sc_dsbeditdoc.png
+/cmd/lc_exportdirecttopdf.png
+/cmd/sc_exportdirecttopdf.png
+/cmd/lc_print.png
+/cmd/sc_print.png
+/cmd/lc_printpreview.png
+/cmd/sc_printpreview.png
+/cmd/lc_cut.png
+/cmd/sc_cut.png
+/cmd/lc_copy.png
+/cmd/sc_copy.png
+/cmd/lc_paste.png
+/cmd/sc_paste.png
+/cmd/lc_undo.png
+/cmd/sc_undo.png
+/cmd/lc_redo.png
+/cmd/sc_redo.png
+/cmd/lc_hyperlinkdialog.png
+/cmd/sc_hyperlinkdialog.png
+/cmd/lc_printdefault.png
+/cmd/sc_printdefault.png
+/cmd/lc_inserttable.png
+/cmd/sc_inserttable.png
+/cmd/lc_addtable.png
+/cmd/sc_addtable.png
+/cmd/lc_helperdialog.png
+/cmd/sc_helperdialog.png
+/cmd/lc_helpindex.png
+/cmd/sc_helpindex.png
+/cmd/lc_help.png
+/cmd/sc_help.png
+/cmd/lc_helpmenu.png
+/cmd/sc_helpmenu.png
+/cmd/lc_bold.png
+/cmd/sc_bold.png
+/cmd/lc_italic.png
+/cmd/sc_italic.png
+/cmd/lc_strikeout.png
+/cmd/sc_strikeout.png
+/cmd/lc_subscript.png
+/cmd/sc_subscript.png
+/cmd/lc_superscript.png
+/cmd/sc_superscript.png
+/cmd/lc_underline.png
+/cmd/sc_underline.png
+/cmd/lc_color.png
+/cmd/sc_color.png
+/cmd/lc_fontcolor.png
+/cmd/sc_fontcolor.png
+/cmd/lc_xlinecolor.png
+/cmd/sc_xlinecolor.png
+/cmd/lc_backgroundcolor.png
+/cmd/sc_backgroundcolor.png
+/cmd/lc_alignblock.png
+/cmd/sc_alignblock.png
+/cmd/lc_alignleft.png
+/cmd/sc_alignleft.png
+/cmd/lc_alignhorizontalcenter.png
+/cmd/sc_alignhorizontalcenter.png
+/cmd/lc_alignright.png
+/cmd/sc_alignright.png
+/cmd/lc_decrementindent.png
+/cmd/sc_decrementindent.png
+/cmd/lc_incrementindent.png
+/cmd/sc_incrementindent.png
+/cmd/lc_defaultbullet.png
+/cmd/sc_defaultbullet.png
+/cmd/lc_defaultbullet.png
+/cmd/sc_defaultbullet.png
+/cmd/lc_defaultnumbering.png
+/cmd/sc_defaultnumbering.png
+/cmd/lc_closedoc.png
+/cmd/sc_closedoc.png
+/cmd/lc_closedocs.png
+/cmd/sc_closedocs.png
+/cmd/lc_fullscreen.png
+/cmd/sc_fullscreen.png
+/cmd/lc_adddatefield.png
+/cmd/sc_adddatefield.png
+/cmd/lc_browsebackward.png
+/cmd/sc_browsebackward.png
+/cmd/lc_browseforward.png
+/cmd/sc_browseforward.png
+/cmd/lc_reload.png
+/cmd/sc_reload.png
+/cmd/lc_zoomin.png
+/cmd/sc_zoomin.png
+/cmd/lc_zoomplus.png
+/cmd/sc_zoomplus.png
+/cmd/lc_zoomout.png
+/cmd/sc_zoomout.png
+/cmd/lc_zoomminus.png
+/cmd/sc_zoomminus.png
+/cmd/lc_zoompage.png
+/cmd/sc_zoompage.png
+/cmd/lc_zoompagewidth.png
+/cmd/sc_zoompagewidth.png
+/cmd/lc_zoom100percent.png
+/cmd/sc_zoom100percent.png
+/cmd/lc_zoom.png
+/cmd/sc_zoom.png
+/cmd/lc_exportto.png
+/cmd/sc_exportto.png
+/cmd/lc_previewzoom.png
+/cmd/sc_previewzoom.png
+/cmd/lc_formatarea.png
+/cmd/sc_formatarea.png
+/cmd/lc_datefield.png
+/cmd/sc_datefield.png
+/cmd/lc_adddatefield.png
+/cmd/sc_adddatefield.png
+/cmd/lc_insertdatefield.png
+/cmd/sc_insertdatefield.png
+/cmd/lc_apply.png
+/cmd/sc_apply.png
+/cmd/lc_fliphorizontal.png
+/cmd/sc_fliphorizontal.png
+/cmd/lc_flipvertical.png
+/cmd/sc_flipvertical.png
+/cmd/lc_avmediaplayer.png
+/cmd/sc_avmediaplayer.png
+/cmd/lc_cancel.png
+/cmd/sc_cancel.png
+/cmd/lc_centerpara.png
+/cmd/sc_centerpara.png
+/cmd/lc_drawchart.png
+/cmd/sc_drawchart.png
+/cmd/lc_insertannotation.png
+/cmd/sc_insertannotation.png
+/cmd/lc_movedown.png
+/cmd/sc_movedown.png
+/cmd/lc_moveup.png
+/cmd/sc_moveup.png
+/cmd/lc_leftpara.png
+/cmd/sc_leftpara.png
+/cmd/lc_rightpara.png
+/cmd/sc_rightpara.png
+/cmd/lc_justifypara.png
+/cmd/sc_justifypara.png
+/cmd/lc_timefield.png
+/cmd/sc_timefield.png
+/cmd/lc_inserttimefield.png
+/cmd/sc_inserttimefield.png
+/cmd/lc_searchdialog.png
+/cmd/sc_searchdialog.png
+/cmd/lc_extendedhelp.png
+/cmd/sc_extendedhelp.png
+/cmd/lc_helpzoomin.png
+/cmd/sc_helpzoomin.png
+/cmd/lc_helpzoomout.png
+/cmd/sc_helpzoomout.png
+/cmd/lc_helpsearch.png
+/cmd/sc_helpsearch.png
+/cmd/lc_deletemasterpage.png
+/cmd/sc_deletemasterpage.png
+/cmd/lc_delete.png
+/cmd/sc_delete.png
+/cmd/lc_spacepara1.png
+/cmd/sc_spacepara1.png
+/cmd/lc_spacepara15.png
+/cmd/sc_spacepara15.png
+/cmd/lc_spacepara2.png
+/cmd/sc_spacepara2.png
+/cmd/lc_drawtext.png
+/cmd/sc_drawtext.png
+/cmd/lc_firstrecord.png
+/cmd/sc_firstrecord.png
+/cmd/lc_freeline_unfilled.png
+/cmd/sc_freeline_unfilled.png
+/cmd/lc_grow.png
+/cmd/sc_grow.png
+/cmd/lc_shrink.png
+/cmd/sc_shrink.png
+/cmd/lc_lastrecord.png
+/cmd/sc_lastrecord.png
+/cmd/lc_nextrecord.png
+/cmd/sc_nextrecord.png
+/cmd/lc_prevrecord.png
+/cmd/sc_prevrecord.png
+/cmd/lc_previouspage.png
+/cmd/sc_previouspage.png
+/cmd/lc_nextpage.png
+/cmd/sc_nextpage.png
+/cmd/lc_firstpage.png
+/cmd/sc_firstpage.png
+/cmd/lc_lastpage.png
+/cmd/sc_lastpage.png
+/cmd/lc_importfromfile.png
+/cmd/sc_importfromfile.png
+/cmd/lc_insertavmedia.png
+/cmd/sc_insertavmedia.png
+/cmd/lc_inserthyperlink.png
+/cmd/sc_inserthyperlink.png
+/cmd/lc_insertimagecontrol.png
+/cmd/sc_insertimagecontrol.png
+/cmd/lc_insertobjectchart.png
+/cmd/sc_insertobjectchart.png
+/cmd/lc_backward.png
+/cmd/sc_backward.png
+/cmd/lc_sendtoback.png
+/cmd/sc_sendtoback.png
+/cmd/lc_bringtofront.png
+/cmd/sc_bringtofront.png
+/cmd/lc_forward.png
+/cmd/sc_forward.png
+/cmd/lc_insertvideo.png
+/cmd/sc_insertvideo.png
+/cmd/lc_macrorecorder.png
+/cmd/sc_macrorecorder.png
+/cmd/lc_spelldialog.png
+/cmd/sc_spelldialog.png
+/cmd/lc_spellingandgrammardialog.png
+/cmd/sc_spellingandgrammardialog.png
+/cmd/lc_spelling.png
+/cmd/sc_spelling.png
+/cmd/lc_starchartdialog.png
+/cmd/sc_starchartdialog.png
+/cmd/lc_stop.png
+/cmd/sc_stop.png
+/cmd/lc_view100.png
+/cmd/sc_view100.png
+/cmd/lc_symbolcatalogue.png
+/cmd/sc_symbolcatalogue.png
+/cmd/lc_insertsymbol.png
+/cmd/sc_insertsymbol.png
+/cmd/lc_inserttimefield.png
+/cmd/sc_inserttimefield.png
+/cmd/lc_timefield.png
+/cmd/sc_timefield.png
+/cmd/lc_config.png
+/cmd/sc_config.png
+/cmd/lc_printpagepreview.png
+/cmd/sc_printpagepreview.png
+/cmd/lc_formatgroup.png
+/cmd/sc_formatgroup.png
+/cmd/lc_formatungroup.png
+/cmd/sc_formatungroup.png
 /desktop/res/caution_16.png.png
 /desktop/res/caution_16.png.png
 /desktop/res/lock_16.png.png
@@ -358,8 +358,8 @@ Clarification:
 /sd/res/pageexcl.png.png
 /sd/res/page.png.png
 /sd/res/page.png.png
-/res/commandimagelist/lc_insertpage.png
-/res/commandimagelist/sc_insertpage.png
+/cmd/lc_insertpage.png
+/cmd/sc_insertpage.png
 /sd/res/time_16.png.png
 /sd/res/time_16.png.png
 /sfx2/res/doccl.png.png
@@ -408,8 +408,8 @@ Clarification:
 /svtools/res/up_small.png.png
 /svtools/res/up_large.png.png
 /svtools/res/up_large.png.png
-/res/commandimagelist/lc_gallery.png
-/res/commandimagelist/sc_gallery.png
+/cmd/lc_gallery.png
+/cmd/sc_gallery.png
 /res/info_16.png.png
 /res/info_16.png.png
 /res/info.png.png
@@ -486,84 +486,84 @@ Clarification:
 /res/folderop.png.png
 /res/harddisk_16.png.png
 /res/harddisk_16.png.png
-/res/commandimagelist/lc_closewin.png
-/res/commandimagelist/sc_closewin.png
-/res/commandimagelist/lc_insertsound.png
-/res/commandimagelist/sc_insertsound.png
-/res/commandimagelist/lc_arrowshapes.circular-arrow.png
-/res/commandimagelist/sc_arrowshapes.circular-arrow.png
-/res/commandimagelist/lc_arrowshapes.right-arrow.png
-/res/commandimagelist/sc_arrowshapes.right-arrow.png
-/res/commandimagelist/lc_basicshapes.circle-pie.png
-/res/commandimagelist/sc_basicshapes.circle-pie.png
-/res/commandimagelist/lc_basicshapes.cross-shape.png
-/res/commandimagelist/sc_basicshapes.cross-shape.png
-/res/commandimagelist/lc_basicshapes.cross.png
-/res/commandimagelist/sc_basicshapes.cross.png
-/res/commandimagelist/lc_basicshapes.hexagon.png
-/res/commandimagelist/sc_basicshapes.hexagon.png
-/res/commandimagelist/lc_basicshapes.pentagon.png
-/res/commandimagelist/sc_basicshapes.pentagon.png
-/res/commandimagelist/lc_basicshapes.quadrat.png
-/res/commandimagelist/sc_basicshapes.quadrat.png
-/res/commandimagelist/lc_beziercutline.png
-/res/commandimagelist/sc_beziercutline.png
-/res/commandimagelist/lc_bezierdelete.png
-/res/commandimagelist/sc_bezierdelete.png
-/res/commandimagelist/lc_bezieredge.png
-/res/commandimagelist/sc_bezieredge.png
-/res/commandimagelist/lc_bezierinsert.png
-/res/commandimagelist/sc_bezierinsert.png
-/res/commandimagelist/lc_beziersmooth.png
-/res/commandimagelist/sc_beziersmooth.png
-/res/commandimagelist/lc_beziersymmetric.png
-/res/commandimagelist/sc_beziersymmetric.png
-/res/commandimagelist/lc_browseview.png
-/res/commandimagelist/sc_browseview.png
-/res/commandimagelist/lc_calloutshapes.png
-/res/commandimagelist/sc_calloutshapes.png
-/res/commandimagelist/lc_calloutshapes.round-rectangular-callout.png
-/res/commandimagelist/sc_calloutshapes.round-rectangular-callout.png
-/res/commandimagelist/lc_changebezier.png
-/res/commandimagelist/sc_changebezier.png
-/res/commandimagelist/lc_circlepie.png
-/res/commandimagelist/sc_circlepie.png
-/res/commandimagelist/lc_crop.png
-/res/commandimagelist/sc_crop.png
-/res/commandimagelist/lc_exportdialog.png
-/res/commandimagelist/sc_exportdialog.png
-/res/commandimagelist/lc_ok.png
-/res/commandimagelist/sc_ok.png
-/res/commandimagelist/lc_openurl.png
-/res/commandimagelist/sc_openurl.png
-/res/commandimagelist/lc_outlineleft.png
-/res/commandimagelist/sc_outlineleft.png
-/res/commandimagelist/lc_outlineright.png
-/res/commandimagelist/sc_outlineright.png
-/res/commandimagelist/lc_outlineup.png
-/res/commandimagelist/sc_outlineup.png
-/res/commandimagelist/lc_pagedown.png
-/res/commandimagelist/sc_pagedown.png
-/res/commandimagelist/lc_pageup.png
-/res/commandimagelist/sc_pageup.png
-/res/commandimagelist/lc_presentation.png
-/res/commandimagelist/sc_presentation.png
-/res/commandimagelist/lc_quit.png
-/res/commandimagelist/sc_quit.png
-/res/commandimagelist/lc_square.png
-/res/commandimagelist/sc_square.png
-/res/commandimagelist/lc_starshapes.png
-/res/commandimagelist/sc_starshapes.png
-/res/commandimagelist/lc_starshapes.star5.png
-/res/commandimagelist/sc_starshapes.star5.png
-/res/commandimagelist/lc_symbolshapes.png
-/res/commandimagelist/sc_symbolshapes.png
-/res/commandimagelist/lc_symbolshapes.smiley.png
-/res/commandimagelist/sc_symbolshapes.smiley.png
-/res/commandimagelist/lc_thesaurus.png
-/res/commandimagelist/sc_thesaurus.png
-/res/commandimagelist/lc_thesaurusdialog.png
-/res/commandimagelist/sc_thesaurusdialog.png
+/cmd/lc_closewin.png
+/cmd/sc_closewin.png
+/cmd/lc_insertsound.png
+/cmd/sc_insertsound.png
+/cmd/lc_arrowshapes.circular-arrow.png
+/cmd/sc_arrowshapes.circular-arrow.png
+/cmd/lc_arrowshapes.right-arrow.png
+/cmd/sc_arrowshapes.right-arrow.png
+/cmd/lc_basicshapes.circle-pie.png
+/cmd/sc_basicshapes.circle-pie.png
+/cmd/lc_basicshapes.cross-shape.png
+/cmd/sc_basicshapes.cross-shape.png
+/cmd/lc_basicshapes.cross.png
+/cmd/sc_basicshapes.cross.png
+/cmd/lc_basicshapes.hexagon.png
+/cmd/sc_basicshapes.hexagon.png
+/cmd/lc_basicshapes.pentagon.png
+/cmd/sc_basicshapes.pentagon.png
+/cmd/lc_basicshapes.quadrat.png
+/cmd/sc_basicshapes.quadrat.png
+/cmd/lc_beziercutline.png
+/cmd/sc_beziercutline.png
+/cmd/lc_bezierdelete.png
+/cmd/sc_bezierdelete.png
+/cmd/lc_bezieredge.png
+/cmd/sc_bezieredge.png
+/cmd/lc_bezierinsert.png
+/cmd/sc_bezierinsert.png
+/cmd/lc_beziersmooth.png
+/cmd/sc_beziersmooth.png
+/cmd/lc_beziersymmetric.png
+/cmd/sc_beziersymmetric.png
+/cmd/lc_browseview.png
+/cmd/sc_browseview.png
+/cmd/lc_calloutshapes.png
+/cmd/sc_calloutshapes.png
+/cmd/lc_calloutshapes.round-rectangular-callout.png
+/cmd/sc_calloutshapes.round-rectangular-callout.png
+/cmd/lc_changebezier.png
+/cmd/sc_changebezier.png
+/cmd/lc_circlepie.png
+/cmd/sc_circlepie.png
+/cmd/lc_crop.png
+/cmd/sc_crop.png
+/cmd/lc_exportdialog.png
+/cmd/sc_exportdialog.png
+/cmd/lc_ok.png
+/cmd/sc_ok.png
+/cmd/lc_openurl.png
+/cmd/sc_openurl.png
+/cmd/lc_outlineleft.png
+/cmd/sc_outlineleft.png
+/cmd/lc_outlineright.png
+/cmd/sc_outlineright.png
+/cmd/lc_outlineup.png
+/cmd/sc_outlineup.png
+/cmd/lc_pagedown.png
+/cmd/sc_pagedown.png
+/cmd/lc_pageup.png
+/cmd/sc_pageup.png
+/cmd/lc_presentation.png
+/cmd/sc_presentation.png
+/cmd/lc_quit.png
+/cmd/sc_quit.png
+/cmd/lc_square.png
+/cmd/sc_square.png
+/cmd/lc_starshapes.png
+/cmd/sc_starshapes.png
+/cmd/lc_starshapes.star5.png
+/cmd/sc_starshapes.star5.png
+/cmd/lc_symbolshapes.png
+/cmd/sc_symbolshapes.png
+/cmd/lc_symbolshapes.smiley.png
+/cmd/sc_symbolshapes.smiley.png
+/cmd/lc_thesaurus.png
+/cmd/sc_thesaurus.png
+/cmd/lc_thesaurusdialog.png
+/cmd/sc_thesaurusdialog.png
 /res/dir-open.png.png
 /res/dir-open.png.png
 /res/dir-clos.png.png
diff --git a/ooo_custom_images/oxygen/CopyrightsTango b/ooo_custom_images/oxygen/CopyrightsTango
index 69bd00a4..f7b82697 100644
--- a/ooo_custom_images/oxygen/CopyrightsTango
+++ b/ooo_custom_images/oxygen/CopyrightsTango
@@ -1,93 +1,93 @@
 All of the icons in this icon package are Copyright 2005-2007 Novell, Inc., with exception of the following:
 
 Copyright 2006 Jakub Steiner. Available under the terms of the GPL. (source: http://tango.freedesktop.org/ArtLibreSet)
-/res/commandimagelist/lc_toggleobjectrotatemode.png
-/res/commandimagelist/sc_toggleobjectrotatemode.png
-/res/commandimagelist/lc_advancedmode.png
-/res/commandimagelist/sc_advancedmode.png
-/res/commandimagelist/lc_bmpmask.png
+/cmd/lc_toggleobjectrotatemode.png
+/cmd/sc_toggleobjectrotatemode.png
+/cmd/lc_advancedmode.png
+/cmd/sc_advancedmode.png
+/cmd/lc_bmpmask.png
 
 Copyright 2005 by Lapo Calamandrei, Jakub Steiner. Modified 2007 by Gabriel Hurley Available under the terms of the Creative Commons Attribution-ShareAlike 2.0 License
-/res/commandimagelist/lc_firstpage 
-/res/commandimagelist/lc_firstrecord 2005
+/cmd/lc_firstpage 
+/cmd/lc_firstrecord 2005
 
 Copyright 2005 by Jakub Steiner. Available under the terms of the Creative Commons Attribution-ShareAlike 2.0 License (source: Ubuntu's tango-icon-theme package)
-/res/commandimagelist/lc_zoomtoolbox.png
-/res/commandimagelist/sc_zoomtoolbox.png
+/cmd/lc_zoomtoolbox.png
+/cmd/sc_zoomtoolbox.png
 
 Copyright 2006 Jakub Steiner & Andreas Nilsson Available under the terms of the GPL
-/res/commandimagelist/lc_basicstop.png  
-/res/commandimagelist/sc_basicstop.png 
+/cmd/lc_basicstop.png  
+/cmd/sc_basicstop.png 
 
 
 2006-2007 by Gabriel Hurley. Available under the terms of the LGPL
-/res/commandimagelist/lc_removebullets.png
-/res/commandimagelist/lc_insertreferencefield
-/res/commandimagelist/lc_helplinesuse.png
-/res/commandimagelist/lc_splitcell.png
-/res/commandimagelist/lc_insertsection.png
-/res/commandimagelist/lc_insertobjectfloatingframe.png
+/cmd/lc_removebullets.png
+/cmd/lc_insertreferencefield
+/cmd/lc_helplinesuse.png
+/cmd/lc_splitcell.png
+/cmd/lc_insertsection.png
+/cmd/lc_insertobjectfloatingframe.png
 
 Copyright 2005-2006 by Jakub Steiner and Novell Inc., Modifications Copyright 2006-2007 by Gabriel Hurley. Available under the terms of the LGPL (Original Source: http://jimmac.musichall.cz/i.php?i=Tango-OOo)
-/res/commandimagelist/sc_convertinto3dlathefast.png
-/res/commandimagelist/lc_choosepolygon.png
-/res/commandimagelist/lc_showmultiplepages.png
-/res/commandimagelist/lc_dbnewquery.png
-/res/commandimagelist/lc_dbreportedit.png
-/res/commandimagelist/lc_dbnewform.png
-/res/commandimagelist/lc_dbtableedit.png
-/res/commandimagelist/lc_dbqueryedit.png
-/res/commandimagelist/lc_showbookview.png
-/res/commandimagelist/lc_showtwopages.png
-/res/commandimagelist/lc_showfmexplorer.png
-/res/commandimagelist/lc_snapborder.png
-/res/commandimagelist/lc_dbtableedit.png
-/res/commandimagelist/lc_dbtabledelete.png
+/cmd/sc_convertinto3dlathefast.png
+/cmd/lc_choosepolygon.png
+/cmd/lc_showmultiplepages.png
+/cmd/lc_dbnewquery.png
+/cmd/lc_dbreportedit.png
+/cmd/lc_dbnewform.png
+/cmd/lc_dbtableedit.png
+/cmd/lc_dbqueryedit.png
+/cmd/lc_showbookview.png
+/cmd/lc_showtwopages.png
+/cmd/lc_showfmexplorer.png
+/cmd/lc_snapborder.png
+/cmd/lc_dbtableedit.png
+/cmd/lc_dbtabledelete.png
 
 Copyright 2002-2004 by Novell Inc., Modifications Copyright 2006-2007 by Gabriel Hurley. Available under the terms of the LGPL
-/res/commandimagelist/lc_dbformedit.png
-/res/commandimagelist/lc_definename.png
-/res/commandimagelist/lc_deletecolumns.png
-/res/commandimagelist/lc_deleterows.png
-/res/commandimagelist/lc_dbformrename.png
-/res/commandimagelist/lc_dbtableedit.png
-/res/commandimagelist/lc_dbtablerename.png
-/res/commandimagelist/lc_dbtabledelete.png
-/res/commandimagelist/lc_dsbinsertcolumns.png
-/res/commandimagelist/lc_entirecolumn.png
-/res/commandimagelist/lc_entirerow.png
-/res/commandimagelist/lc_sbabrwinsert.png
-/res/commandimagelist/lc_paraspaceincrease.png
-/res/commandimagelist/lc_paraspacedecrease.png
-/res/commandimagelist/lc_bulletsandnumberingdialog.png
-/res/commandimagelist/lc_numberingstart.png
-/res/commandimagelist/lc_beforeobject.png
-/res/commandimagelist/lc_insertfootnote.png
-/res/commandimagelist/lc_insertfield.png
-/res/commandimagelist/lc_insertcolumns.png
-/res/commandimagelist/lc_insertneutralparagraph.png
-/res/commandimagelist/lc_insertobjectstarmath.png
-/res/commandimagelist/lc_insertmath.png
-/res/commandimagelist/lc_insertcolumns.png
-/res/commandimagelist/lc_setobjecttoforeground.png
-/res/commandimagelist/lc_setobjecttobackground.png
-/res/commandimagelist/lc_reverseorder.png
+/cmd/lc_dbformedit.png
+/cmd/lc_definename.png
+/cmd/lc_deletecolumns.png
+/cmd/lc_deleterows.png
+/cmd/lc_dbformrename.png
+/cmd/lc_dbtableedit.png
+/cmd/lc_dbtablerename.png
+/cmd/lc_dbtabledelete.png
+/cmd/lc_dsbinsertcolumns.png
+/cmd/lc_entirecolumn.png
+/cmd/lc_entirerow.png
+/cmd/lc_sbabrwinsert.png
+/cmd/lc_paraspaceincrease.png
+/cmd/lc_paraspacedecrease.png
+/cmd/lc_bulletsandnumberingdialog.png
+/cmd/lc_numberingstart.png
+/cmd/lc_beforeobject.png
+/cmd/lc_insertfootnote.png
+/cmd/lc_insertfield.png
+/cmd/lc_insertcolumns.png
+/cmd/lc_insertneutralparagraph.png
+/cmd/lc_insertobjectstarmath.png
+/cmd/lc_insertmath.png
+/cmd/lc_insertcolumns.png
+/cmd/lc_setobjecttoforeground.png
+/cmd/lc_setobjecttobackground.png
+/cmd/lc_reverseorder.png
 
 Copyright 2002-2004 by Novell Inc., Modifications Copyright 2008 by Gabriel Hurley. Available under the terms of the LGPL
-/res/commandimagelist/lc_flowchartshapes.flowchart-alternate-process.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-collate.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-connector.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-data.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-decision.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-delay.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-direct-access-storage.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-document.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-extract.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-internal-storage.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-predefined-process.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-process.png
-/res/commandimagelist/lc_flowchartshapes.flowchart-sort.png
-/res/commandimagelist/lc_flowchartshapes.png
+/cmd/lc_flowchartshapes.flowchart-alternate-process.png
+/cmd/lc_flowchartshapes.flowchart-collate.png
+/cmd/lc_flowchartshapes.flowchart-connector.png
+/cmd/lc_flowchartshapes.flowchart-data.png
+/cmd/lc_flowchartshapes.flowchart-decision.png
+/cmd/lc_flowchartshapes.flowchart-delay.png
+/cmd/lc_flowchartshapes.flowchart-direct-access-storage.png
+/cmd/lc_flowchartshapes.flowchart-document.png
+/cmd/lc_flowchartshapes.flowchart-extract.png
+/cmd/lc_flowchartshapes.flowchart-internal-storage.png
+/cmd/lc_flowchartshapes.flowchart-predefined-process.png
+/cmd/lc_flowchartshapes.flowchart-process.png
+/cmd/lc_flowchartshapes.flowchart-sort.png
+/cmd/lc_flowchartshapes.png
 
-All icons under the /res/commandimagelist/ directory, with filenames beginning with "lc_arrowshapes", "lc_calloutshapes", or "lc_basicshapes" are:
+All icons under the /cmd/ directory, with filenames beginning with "lc_arrowshapes", "lc_calloutshapes", or "lc_basicshapes" are:
 Copyright 2002-2004 by Novell Inc., Modifications Copyright 2006-2007 by Gabriel Hurley. Available under the terms of the LGPL
diff --git a/ooo_custom_images/tango/cmd/lc_arrowshapes.chevron.svg b/ooo_custom_images/tango/cmd/lc_arrowshapes.chevron.svg
index 310759cb..a7874610 100644
--- a/ooo_custom_images/tango/cmd/lc_arrowshapes.chevron.svg
+++ b/ooo_custom_images/tango/cmd/lc_arrowshapes.chevron.svg
@@ -13,7 +13,7 @@
    inkscape:export-xdpi="90.000000"
    inkscape:export-filename="/home/jimmac/Desktop/kde-uglies/lc_arrowshapes.circular-arrow.png"
    sodipodi:docname="lc_arrowshapes.chevron.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/ooo/ooo_custom_images/industrial/res/commandimagelist"
+   sodipodi:docbase="/home/jimmac/src/cvs/ooo/ooo_custom_images/industrial/cmd"
    inkscape:version="0.44"
    sodipodi:version="0.32"
    id="svg1288"
diff --git a/ooo_custom_images/tango/cmd/lc_arrowshapes.circular-arrow.svg b/ooo_custom_images/tango/cmd/lc_arrowshapes.circular-arrow.svg
index 20482b08..af6d1ec0 100644
--- a/ooo_custom_images/tango/cmd/lc_arrowshapes.circular-arrow.svg
+++ b/ooo_custom_images/tango/cmd/lc_arrowshapes.circular-arrow.svg
@@ -13,7 +13,7 @@
    inkscape:export-xdpi="82.500000"
    inkscape:export-filename="/home/jimmac/Desktop/kde-uglies/lc_arrowshapes.circular-arrow.png"
    sodipodi:docname="lc_arrowshapes.circular-arrow.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/ooo/ooo_custom_images/industrial/res/commandimagelist"
+   sodipodi:docbase="/home/jimmac/src/cvs/ooo/ooo_custom_images/industrial/cmd"
    inkscape:version="0.44"
    sodipodi:version="0.32"
    id="svg1288"
diff --git a/ooo_custom_images/tango/cmd/sc_presentation.svg b/ooo_custom_images/tango/cmd/sc_presentation.svg
index 6a7d5f1c..be6cef4f 100644
--- a/ooo_custom_images/tango/cmd/sc_presentation.svg
+++ b/ooo_custom_images/tango/cmd/sc_presentation.svg
@@ -11,7 +11,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:export-ydpi="90"
    inkscape:export-xdpi="90"
-   inkscape:export-filename="/home/jimmac/src/cvs/ooo/ooo_custom_images/tango/res/commandimagelist/lc_presentation.png"
+   inkscape:export-filename="/home/jimmac/src/cvs/ooo/ooo_custom_images/tango/cmd/lc_presentation.png"
    sodipodi:docname="lc_presentation.svg"
    sodipodi:docbase="/home/jimmac/src/cvs/ooo/ooo_custom_images/tango/res"
    inkscape:version="0.44+devel"