Combine large and small icons - use CSS to downsize when small icons are required

12 files changed, 400 insertions, 400 deletions

diff --git a/themes/clouds/footer.php b/themes/clouds/footer.php
index 02e0acf2a7..174f2ef5fc 100644
--- a/themes/clouds/footer.php
+++ b/themes/clouds/footer.php
@@ -38,7 +38,7 @@ echo "<div id=\"footer\" class=\"$TEXT_DIRECTION\">";
 echo "\n\t<br /><div align=\"center\" style=\"width:99%;\">";
 echo contact_links();
 echo "\n\t<br />";
-echo '<br /><a href="', WT_WEBTREES_URL, '" target="_blank"><img src="', $WT_IMAGES['webtrees']['other'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" /></a><br />';
+echo '<br /><a href="', WT_WEBTREES_URL, '" target="_blank"><img src="', $WT_IMAGES['webtrees'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" /></a><br />';
 echo "\n\t<br />";
 
 
diff --git a/themes/clouds/theme.php b/themes/clouds/theme.php
index dadea4bbb2..014b1593b9 100644
--- a/themes/clouds/theme.php
+++ b/themes/clouds/theme.php
@@ -100,81 +100,81 @@ $WT_IMAGES['tree'] = WT_THEME_DIR.'images/gedcom.gif';
 $WT_IMAGES['wiki'] = WT_THEME_DIR.'images/w_22.png';
 
 //- PGV buttons for data entry pages
-$WT_IMAGES['addmedia']['button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
-$WT_IMAGES['addrepository']['button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
-$WT_IMAGES['addsource']['button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
-$WT_IMAGES['addnote']['button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
-$WT_IMAGES['autocomplete']['button'] = WT_THEME_DIR.'images/buttons/autocomplete.gif';
-$WT_IMAGES['calendar']['button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
-$WT_IMAGES['family']['button'] = WT_THEME_DIR.'images/buttons/family.gif';
-$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
-$WT_IMAGES['indi']['button'] = WT_THEME_DIR.'images/buttons/indi.gif';
-$WT_IMAGES['keyboard']['button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
-$WT_IMAGES['media']['button'] = WT_THEME_DIR.'images/buttons/media.gif';
-$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
-$WT_IMAGES['place']['button'] = WT_THEME_DIR.'images/buttons/place.gif';
-$WT_IMAGES['refresh']['button'] = WT_THEME_DIR.'images/buttons/refresh.gif';
-$WT_IMAGES['repository']['button'] = WT_THEME_DIR.'images/buttons/repository.gif';
-$WT_IMAGES['source']['button'] = WT_THEME_DIR.'images/buttons/source.gif';
-$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
-$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
-$WT_IMAGES['find_facts']['button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
+$WT_IMAGES['addmedia_button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
+$WT_IMAGES['addrepository_button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
+$WT_IMAGES['addsource_button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
+$WT_IMAGES['addnote_button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
+$WT_IMAGES['autocomplete_button'] = WT_THEME_DIR.'images/buttons/autocomplete.gif';
+$WT_IMAGES['calendar_button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
+$WT_IMAGES['family_button'] = WT_THEME_DIR.'images/buttons/family.gif';
+$WT_IMAGES['head_button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['indi_button'] = WT_THEME_DIR.'images/buttons/indi.gif';
+$WT_IMAGES['keyboard_button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
+$WT_IMAGES['media_button'] = WT_THEME_DIR.'images/buttons/media.gif';
+$WT_IMAGES['note_button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['place_button'] = WT_THEME_DIR.'images/buttons/place.gif';
+$WT_IMAGES['refresh_button'] = WT_THEME_DIR.'images/buttons/refresh.gif';
+$WT_IMAGES['repository_button'] = WT_THEME_DIR.'images/buttons/repository.gif';
+$WT_IMAGES['source_button'] = WT_THEME_DIR.'images/buttons/source.gif';
+$WT_IMAGES['note_button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['head_button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['find_facts_button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
 
 // Media images
-$WT_IMAGES['media']['audio'] = WT_THEME_DIR.'images/media/audio.png';
-$WT_IMAGES['media']['doc'] = WT_THEME_DIR.'images/media/doc.gif';
-$WT_IMAGES['media']['flash'] = WT_THEME_DIR.'images/media/flash.png';
-$WT_IMAGES['media']['flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
-$WT_IMAGES['media']['ged'] = WT_THEME_DIR.'images/media/ged.gif';
-$WT_IMAGES['media']['globe'] = WT_THEME_DIR.'images/media/globe.png';
-$WT_IMAGES['media']['html'] = WT_THEME_DIR.'images/media/html.gif';
-$WT_IMAGES['media']['picasa'] = WT_THEME_DIR.'images/media/picasa.png';
-$WT_IMAGES['media']['pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
-$WT_IMAGES['media']['tex'] = WT_THEME_DIR.'images/media/tex.gif';
-$WT_IMAGES['media']['wmv'] = WT_THEME_DIR.'images/media/wmv.png';
-$WT_IMAGES['media']['wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
+$WT_IMAGES['media_audio'] = WT_THEME_DIR.'images/media/audio.png';
+$WT_IMAGES['media_doc'] = WT_THEME_DIR.'images/media/doc.gif';
+$WT_IMAGES['media_flash'] = WT_THEME_DIR.'images/media/flash.png';
+$WT_IMAGES['media_flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
+$WT_IMAGES['media_ged'] = WT_THEME_DIR.'images/media/ged.gif';
+$WT_IMAGES['media_globe'] = WT_THEME_DIR.'images/media/globe.png';
+$WT_IMAGES['media_html'] = WT_THEME_DIR.'images/media/html.gif';
+$WT_IMAGES['media_picasa'] = WT_THEME_DIR.'images/media/picasa.png';
+$WT_IMAGES['media_pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
+$WT_IMAGES['media_tex'] = WT_THEME_DIR.'images/media/tex.gif';
+$WT_IMAGES['media_wmv'] = WT_THEME_DIR.'images/media/wmv.png';
+$WT_IMAGES['media_wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
 
 //- other images
-$WT_IMAGES['add']['other'] = WT_THEME_DIR.'images/add.gif';
-$WT_IMAGES['darrow']['other'] = WT_THEME_DIR.'images/darrow.gif';
-$WT_IMAGES['darrow2']['other'] = WT_THEME_DIR.'images/darrow2.gif';
-$WT_IMAGES['ddarrow']['other'] = WT_THEME_DIR.'images/ddarrow.gif';
-$WT_IMAGES['dline']['other'] = WT_THEME_DIR.'images/dline.gif';
-$WT_IMAGES['dline2']['other'] = WT_THEME_DIR.'images/dline2.gif';
-$WT_IMAGES['webtrees']['other'] = WT_THEME_DIR.'images/webtrees.png';
-$WT_IMAGES['hline']['other'] = WT_THEME_DIR.'images/hline.gif';
-$WT_IMAGES['larrow']['other'] = WT_THEME_DIR.'images/larrow.gif';
-$WT_IMAGES['larrow2']['other'] = WT_THEME_DIR.'images/larrow2.gif';
-$WT_IMAGES['ldarrow']['other'] = WT_THEME_DIR.'images/ldarrow.gif';
-$WT_IMAGES['minus']['other'] = WT_THEME_DIR.'images/minus.gif';
-$WT_IMAGES['note']['other'] = WT_THEME_DIR.'images/notes.gif';
-$WT_IMAGES['plus']['other'] = WT_THEME_DIR.'images/plus.gif';
-$WT_IMAGES['rarrow']['other'] = WT_THEME_DIR.'images/rarrow.gif';
-$WT_IMAGES['rarrow2']['other'] = WT_THEME_DIR.'images/rarrow2.gif';
-$WT_IMAGES['rdarrow']['other'] = WT_THEME_DIR.'images/rdarrow.gif';
-$WT_IMAGES['remove']['other'] = WT_THEME_DIR.'images/remove.gif';
-$WT_IMAGES['spacer']['other'] = WT_THEME_DIR.'images/spacer.gif';
-$WT_IMAGES['uarrow']['other'] = WT_THEME_DIR.'images/uarrow.gif';
-$WT_IMAGES['uarrow2']['other'] = WT_THEME_DIR.'images/uarrow2.gif';
-$WT_IMAGES['uarrow3']['other'] = WT_THEME_DIR.'images/uarrow3.gif';
-$WT_IMAGES['udarrow']['other'] = WT_THEME_DIR.'images/udarrow.gif';
-$WT_IMAGES['vline']['other'] = WT_THEME_DIR.'images/vline.gif';
-$WT_IMAGES['zoomin']['other'] = WT_THEME_DIR.'images/zoomin.gif';
-$WT_IMAGES['zoomout']['other'] = WT_THEME_DIR.'images/zoomout.gif';
-$WT_IMAGES['stop']['other'] = WT_THEME_DIR.'images/stop.gif';
-$WT_IMAGES['pin-out']['other'] = WT_THEME_DIR.'images/pin-out.png';
-$WT_IMAGES['pin-in']['other'] = WT_THEME_DIR.'images/pin-in.png';
-$WT_IMAGES['default_image_M']['other'] = WT_THEME_DIR.'images/silhouette_male.gif';
-$WT_IMAGES['default_image_F']['other'] = WT_THEME_DIR.'images/silhouette_female.gif';
-$WT_IMAGES['default_image_U']['other'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
-$WT_IMAGES['slide_open']['other'] = WT_THEME_DIR.'images/open.png';
-$WT_IMAGES['slide_close']['other'] = WT_THEME_DIR.'images/close.png';
+$WT_IMAGES['add'] = WT_THEME_DIR.'images/add.gif';
+$WT_IMAGES['darrow'] = WT_THEME_DIR.'images/darrow.gif';
+$WT_IMAGES['darrow2'] = WT_THEME_DIR.'images/darrow2.gif';
+$WT_IMAGES['ddarrow'] = WT_THEME_DIR.'images/ddarrow.gif';
+$WT_IMAGES['dline'] = WT_THEME_DIR.'images/dline.gif';
+$WT_IMAGES['dline2'] = WT_THEME_DIR.'images/dline2.gif';
+$WT_IMAGES['webtrees'] = WT_THEME_DIR.'images/webtrees.png';
+$WT_IMAGES['hline'] = WT_THEME_DIR.'images/hline.gif';
+$WT_IMAGES['larrow'] = WT_THEME_DIR.'images/larrow.gif';
+$WT_IMAGES['larrow2'] = WT_THEME_DIR.'images/larrow2.gif';
+$WT_IMAGES['ldarrow'] = WT_THEME_DIR.'images/ldarrow.gif';
+$WT_IMAGES['minus'] = WT_THEME_DIR.'images/minus.gif';
+$WT_IMAGES['note'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['plus'] = WT_THEME_DIR.'images/plus.gif';
+$WT_IMAGES['rarrow'] = WT_THEME_DIR.'images/rarrow.gif';
+$WT_IMAGES['rarrow2'] = WT_THEME_DIR.'images/rarrow2.gif';
+$WT_IMAGES['rdarrow'] = WT_THEME_DIR.'images/rdarrow.gif';
+$WT_IMAGES['remove'] = WT_THEME_DIR.'images/remove.gif';
+$WT_IMAGES['spacer'] = WT_THEME_DIR.'images/spacer.gif';
+$WT_IMAGES['uarrow'] = WT_THEME_DIR.'images/uarrow.gif';
+$WT_IMAGES['uarrow2'] = WT_THEME_DIR.'images/uarrow2.gif';
+$WT_IMAGES['uarrow3'] = WT_THEME_DIR.'images/uarrow3.gif';
+$WT_IMAGES['udarrow'] = WT_THEME_DIR.'images/udarrow.gif';
+$WT_IMAGES['vline'] = WT_THEME_DIR.'images/vline.gif';
+$WT_IMAGES['zoomin'] = WT_THEME_DIR.'images/zoomin.gif';
+$WT_IMAGES['zoomout'] = WT_THEME_DIR.'images/zoomout.gif';
+$WT_IMAGES['stop'] = WT_THEME_DIR.'images/stop.gif';
+$WT_IMAGES['pin-out'] = WT_THEME_DIR.'images/pin-out.png';
+$WT_IMAGES['pin-in'] = WT_THEME_DIR.'images/pin-in.png';
+$WT_IMAGES['default_image_M'] = WT_THEME_DIR.'images/silhouette_male.gif';
+$WT_IMAGES['default_image_F'] = WT_THEME_DIR.'images/silhouette_female.gif';
+$WT_IMAGES['default_image_U'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
+$WT_IMAGES['slide_open'] = WT_THEME_DIR.'images/open.png';
+$WT_IMAGES['slide_close'] = WT_THEME_DIR.'images/close.png';
 
 // - lifespan chart arrows
-$WT_IMAGES['lsltarrow']['other'] = WT_THEME_DIR.'images/lsltarrow.gif';
-$WT_IMAGES['lsrtarrow']['other'] = WT_THEME_DIR.'images/lsrtarrow.gif';
-$WT_IMAGES['lsdnarrow']['other'] = WT_THEME_DIR.'images/lsdnarrow.gif';
-$WT_IMAGES['lsuparrow']['other'] = WT_THEME_DIR.'images/lsuparrow.gif';
+$WT_IMAGES['lsltarrow'] = WT_THEME_DIR.'images/lsltarrow.gif';
+$WT_IMAGES['lsrtarrow'] = WT_THEME_DIR.'images/lsrtarrow.gif';
+$WT_IMAGES['lsdnarrow'] = WT_THEME_DIR.'images/lsdnarrow.gif';
+$WT_IMAGES['lsuparrow'] = WT_THEME_DIR.'images/lsuparrow.gif';
 
 //-- Variables for the Fan chart
 $fanChart = array(
diff --git a/themes/colors/footer.php b/themes/colors/footer.php
index 519889cb75..f52d765c63 100644
--- a/themes/colors/footer.php
+++ b/themes/colors/footer.php
@@ -38,7 +38,7 @@ echo "<div id=\"footer\" class=\"$TEXT_DIRECTION\">";
 echo "\n\t<br /><div align=\"center\" style=\"width:99%;\">";
 echo contact_links();
 echo "\n\t<br />";
-echo '<br /><a href="', WT_WEBTREES_URL, '" target="_blank"><img src="', $WT_IMAGES['webtrees']['other'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" /></a><br />';
+echo '<br /><a href="', WT_WEBTREES_URL, '" target="_blank"><img src="', $WT_IMAGES['webtrees'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" /></a><br />';
 echo "\n\t<br />";
 
 if ($SHOW_STATS || WT_DEBUG) {
diff --git a/themes/colors/theme.php b/themes/colors/theme.php
index 1f9b4cc6d7..5ab7a7c0ec 100644
--- a/themes/colors/theme.php
+++ b/themes/colors/theme.php
@@ -162,81 +162,81 @@ $WT_IMAGES['tree'] = WT_THEME_DIR.'images/gedcom.gif';
 $WT_IMAGES['wiki'] = WT_THEME_DIR.'images/w_22.png';
 
 //- PGV buttons for data entry pages
-$WT_IMAGES['addmedia']['button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
-$WT_IMAGES['addrepository']['button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
-$WT_IMAGES['addsource']['button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
-$WT_IMAGES['addnote']['button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
-$WT_IMAGES['autocomplete']['button'] = WT_THEME_DIR.'images/buttons/autocomplete.gif';
-$WT_IMAGES['calendar']['button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
-$WT_IMAGES['family']['button'] = WT_THEME_DIR.'images/buttons/family.gif';
-$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
-$WT_IMAGES['indi']['button'] = WT_THEME_DIR.'images/buttons/indi.gif';
-$WT_IMAGES['keyboard']['button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
-$WT_IMAGES['media']['button'] = WT_THEME_DIR.'images/buttons/media.gif';
-$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
-$WT_IMAGES['place']['button'] = WT_THEME_DIR.'images/buttons/place.gif';
-$WT_IMAGES['refresh']['button'] = WT_THEME_DIR.'images/buttons/refresh.gif';
-$WT_IMAGES['repository']['button'] = WT_THEME_DIR.'images/buttons/repository.gif';
-$WT_IMAGES['source']['button'] = WT_THEME_DIR.'images/buttons/source.gif';
-$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
-$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
-$WT_IMAGES['find_facts']['button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
+$WT_IMAGES['addmedia_button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
+$WT_IMAGES['addrepository_button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
+$WT_IMAGES['addsource_button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
+$WT_IMAGES['addnote_button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
+$WT_IMAGES['autocomplete_button'] = WT_THEME_DIR.'images/buttons/autocomplete.gif';
+$WT_IMAGES['calendar_button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
+$WT_IMAGES['family_button'] = WT_THEME_DIR.'images/buttons/family.gif';
+$WT_IMAGES['head_button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['indi_button'] = WT_THEME_DIR.'images/buttons/indi.gif';
+$WT_IMAGES['keyboard_button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
+$WT_IMAGES['media_button'] = WT_THEME_DIR.'images/buttons/media.gif';
+$WT_IMAGES['note_button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['place_button'] = WT_THEME_DIR.'images/buttons/place.gif';
+$WT_IMAGES['refresh_button'] = WT_THEME_DIR.'images/buttons/refresh.gif';
+$WT_IMAGES['repository_button'] = WT_THEME_DIR.'images/buttons/repository.gif';
+$WT_IMAGES['source_button'] = WT_THEME_DIR.'images/buttons/source.gif';
+$WT_IMAGES['note_button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['head_button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['find_facts_button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
 
 // Media images
-$WT_IMAGES['media']['audio'] = WT_THEME_DIR.'images/media/audio.png';
-$WT_IMAGES['media']['doc'] = WT_THEME_DIR.'images/media/doc.gif';
-$WT_IMAGES['media']['flash'] = WT_THEME_DIR.'images/media/flash.png';
-$WT_IMAGES['media']['flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
-$WT_IMAGES['media']['ged'] = WT_THEME_DIR.'images/media/ged.gif';
-$WT_IMAGES['media']['globe'] = WT_THEME_DIR.'images/media/globe.png';
-$WT_IMAGES['media']['html'] = WT_THEME_DIR.'images/media/html.gif';
-$WT_IMAGES['media']['picasa'] = WT_THEME_DIR.'images/media/picasa.png';
-$WT_IMAGES['media']['pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
-$WT_IMAGES['media']['tex'] = WT_THEME_DIR.'images/media/tex.gif';
-$WT_IMAGES['media']['wmv'] = WT_THEME_DIR.'images/media/wmv.png';
-$WT_IMAGES['media']['wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
+$WT_IMAGES['media_audio'] = WT_THEME_DIR.'images/media/audio.png';
+$WT_IMAGES['media_doc'] = WT_THEME_DIR.'images/media/doc.gif';
+$WT_IMAGES['media_flash'] = WT_THEME_DIR.'images/media/flash.png';
+$WT_IMAGES['media_flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
+$WT_IMAGES['media_ged'] = WT_THEME_DIR.'images/media/ged.gif';
+$WT_IMAGES['media_globe'] = WT_THEME_DIR.'images/media/globe.png';
+$WT_IMAGES['media_html'] = WT_THEME_DIR.'images/media/html.gif';
+$WT_IMAGES['media_picasa'] = WT_THEME_DIR.'images/media/picasa.png';
+$WT_IMAGES['media_pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
+$WT_IMAGES['media_tex'] = WT_THEME_DIR.'images/media/tex.gif';
+$WT_IMAGES['media_wmv'] = WT_THEME_DIR.'images/media/wmv.png';
+$WT_IMAGES['media_wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
 
 //- other images
-$WT_IMAGES['add']['other'] = WT_THEME_DIR.'images/add.gif';
-$WT_IMAGES['darrow']['other'] = WT_THEME_DIR.'images/darrow.gif';
-$WT_IMAGES['darrow2']['other'] = WT_THEME_DIR.'images/darrow2.gif';
-$WT_IMAGES['ddarrow']['other'] = WT_THEME_DIR.'images/ddarrow.gif';
-$WT_IMAGES['dline']['other'] = WT_THEME_DIR.'images/dline.gif';
-$WT_IMAGES['dline2']['other'] = WT_THEME_DIR.'images/dline2.gif';
-$WT_IMAGES['webtrees']['other'] = WT_THEME_DIR.'images/webtrees.png';
-$WT_IMAGES['hline']['other'] = WT_THEME_DIR.'images/hline.gif';
-$WT_IMAGES['larrow']['other'] = WT_THEME_DIR.'images/larrow.gif';
-$WT_IMAGES['larrow2']['other'] = WT_THEME_DIR.'images/larrow2.gif';
-$WT_IMAGES['ldarrow']['other'] = WT_THEME_DIR.'images/ldarrow.gif';
-$WT_IMAGES['minus']['other'] = WT_THEME_DIR.'images/minus.gif';
-$WT_IMAGES['note']['other'] = WT_THEME_DIR.'images/notes.gif';
-$WT_IMAGES['plus']['other'] = WT_THEME_DIR.'images/plus.gif';
-$WT_IMAGES['rarrow']['other'] = WT_THEME_DIR.'images/rarrow.gif';
-$WT_IMAGES['rarrow2']['other'] = WT_THEME_DIR.'images/rarrow2.gif';
-$WT_IMAGES['rdarrow']['other'] = WT_THEME_DIR.'images/rdarrow.gif';
-$WT_IMAGES['remove']['other'] = WT_THEME_DIR.'images/remove.gif';
-$WT_IMAGES['spacer']['other'] = WT_THEME_DIR.'images/spacer.gif';
-$WT_IMAGES['uarrow']['other'] = WT_THEME_DIR.'images/uarrow.gif';
-$WT_IMAGES['uarrow2']['other'] = WT_THEME_DIR.'images/uarrow2.gif';
-$WT_IMAGES['uarrow3']['other'] = WT_THEME_DIR.'images/uarrow3.gif';
-$WT_IMAGES['udarrow']['other'] = WT_THEME_DIR.'images/udarrow.gif';
-$WT_IMAGES['vline']['other'] = WT_THEME_DIR.'images/vline.gif';
-$WT_IMAGES['zoomin']['other'] = WT_THEME_DIR.'images/zoomin.gif';
-$WT_IMAGES['zoomout']['other'] = WT_THEME_DIR.'images/zoomout.gif';
-$WT_IMAGES['stop']['other'] = WT_THEME_DIR.'images/stop.gif';
-$WT_IMAGES['pin-out']['other'] = WT_THEME_DIR.'images/pin-out.png';
-$WT_IMAGES['pin-in']['other'] = WT_THEME_DIR.'images/pin-in.png';
-$WT_IMAGES['default_image_M']['other'] = WT_THEME_DIR.'images/silhouette_male.gif';
-$WT_IMAGES['default_image_F']['other'] = WT_THEME_DIR.'images/silhouette_female.gif';
-$WT_IMAGES['default_image_U']['other'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
-$WT_IMAGES['slide_open']['other'] = WT_THEME_DIR.'images/open.png';
-$WT_IMAGES['slide_close']['other'] = WT_THEME_DIR.'images/close.png';
+$WT_IMAGES['add'] = WT_THEME_DIR.'images/add.gif';
+$WT_IMAGES['darrow'] = WT_THEME_DIR.'images/darrow.gif';
+$WT_IMAGES['darrow2'] = WT_THEME_DIR.'images/darrow2.gif';
+$WT_IMAGES['ddarrow'] = WT_THEME_DIR.'images/ddarrow.gif';
+$WT_IMAGES['dline'] = WT_THEME_DIR.'images/dline.gif';
+$WT_IMAGES['dline2'] = WT_THEME_DIR.'images/dline2.gif';
+$WT_IMAGES['webtrees'] = WT_THEME_DIR.'images/webtrees.png';
+$WT_IMAGES['hline'] = WT_THEME_DIR.'images/hline.gif';
+$WT_IMAGES['larrow'] = WT_THEME_DIR.'images/larrow.gif';
+$WT_IMAGES['larrow2'] = WT_THEME_DIR.'images/larrow2.gif';
+$WT_IMAGES['ldarrow'] = WT_THEME_DIR.'images/ldarrow.gif';
+$WT_IMAGES['minus'] = WT_THEME_DIR.'images/minus.gif';
+$WT_IMAGES['note'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['plus'] = WT_THEME_DIR.'images/plus.gif';
+$WT_IMAGES['rarrow'] = WT_THEME_DIR.'images/rarrow.gif';
+$WT_IMAGES['rarrow2'] = WT_THEME_DIR.'images/rarrow2.gif';
+$WT_IMAGES['rdarrow'] = WT_THEME_DIR.'images/rdarrow.gif';
+$WT_IMAGES['remove'] = WT_THEME_DIR.'images/remove.gif';
+$WT_IMAGES['spacer'] = WT_THEME_DIR.'images/spacer.gif';
+$WT_IMAGES['uarrow'] = WT_THEME_DIR.'images/uarrow.gif';
+$WT_IMAGES['uarrow2'] = WT_THEME_DIR.'images/uarrow2.gif';
+$WT_IMAGES['uarrow3'] = WT_THEME_DIR.'images/uarrow3.gif';
+$WT_IMAGES['udarrow'] = WT_THEME_DIR.'images/udarrow.gif';
+$WT_IMAGES['vline'] = WT_THEME_DIR.'images/vline.gif';
+$WT_IMAGES['zoomin'] = WT_THEME_DIR.'images/zoomin.gif';
+$WT_IMAGES['zoomout'] = WT_THEME_DIR.'images/zoomout.gif';
+$WT_IMAGES['stop'] = WT_THEME_DIR.'images/stop.gif';
+$WT_IMAGES['pin-out'] = WT_THEME_DIR.'images/pin-out.png';
+$WT_IMAGES['pin-in'] = WT_THEME_DIR.'images/pin-in.png';
+$WT_IMAGES['default_image_M'] = WT_THEME_DIR.'images/silhouette_male.gif';
+$WT_IMAGES['default_image_F'] = WT_THEME_DIR.'images/silhouette_female.gif';
+$WT_IMAGES['default_image_U'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
+$WT_IMAGES['slide_open'] = WT_THEME_DIR.'images/open.png';
+$WT_IMAGES['slide_close'] = WT_THEME_DIR.'images/close.png';
 
 // - lifespan chart arrows
-$WT_IMAGES['lsltarrow']['other'] = WT_THEME_DIR.'images/lsltarrow.gif';
-$WT_IMAGES['lsrtarrow']['other'] = WT_THEME_DIR.'images/lsrtarrow.gif';
-$WT_IMAGES['lsdnarrow']['other'] = WT_THEME_DIR.'images/lsdnarrow.gif';
-$WT_IMAGES['lsuparrow']['other'] = WT_THEME_DIR.'images/lsuparrow.gif';
+$WT_IMAGES['lsltarrow'] = WT_THEME_DIR.'images/lsltarrow.gif';
+$WT_IMAGES['lsrtarrow'] = WT_THEME_DIR.'images/lsrtarrow.gif';
+$WT_IMAGES['lsdnarrow'] = WT_THEME_DIR.'images/lsdnarrow.gif';
+$WT_IMAGES['lsuparrow'] = WT_THEME_DIR.'images/lsuparrow.gif';
 
 //-- Variables for the Fan chart
 $fanChart = array(
diff --git a/themes/fab/theme.php b/themes/fab/theme.php
index c29f971c04..6dd57c4bd2 100644
--- a/themes/fab/theme.php
+++ b/themes/fab/theme.php
@@ -95,71 +95,71 @@ $WT_IMAGES['timeline'] = WT_THEME_DIR.'images/timeline.gif';
 $WT_IMAGES['tree'] = WT_THEME_DIR.'images/gedcom.gif';
 
 //- PGV buttons for data entry pages
-$WT_IMAGES['addmedia']['button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
-$WT_IMAGES['addrepository']['button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
-$WT_IMAGES['addsource']['button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
-$WT_IMAGES['addnote']['button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
-$WT_IMAGES['calendar']['button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
-$WT_IMAGES['family']['button'] = WT_THEME_DIR.'images/buttons/family.gif';
-$WT_IMAGES['indi']['button'] = WT_THEME_DIR.'images/buttons/indi.gif';
-$WT_IMAGES['keyboard']['button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
-$WT_IMAGES['media']['button'] = WT_THEME_DIR.'images/buttons/media.gif';
-$WT_IMAGES['place']['button'] = WT_THEME_DIR.'images/buttons/place.gif';
-$WT_IMAGES['repository']['button'] = WT_THEME_DIR.'images/buttons/repository.gif';
-$WT_IMAGES['source']['button'] = WT_THEME_DIR.'images/buttons/source.gif';
-$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
-$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
-$WT_IMAGES['find_facts']['button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
+$WT_IMAGES['addmedia_button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
+$WT_IMAGES['addrepository_button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
+$WT_IMAGES['addsource_button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
+$WT_IMAGES['addnote_button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
+$WT_IMAGES['calendar_button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
+$WT_IMAGES['family_button'] = WT_THEME_DIR.'images/buttons/family.gif';
+$WT_IMAGES['indi_button'] = WT_THEME_DIR.'images/buttons/indi.gif';
+$WT_IMAGES['keyboard_button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
+$WT_IMAGES['media_button'] = WT_THEME_DIR.'images/buttons/media.gif';
+$WT_IMAGES['place_button'] = WT_THEME_DIR.'images/buttons/place.gif';
+$WT_IMAGES['repository_button'] = WT_THEME_DIR.'images/buttons/repository.gif';
+$WT_IMAGES['source_button'] = WT_THEME_DIR.'images/buttons/source.gif';
+$WT_IMAGES['note_button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['head_button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['find_facts_button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
 
 // Media images
-$WT_IMAGES['media']['audio'] = WT_THEME_DIR.'images/media/audio.png';
-$WT_IMAGES['media']['doc'] = WT_THEME_DIR.'images/media/doc.gif';
-$WT_IMAGES['media']['flash'] = WT_THEME_DIR.'images/media/flash.png';
-$WT_IMAGES['media']['flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
-$WT_IMAGES['media']['ged'] = WT_THEME_DIR.'images/media/ged.gif';
-$WT_IMAGES['media']['globe'] = WT_THEME_DIR.'images/media/globe.png';
-$WT_IMAGES['media']['html'] = WT_THEME_DIR.'images/media/html.gif';
-$WT_IMAGES['media']['picasa'] = WT_THEME_DIR.'images/media/picasa.png';
-$WT_IMAGES['media']['pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
-$WT_IMAGES['media']['tex'] = WT_THEME_DIR.'images/media/tex.gif';
-$WT_IMAGES['media']['wmv'] = WT_THEME_DIR.'images/media/wmv.png';
-$WT_IMAGES['media']['wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
+$WT_IMAGES['media_audio'] = WT_THEME_DIR.'images/media/audio.png';
+$WT_IMAGES['media_doc'] = WT_THEME_DIR.'images/media/doc.gif';
+$WT_IMAGES['media_flash'] = WT_THEME_DIR.'images/media/flash.png';
+$WT_IMAGES['media_flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
+$WT_IMAGES['media_ged'] = WT_THEME_DIR.'images/media/ged.gif';
+$WT_IMAGES['media_globe'] = WT_THEME_DIR.'images/media/globe.png';
+$WT_IMAGES['media_html'] = WT_THEME_DIR.'images/media/html.gif';
+$WT_IMAGES['media_picasa'] = WT_THEME_DIR.'images/media/picasa.png';
+$WT_IMAGES['media_pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
+$WT_IMAGES['media_tex'] = WT_THEME_DIR.'images/media/tex.gif';
+$WT_IMAGES['media_wmv'] = WT_THEME_DIR.'images/media/wmv.png';
+$WT_IMAGES['media_wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
 
 //- other images
-$WT_IMAGES['add']['other']	= WT_THEME_DIR.'images/add.gif';
-$WT_IMAGES['darrow']['other'] = WT_THEME_DIR.'images/darrow.gif';
-$WT_IMAGES['darrow2']['other'] = WT_THEME_DIR.'images/darrow2.gif';
-$WT_IMAGES['ddarrow']['other'] = WT_THEME_DIR.'images/ddarrow.gif';
-$WT_IMAGES['dline']['other'] = WT_THEME_DIR.'images/dline.gif';
-$WT_IMAGES['dline2']['other'] = WT_THEME_DIR.'images/dline2.gif';
-$WT_IMAGES['webtrees']['other'] = WT_THEME_DIR.'images/webtrees.png';
-$WT_IMAGES['hline']['other'] = WT_THEME_DIR.'images/hline.gif';
-$WT_IMAGES['larrow']['other'] = WT_THEME_DIR.'images/larrow.gif';
-$WT_IMAGES['larrow2']['other'] = WT_THEME_DIR.'images/larrow2.gif';
-$WT_IMAGES['ldarrow']['other'] = WT_THEME_DIR.'images/ldarrow.gif';
-$WT_IMAGES['minus']['other'] = WT_THEME_DIR.'images/minus.gif';
-$WT_IMAGES['note']['other'] = WT_THEME_DIR.'images/notes.gif';
-$WT_IMAGES['plus']['other'] = WT_THEME_DIR.'images/plus.gif';
-$WT_IMAGES['rarrow']['other'] = WT_THEME_DIR.'images/rarrow.gif';
-$WT_IMAGES['rarrow2']['other'] = WT_THEME_DIR.'images/rarrow2.gif';
-$WT_IMAGES['rdarrow']['other'] = WT_THEME_DIR.'images/rdarrow.gif';
-$WT_IMAGES['remove']['other']	= WT_THEME_DIR.'images/remove.gif';
-$WT_IMAGES['spacer']['other'] = WT_THEME_DIR.'images/spacer.gif';
-$WT_IMAGES['uarrow']['other'] = WT_THEME_DIR.'images/uarrow.gif';
-$WT_IMAGES['uarrow2']['other'] = WT_THEME_DIR.'images/uarrow2.gif';
-$WT_IMAGES['uarrow3']['other'] = WT_THEME_DIR.'images/uarrow3.gif';
-$WT_IMAGES['udarrow']['other'] = WT_THEME_DIR.'images/udarrow.gif';
-$WT_IMAGES['vline']['other'] = WT_THEME_DIR.'images/vline.gif';
-$WT_IMAGES['zoomin']['other'] = WT_THEME_DIR.'images/zoomin.gif';
-$WT_IMAGES['zoomout']['other'] = WT_THEME_DIR.'images/zoomout.gif';
-$WT_IMAGES['stop']['other'] = WT_THEME_DIR.'images/stop.gif';
-$WT_IMAGES['pin-out']['other'] = WT_THEME_DIR.'images/pin-out.png';
-$WT_IMAGES['pin-in']['other'] = WT_THEME_DIR.'images/pin-in.png';
-$WT_IMAGES['default_image_M']['other'] = WT_THEME_DIR.'images/silhouette_male.gif';
-$WT_IMAGES['default_image_F']['other'] = WT_THEME_DIR.'images/silhouette_female.gif';
-$WT_IMAGES['default_image_U']['other'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
-$WT_IMAGES['slide_open']['other'] = WT_THEME_DIR.'images/open.png';
-$WT_IMAGES['slide_close']['other'] = WT_THEME_DIR.'images/close.png';
+$WT_IMAGES['add']	= WT_THEME_DIR.'images/add.gif';
+$WT_IMAGES['darrow'] = WT_THEME_DIR.'images/darrow.gif';
+$WT_IMAGES['darrow2'] = WT_THEME_DIR.'images/darrow2.gif';
+$WT_IMAGES['ddarrow'] = WT_THEME_DIR.'images/ddarrow.gif';
+$WT_IMAGES['dline'] = WT_THEME_DIR.'images/dline.gif';
+$WT_IMAGES['dline2'] = WT_THEME_DIR.'images/dline2.gif';
+$WT_IMAGES['webtrees'] = WT_THEME_DIR.'images/webtrees.png';
+$WT_IMAGES['hline'] = WT_THEME_DIR.'images/hline.gif';
+$WT_IMAGES['larrow'] = WT_THEME_DIR.'images/larrow.gif';
+$WT_IMAGES['larrow2'] = WT_THEME_DIR.'images/larrow2.gif';
+$WT_IMAGES['ldarrow'] = WT_THEME_DIR.'images/ldarrow.gif';
+$WT_IMAGES['minus'] = WT_THEME_DIR.'images/minus.gif';
+$WT_IMAGES['note'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['plus'] = WT_THEME_DIR.'images/plus.gif';
+$WT_IMAGES['rarrow'] = WT_THEME_DIR.'images/rarrow.gif';
+$WT_IMAGES['rarrow2'] = WT_THEME_DIR.'images/rarrow2.gif';
+$WT_IMAGES['rdarrow'] = WT_THEME_DIR.'images/rdarrow.gif';
+$WT_IMAGES['remove']	= WT_THEME_DIR.'images/remove.gif';
+$WT_IMAGES['spacer'] = WT_THEME_DIR.'images/spacer.gif';
+$WT_IMAGES['uarrow'] = WT_THEME_DIR.'images/uarrow.gif';
+$WT_IMAGES['uarrow2'] = WT_THEME_DIR.'images/uarrow2.gif';
+$WT_IMAGES['uarrow3'] = WT_THEME_DIR.'images/uarrow3.gif';
+$WT_IMAGES['udarrow'] = WT_THEME_DIR.'images/udarrow.gif';
+$WT_IMAGES['vline'] = WT_THEME_DIR.'images/vline.gif';
+$WT_IMAGES['zoomin'] = WT_THEME_DIR.'images/zoomin.gif';
+$WT_IMAGES['zoomout'] = WT_THEME_DIR.'images/zoomout.gif';
+$WT_IMAGES['stop'] = WT_THEME_DIR.'images/stop.gif';
+$WT_IMAGES['pin-out'] = WT_THEME_DIR.'images/pin-out.png';
+$WT_IMAGES['pin-in'] = WT_THEME_DIR.'images/pin-in.png';
+$WT_IMAGES['default_image_M'] = WT_THEME_DIR.'images/silhouette_male.gif';
+$WT_IMAGES['default_image_F'] = WT_THEME_DIR.'images/silhouette_female.gif';
+$WT_IMAGES['default_image_U'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
+$WT_IMAGES['slide_open'] = WT_THEME_DIR.'images/open.png';
+$WT_IMAGES['slide_close'] = WT_THEME_DIR.'images/close.png';
 
 //-- Variables for the Fan chart
 $fanChart = array(
@@ -172,10 +172,10 @@ $fanChart = array(
 );
 
 // - lifespan chart arrows
-$WT_IMAGES["lsltarrow"]["other"] = "lsltarrow.gif";
-$WT_IMAGES["lsrtarrow"]["other"] = "lsrtarrow.gif";
-$WT_IMAGES["lsdnarrow"]["other"] = "lsdnarrow.gif";
-$WT_IMAGES["lsuparrow"]["other"] = "lsuparrow.gif";
+$WT_IMAGES["lsltarrow"] = "lsltarrow.gif";
+$WT_IMAGES["lsrtarrow"] = "lsrtarrow.gif";
+$WT_IMAGES["lsdnarrow"] = "lsdnarrow.gif";
+$WT_IMAGES["lsuparrow"] = "lsuparrow.gif";
 
 //-- This section defines variables for the pedigree chart
 $bwidth = 225;		// -- width of boxes on pedigree chart
diff --git a/themes/minimal/theme.php b/themes/minimal/theme.php
index 4276e846a3..06fcbe7208 100644
--- a/themes/minimal/theme.php
+++ b/themes/minimal/theme.php
@@ -76,71 +76,71 @@ $WT_IMAGES['timeline'] = WT_THEME_DIR.'images/timeline.gif';
 $WT_IMAGES['tree'] = WT_THEME_DIR.'images/gedcom.gif';
 
 //- PGV buttons for data entry pages
-$WT_IMAGES['addmedia']['button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
-$WT_IMAGES['addsource']['button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
-$WT_IMAGES['addnote']['button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
-$WT_IMAGES['keyboard']['button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
-$WT_IMAGES['media']['button'] = WT_THEME_DIR.'images/buttons/media.gif';
-$WT_IMAGES['source']['button'] = WT_THEME_DIR.'images/buttons/source.gif';
-$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
-$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
-$WT_IMAGES['find_facts']['button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
+$WT_IMAGES['addmedia_button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
+$WT_IMAGES['addsource_button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
+$WT_IMAGES['addnote_button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
+$WT_IMAGES['keyboard_button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
+$WT_IMAGES['media_button'] = WT_THEME_DIR.'images/buttons/media.gif';
+$WT_IMAGES['source_button'] = WT_THEME_DIR.'images/buttons/source.gif';
+$WT_IMAGES['note_button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['head_button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['find_facts_button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
 
 // Media images
-$WT_IMAGES['media']['audio'] = WT_THEME_DIR.'images/../../../images/media/audio.png';
-$WT_IMAGES['media']['doc'] = WT_THEME_DIR.'images/../../../images/media/doc.gif';
-$WT_IMAGES['media']['flash'] = WT_THEME_DIR.'images/../../../images/media/flash.png';
-$WT_IMAGES['media']['flashrem'] = WT_THEME_DIR.'images/../../../images/media/flashrem.png';
-$WT_IMAGES['media']['ged'] = WT_THEME_DIR.'images/../../../images/media/ged.gif';
-$WT_IMAGES['media']['globe'] = WT_THEME_DIR.'images/../../../images/media/globe.png';
-$WT_IMAGES['media']['html'] = WT_THEME_DIR.'images/../../../images/media/html.gif';
-$WT_IMAGES['media']['picasa'] = WT_THEME_DIR.'images/../../../images/media/picasa.png';
-$WT_IMAGES['media']['pdf'] = WT_THEME_DIR.'images/../../../images/media/pdf.gif';
-$WT_IMAGES['media']['tex'] = WT_THEME_DIR.'images/../../../images/media/tex.gif';
-$WT_IMAGES['media']['wmv'] = WT_THEME_DIR.'images/../../../images/media/wmv.png';
-$WT_IMAGES['media']['wmvrem'] = WT_THEME_DIR.'images/../../../images/media/wmvrem.png';
+$WT_IMAGES['media_audio'] = WT_THEME_DIR.'images/../../../images/media/audio.png';
+$WT_IMAGES['media_doc'] = WT_THEME_DIR.'images/../../../images/media/doc.gif';
+$WT_IMAGES['media_flash'] = WT_THEME_DIR.'images/../../../images/media/flash.png';
+$WT_IMAGES['media_flashrem'] = WT_THEME_DIR.'images/../../../images/media/flashrem.png';
+$WT_IMAGES['media_ged'] = WT_THEME_DIR.'images/../../../images/media/ged.gif';
+$WT_IMAGES['media_globe'] = WT_THEME_DIR.'images/../../../images/media/globe.png';
+$WT_IMAGES['media_html'] = WT_THEME_DIR.'images/../../../images/media/html.gif';
+$WT_IMAGES['media_picasa'] = WT_THEME_DIR.'images/../../../images/media/picasa.png';
+$WT_IMAGES['media_pdf'] = WT_THEME_DIR.'images/../../../images/media/pdf.gif';
+$WT_IMAGES['media_tex'] = WT_THEME_DIR.'images/../../../images/media/tex.gif';
+$WT_IMAGES['media_wmv'] = WT_THEME_DIR.'images/../../../images/media/wmv.png';
+$WT_IMAGES['media_wmvrem'] = WT_THEME_DIR.'images/../../../images/media/wmvrem.png';
 
 //- other images
-$WT_IMAGES['add']['other'] = WT_THEME_DIR.'images/add.gif';
-$WT_IMAGES['darrow']['other'] = WT_THEME_DIR.'images/darrow.gif';
-$WT_IMAGES['darrow2']['other'] = WT_THEME_DIR.'images/darrow2.gif';
-$WT_IMAGES['ddarrow']['other'] = WT_THEME_DIR.'images/ddarrow.gif';
-$WT_IMAGES['dline']['other'] = WT_THEME_DIR.'images/dline.gif';
-$WT_IMAGES['dline2']['other'] = WT_THEME_DIR.'images/dline2.gif';
-$WT_IMAGES['webtrees']['other'] = WT_THEME_DIR.'images/webtrees.gif';
-$WT_IMAGES['hline']['other'] = WT_THEME_DIR.'images/hline.gif';
-$WT_IMAGES['larrow']['other'] = WT_THEME_DIR.'images/larrow.gif';
-$WT_IMAGES['larrow2']['other'] = WT_THEME_DIR.'images/larrow2.gif';
-$WT_IMAGES['ldarrow']['other'] = WT_THEME_DIR.'images/ldarrow.gif';
-$WT_IMAGES['minus']['other'] = WT_THEME_DIR.'images/minus.gif';
-$WT_IMAGES['note']['other'] = WT_THEME_DIR.'images/notes.gif';
-$WT_IMAGES['plus']['other'] = WT_THEME_DIR.'images/plus.gif';
-$WT_IMAGES['rarrow']['other'] = WT_THEME_DIR.'images/rarrow.gif';
-$WT_IMAGES['rarrow2']['other'] = WT_THEME_DIR.'images/rarrow2.gif';
-$WT_IMAGES['rdarrow']['other'] = WT_THEME_DIR.'images/rdarrow.gif';
-$WT_IMAGES['remove']['other']	= WT_THEME_DIR.'images/remove.gif';
-$WT_IMAGES['spacer']['other'] = WT_THEME_DIR.'images/spacer.gif';
-$WT_IMAGES['uarrow']['other'] = WT_THEME_DIR.'images/uarrow.gif';
-$WT_IMAGES['uarrow2']['other'] = WT_THEME_DIR.'images/uarrow2.gif';
-$WT_IMAGES['uarrow3']['other'] = WT_THEME_DIR.'images/uarrow3.gif';
-$WT_IMAGES['udarrow']['other'] = WT_THEME_DIR.'images/udarrow.gif';
-$WT_IMAGES['vline']['other'] = WT_THEME_DIR.'images/vline.gif';
-$WT_IMAGES['zoomin']['other'] = WT_THEME_DIR.'images/zoomin.gif';
-$WT_IMAGES['zoomout']['other'] = WT_THEME_DIR.'images/zoomout.gif';
-$WT_IMAGES['stop']['other'] = WT_THEME_DIR.'images/stop.gif';
-$WT_IMAGES['pin-out']['other'] = WT_THEME_DIR.'images/pin-out.png';
-$WT_IMAGES['pin-in']['other'] = WT_THEME_DIR.'images/pin-in.png';
-$WT_IMAGES['default_image_M']['other'] = WT_THEME_DIR.'images/silhouette_male.gif';
-$WT_IMAGES['default_image_F']['other'] = WT_THEME_DIR.'images/silhouette_female.gif';
-$WT_IMAGES['default_image_U']['other'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
-$WT_IMAGES['slide_open']['other'] = WT_THEME_DIR.'images/open.png';
-$WT_IMAGES['slide_close']['other'] = WT_THEME_DIR.'images/close.png';
+$WT_IMAGES['add'] = WT_THEME_DIR.'images/add.gif';
+$WT_IMAGES['darrow'] = WT_THEME_DIR.'images/darrow.gif';
+$WT_IMAGES['darrow2'] = WT_THEME_DIR.'images/darrow2.gif';
+$WT_IMAGES['ddarrow'] = WT_THEME_DIR.'images/ddarrow.gif';
+$WT_IMAGES['dline'] = WT_THEME_DIR.'images/dline.gif';
+$WT_IMAGES['dline2'] = WT_THEME_DIR.'images/dline2.gif';
+$WT_IMAGES['webtrees'] = WT_THEME_DIR.'images/webtrees.gif';
+$WT_IMAGES['hline'] = WT_THEME_DIR.'images/hline.gif';
+$WT_IMAGES['larrow'] = WT_THEME_DIR.'images/larrow.gif';
+$WT_IMAGES['larrow2'] = WT_THEME_DIR.'images/larrow2.gif';
+$WT_IMAGES['ldarrow'] = WT_THEME_DIR.'images/ldarrow.gif';
+$WT_IMAGES['minus'] = WT_THEME_DIR.'images/minus.gif';
+$WT_IMAGES['note'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['plus'] = WT_THEME_DIR.'images/plus.gif';
+$WT_IMAGES['rarrow'] = WT_THEME_DIR.'images/rarrow.gif';
+$WT_IMAGES['rarrow2'] = WT_THEME_DIR.'images/rarrow2.gif';
+$WT_IMAGES['rdarrow'] = WT_THEME_DIR.'images/rdarrow.gif';
+$WT_IMAGES['remove']	= WT_THEME_DIR.'images/remove.gif';
+$WT_IMAGES['spacer'] = WT_THEME_DIR.'images/spacer.gif';
+$WT_IMAGES['uarrow'] = WT_THEME_DIR.'images/uarrow.gif';
+$WT_IMAGES['uarrow2'] = WT_THEME_DIR.'images/uarrow2.gif';
+$WT_IMAGES['uarrow3'] = WT_THEME_DIR.'images/uarrow3.gif';
+$WT_IMAGES['udarrow'] = WT_THEME_DIR.'images/udarrow.gif';
+$WT_IMAGES['vline'] = WT_THEME_DIR.'images/vline.gif';
+$WT_IMAGES['zoomin'] = WT_THEME_DIR.'images/zoomin.gif';
+$WT_IMAGES['zoomout'] = WT_THEME_DIR.'images/zoomout.gif';
+$WT_IMAGES['stop'] = WT_THEME_DIR.'images/stop.gif';
+$WT_IMAGES['pin-out'] = WT_THEME_DIR.'images/pin-out.png';
+$WT_IMAGES['pin-in'] = WT_THEME_DIR.'images/pin-in.png';
+$WT_IMAGES['default_image_M'] = WT_THEME_DIR.'images/silhouette_male.gif';
+$WT_IMAGES['default_image_F'] = WT_THEME_DIR.'images/silhouette_female.gif';
+$WT_IMAGES['default_image_U'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
+$WT_IMAGES['slide_open'] = WT_THEME_DIR.'images/open.png';
+$WT_IMAGES['slide_close'] = WT_THEME_DIR.'images/close.png';
 
 // - lifespan chart arrows
-$WT_IMAGES['lsltarrow']['other'] = WT_THEME_DIR.'images/lsltarrow.gif';
-$WT_IMAGES['lsrtarrow']['other'] = WT_THEME_DIR.'images/lsrtarrow.gif';
-$WT_IMAGES['lsdnarrow']['other'] = WT_THEME_DIR.'images/lsdnarrow.gif';
-$WT_IMAGES['lsuparrow']['other'] = WT_THEME_DIR.'images/lsuparrow.gif';
+$WT_IMAGES['lsltarrow'] = WT_THEME_DIR.'images/lsltarrow.gif';
+$WT_IMAGES['lsrtarrow'] = WT_THEME_DIR.'images/lsrtarrow.gif';
+$WT_IMAGES['lsdnarrow'] = WT_THEME_DIR.'images/lsdnarrow.gif';
+$WT_IMAGES['lsuparrow'] = WT_THEME_DIR.'images/lsuparrow.gif';
 
 //-- Variables for the Fan chart
 $fanChart = array(
diff --git a/themes/minimal/toplinks.php b/themes/minimal/toplinks.php
index 62b0cf075f..98c4eb42c6 100644
--- a/themes/minimal/toplinks.php
+++ b/themes/minimal/toplinks.php
@@ -121,7 +121,7 @@ $menubar = new MenuBar();
 	?>
 	</tr>
 </table>
-<img src="<?php print $WT_IMAGES["hline"]["other"]; ?>" width="100%" height="3" alt="" />
+<img src="<?php print $WT_IMAGES["hline"]; ?>" width="100%" height="3" alt="" />
 </div>
 <!-- close div for div id="header" -->
 
diff --git a/themes/webtrees/footer.php b/themes/webtrees/footer.php
index d68e1300f8..81eec7f4dc 100644
--- a/themes/webtrees/footer.php
+++ b/themes/webtrees/footer.php
@@ -41,7 +41,7 @@ echo '<div id="footer" class="', $TEXT_DIRECTION, '">';
 		'<div align="center" style="width:99%;">',
 			'<br />',
 			'<a href="', WT_WEBTREES_URL, '" target="_blank">',
-			'<img src="', $WT_IMAGES['webtrees']['other'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '"',
+			'<img src="', $WT_IMAGES['webtrees'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '"',
 				'title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "" , '" /></a><br />',
 			'<br />';
 
diff --git a/themes/webtrees/header.php b/themes/webtrees/header.php
index b792a811b5..c43847e471 100644
--- a/themes/webtrees/header.php
+++ b/themes/webtrees/header.php
@@ -140,7 +140,7 @@ if ($view!='simple') {
 	$menubar = new MenuBar();
 
 	echo '<div>',
-		'<img src="', $WT_IMAGES["hline"]["other"], '" width="100%" height="3" alt="" />',
+		'<img src="', $WT_IMAGES["hline"], '" width="100%" height="3" alt="" />',
 		'<table id="topMenu">',
 			'<tr>';
 				$menu = $menubar->getGedcomMenu();
@@ -211,7 +211,7 @@ if ($view!='simple') {
 				}
 			echo '</tr>',
 		'</table>',
-		'<img align="middle" src="', $WT_IMAGES["hline"]["other"], '" width="100%" height="3" alt="" />',
+		'<img align="middle" src="', $WT_IMAGES["hline"], '" width="100%" height="3" alt="" />',
 	'</div>',
 '</div>',
 // end header section -->
diff --git a/themes/webtrees/theme.php b/themes/webtrees/theme.php
index 9e4645f1ef..f4c54a77c4 100644
--- a/themes/webtrees/theme.php
+++ b/themes/webtrees/theme.php
@@ -95,77 +95,77 @@ $WT_IMAGES['tree'] = WT_THEME_DIR.'images/tree.png';
 $WT_IMAGES['wiki'] = WT_THEME_DIR.'images/w_22.png';
 
 //- PGV buttons for data entry pages
-$WT_IMAGES['addmedia']['button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
-$WT_IMAGES['addrepository']['button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
-$WT_IMAGES['addsource']['button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
-$WT_IMAGES['addnote']['button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
-$WT_IMAGES['calendar']['button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
-$WT_IMAGES['family']['button'] = WT_THEME_DIR.'images/buttons/family.gif';
-$WT_IMAGES['indi']['button'] = WT_THEME_DIR.'images/buttons/indi.gif';
-$WT_IMAGES['keyboard']['button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
-$WT_IMAGES['media']['button'] = WT_THEME_DIR.'images/buttons/media.gif';
-$WT_IMAGES['place']['button'] = WT_THEME_DIR.'images/buttons/place.gif';
-$WT_IMAGES['repository']['button'] = WT_THEME_DIR.'images/buttons/repository.gif';
-$WT_IMAGES['source']['button'] = WT_THEME_DIR.'images/buttons/source.gif';
-$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
-$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
-$WT_IMAGES['find_facts']['button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
+$WT_IMAGES['addmedia_button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
+$WT_IMAGES['addrepository_button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
+$WT_IMAGES['addsource_button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
+$WT_IMAGES['addnote_button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
+$WT_IMAGES['calendar_button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
+$WT_IMAGES['family_button'] = WT_THEME_DIR.'images/buttons/family.gif';
+$WT_IMAGES['indi_button'] = WT_THEME_DIR.'images/buttons/indi.gif';
+$WT_IMAGES['keyboard_button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
+$WT_IMAGES['media_button'] = WT_THEME_DIR.'images/buttons/media.gif';
+$WT_IMAGES['place_button'] = WT_THEME_DIR.'images/buttons/place.gif';
+$WT_IMAGES['repository_button'] = WT_THEME_DIR.'images/buttons/repository.gif';
+$WT_IMAGES['source_button'] = WT_THEME_DIR.'images/buttons/source.gif';
+$WT_IMAGES['note_button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['head_button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['find_facts_button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
 
 // Media images
-$WT_IMAGES['media']['audio'] = WT_THEME_DIR.'images/media/audio.png';
-$WT_IMAGES['media']['doc'] = WT_THEME_DIR.'images/media/doc.gif';
-$WT_IMAGES['media']['flash'] = WT_THEME_DIR.'images/media/flash.png';
-$WT_IMAGES['media']['flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
-$WT_IMAGES['media']['ged'] = WT_THEME_DIR.'images/media/ged.gif';
-$WT_IMAGES['media']['globe'] = WT_THEME_DIR.'images/media/globe.png';
-$WT_IMAGES['media']['html'] = WT_THEME_DIR.'images/media/html.gif';
-$WT_IMAGES['media']['picasa'] = WT_THEME_DIR.'images/media/picasa.png';
-$WT_IMAGES['media']['pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
-$WT_IMAGES['media']['tex'] = WT_THEME_DIR.'images/media/tex.gif';
-$WT_IMAGES['media']['wmv'] = WT_THEME_DIR.'images/media/wmv.png';
-$WT_IMAGES['media']['wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
+$WT_IMAGES['media_audio'] = WT_THEME_DIR.'images/media/audio.png';
+$WT_IMAGES['media_doc'] = WT_THEME_DIR.'images/media/doc.gif';
+$WT_IMAGES['media_flash'] = WT_THEME_DIR.'images/media/flash.png';
+$WT_IMAGES['media_flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
+$WT_IMAGES['media_ged'] = WT_THEME_DIR.'images/media/ged.gif';
+$WT_IMAGES['media_globe'] = WT_THEME_DIR.'images/media/globe.png';
+$WT_IMAGES['media_html'] = WT_THEME_DIR.'images/media/html.gif';
+$WT_IMAGES['media_picasa'] = WT_THEME_DIR.'images/media/picasa.png';
+$WT_IMAGES['media_pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
+$WT_IMAGES['media_tex'] = WT_THEME_DIR.'images/media/tex.gif';
+$WT_IMAGES['media_wmv'] = WT_THEME_DIR.'images/media/wmv.png';
+$WT_IMAGES['media_wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
 
 //- other images
-$WT_IMAGES['add']['other']	= WT_THEME_DIR.'images/add.gif';
-$WT_IMAGES['darrow']['other'] = WT_THEME_DIR.'images/darrow.gif';
-$WT_IMAGES['darrow2']['other'] = WT_THEME_DIR.'images/darrow2.gif';
-$WT_IMAGES['ddarrow']['other'] = WT_THEME_DIR.'images/ddarrow.gif';
-$WT_IMAGES['dline']['other'] = WT_THEME_DIR.'images/dline.gif';
-$WT_IMAGES['dline2']['other'] = WT_THEME_DIR.'images/dline2.gif';
-$WT_IMAGES['webtrees']['other'] = WT_THEME_DIR.'images/webtrees_s.png';
-$WT_IMAGES['hline']['other'] = WT_THEME_DIR.'images/hline.gif';
-$WT_IMAGES['larrow']['other'] = WT_THEME_DIR.'images/larrow.gif';
-$WT_IMAGES['larrow2']['other'] = WT_THEME_DIR.'images/larrow2.gif';
-$WT_IMAGES['ldarrow']['other'] = WT_THEME_DIR.'images/ldarrow.gif';
-$WT_IMAGES['minus']['other'] = WT_THEME_DIR.'images/minus.gif';
-$WT_IMAGES['note']['other'] = WT_THEME_DIR.'images/notes.gif';
-$WT_IMAGES['plus']['other'] = WT_THEME_DIR.'images/plus.gif';
-$WT_IMAGES['rarrow']['other'] = WT_THEME_DIR.'images/rarrow.gif';
-$WT_IMAGES['rarrow2']['other'] = WT_THEME_DIR.'images/rarrow2.gif';
-$WT_IMAGES['rdarrow']['other'] = WT_THEME_DIR.'images/rdarrow.gif';
-$WT_IMAGES['remove']['other']	= WT_THEME_DIR.'images/remove.gif';
-$WT_IMAGES['spacer']['other'] = WT_THEME_DIR.'images/spacer.gif';
-$WT_IMAGES['uarrow']['other'] = WT_THEME_DIR.'images/uarrow.gif';
-$WT_IMAGES['uarrow2']['other'] = WT_THEME_DIR.'images/uarrow2.gif';
-$WT_IMAGES['uarrow3']['other'] = WT_THEME_DIR.'images/uarrow3.gif';
-$WT_IMAGES['udarrow']['other'] = WT_THEME_DIR.'images/udarrow.gif';
-$WT_IMAGES['vline']['other'] = WT_THEME_DIR.'images/vline.gif';
-$WT_IMAGES['zoomin']['other'] = WT_THEME_DIR.'images/zoomin.gif';
-$WT_IMAGES['zoomout']['other'] = WT_THEME_DIR.'images/zoomout.gif';
-$WT_IMAGES['stop']['other'] = WT_THEME_DIR.'images/stop.gif';
-$WT_IMAGES['pin-out']['other'] = WT_THEME_DIR.'images/pin-out.png';
-$WT_IMAGES['pin-in']['other'] = WT_THEME_DIR.'images/pin-in.png';
-$WT_IMAGES['default_image_M']['other'] = WT_THEME_DIR.'images/silhouette_male.gif';
-$WT_IMAGES['default_image_F']['other'] = WT_THEME_DIR.'images/silhouette_female.gif';
-$WT_IMAGES['default_image_U']['other'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
-$WT_IMAGES['slide_open']['other'] = WT_THEME_DIR.'images/open.png';
-$WT_IMAGES['slide_close']['other'] = WT_THEME_DIR.'images/close.png';
+$WT_IMAGES['add']	= WT_THEME_DIR.'images/add.gif';
+$WT_IMAGES['darrow'] = WT_THEME_DIR.'images/darrow.gif';
+$WT_IMAGES['darrow2'] = WT_THEME_DIR.'images/darrow2.gif';
+$WT_IMAGES['ddarrow'] = WT_THEME_DIR.'images/ddarrow.gif';
+$WT_IMAGES['dline'] = WT_THEME_DIR.'images/dline.gif';
+$WT_IMAGES['dline2'] = WT_THEME_DIR.'images/dline2.gif';
+$WT_IMAGES['webtrees'] = WT_THEME_DIR.'images/webtrees_s.png';
+$WT_IMAGES['hline'] = WT_THEME_DIR.'images/hline.gif';
+$WT_IMAGES['larrow'] = WT_THEME_DIR.'images/larrow.gif';
+$WT_IMAGES['larrow2'] = WT_THEME_DIR.'images/larrow2.gif';
+$WT_IMAGES['ldarrow'] = WT_THEME_DIR.'images/ldarrow.gif';
+$WT_IMAGES['minus'] = WT_THEME_DIR.'images/minus.gif';
+$WT_IMAGES['note'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['plus'] = WT_THEME_DIR.'images/plus.gif';
+$WT_IMAGES['rarrow'] = WT_THEME_DIR.'images/rarrow.gif';
+$WT_IMAGES['rarrow2'] = WT_THEME_DIR.'images/rarrow2.gif';
+$WT_IMAGES['rdarrow'] = WT_THEME_DIR.'images/rdarrow.gif';
+$WT_IMAGES['remove']	= WT_THEME_DIR.'images/remove.gif';
+$WT_IMAGES['spacer'] = WT_THEME_DIR.'images/spacer.gif';
+$WT_IMAGES['uarrow'] = WT_THEME_DIR.'images/uarrow.gif';
+$WT_IMAGES['uarrow2'] = WT_THEME_DIR.'images/uarrow2.gif';
+$WT_IMAGES['uarrow3'] = WT_THEME_DIR.'images/uarrow3.gif';
+$WT_IMAGES['udarrow'] = WT_THEME_DIR.'images/udarrow.gif';
+$WT_IMAGES['vline'] = WT_THEME_DIR.'images/vline.gif';
+$WT_IMAGES['zoomin'] = WT_THEME_DIR.'images/zoomin.gif';
+$WT_IMAGES['zoomout'] = WT_THEME_DIR.'images/zoomout.gif';
+$WT_IMAGES['stop'] = WT_THEME_DIR.'images/stop.gif';
+$WT_IMAGES['pin-out'] = WT_THEME_DIR.'images/pin-out.png';
+$WT_IMAGES['pin-in'] = WT_THEME_DIR.'images/pin-in.png';
+$WT_IMAGES['default_image_M'] = WT_THEME_DIR.'images/silhouette_male.gif';
+$WT_IMAGES['default_image_F'] = WT_THEME_DIR.'images/silhouette_female.gif';
+$WT_IMAGES['default_image_U'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
+$WT_IMAGES['slide_open'] = WT_THEME_DIR.'images/open.png';
+$WT_IMAGES['slide_close'] = WT_THEME_DIR.'images/close.png';
 
 // - lifespan chart arrows
-$WT_IMAGES['lsltarrow']['other'] = WT_THEME_DIR.'images/lsltarrow.gif';
-$WT_IMAGES['lsrtarrow']['other'] = WT_THEME_DIR.'images/lsrtarrow.gif';
-$WT_IMAGES['lsdnarrow']['other'] = WT_THEME_DIR.'images/lsdnarrow.gif';
-$WT_IMAGES['lsuparrow']['other'] = WT_THEME_DIR.'images/lsuparrow.gif';
+$WT_IMAGES['lsltarrow'] = WT_THEME_DIR.'images/lsltarrow.gif';
+$WT_IMAGES['lsrtarrow'] = WT_THEME_DIR.'images/lsrtarrow.gif';
+$WT_IMAGES['lsdnarrow'] = WT_THEME_DIR.'images/lsdnarrow.gif';
+$WT_IMAGES['lsuparrow'] = WT_THEME_DIR.'images/lsuparrow.gif';
 
 //-- Variables for the Fan chart
 $fanChart = array(
diff --git a/themes/xenea/footer.php b/themes/xenea/footer.php
index 1cc525abfe..f9fec122fa 100644
--- a/themes/xenea/footer.php
+++ b/themes/xenea/footer.php
@@ -36,7 +36,7 @@ echo "</div> <!-- closing div id=\"content\" -->\n";//FIXME uncomment as soon as
 echo "<div id=\"footer\" class=\"$TEXT_DIRECTION\">";
 echo "\n\t<div align=\"center\" style=\"width:99%;\">";
 echo contact_links();
-echo '<br /><a href="', WT_WEBTREES_URL, '" target="_blank"><img src="', $WT_IMAGES['webtrees']['other'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" /></a><br />';
+echo '<br /><a href="', WT_WEBTREES_URL, '" target="_blank"><img src="', $WT_IMAGES['webtrees'], '" width="100" border="0" alt="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" title="', WT_WEBTREES, WT_USER_IS_ADMIN? (" - " .WT_VERSION_TEXT): "", '" /></a><br />';
 echo "\n\t<br />";
 if ($SHOW_STATS || WT_DEBUG) {
 	echo execution_stats();
diff --git a/themes/xenea/theme.php b/themes/xenea/theme.php
index e934db938e..fdc5df943d 100644
--- a/themes/xenea/theme.php
+++ b/themes/xenea/theme.php
@@ -94,78 +94,78 @@ $WT_IMAGES['tree'] = WT_THEME_DIR.'images/tree.gif';
 $WT_IMAGES['wiki'] = WT_THEME_DIR.'images/w_22.png';
 
 //- PGV buttons for data entry pages
-$WT_IMAGES['addmedia']['button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
-$WT_IMAGES['addrepository']['button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
-$WT_IMAGES['addsource']['button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
-$WT_IMAGES['addnote']['button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
-$WT_IMAGES['autocomplete']['button'] = WT_THEME_DIR.'images/buttons/autocomplete.gif';
-$WT_IMAGES['calendar']['button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
-$WT_IMAGES['family']['button'] = WT_THEME_DIR.'images/buttons/family.gif';
-$WT_IMAGES['indi']['button'] = WT_THEME_DIR.'images/buttons/indi.gif';
-$WT_IMAGES['keyboard']['button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
-$WT_IMAGES['media']['button'] = WT_THEME_DIR.'images/buttons/media.gif';
-$WT_IMAGES['place']['button'] = WT_THEME_DIR.'images/buttons/place.gif';
-$WT_IMAGES['repository']['button'] = WT_THEME_DIR.'images/buttons/repository.gif';
-$WT_IMAGES['source']['button'] = WT_THEME_DIR.'images/buttons/source.gif';
-$WT_IMAGES['note']['button'] = WT_THEME_DIR.'images/buttons/note.gif';
-$WT_IMAGES['head']['button'] = WT_THEME_DIR.'images/buttons/head.gif';
-$WT_IMAGES['find_facts']['button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
+$WT_IMAGES['addmedia_button'] = WT_THEME_DIR.'images/buttons/addmedia.gif';
+$WT_IMAGES['addrepository_button'] = WT_THEME_DIR.'images/buttons/addrepository.gif';
+$WT_IMAGES['addsource_button'] = WT_THEME_DIR.'images/buttons/addsource.gif';
+$WT_IMAGES['addnote_button'] = WT_THEME_DIR.'images/buttons/addnote.gif';
+$WT_IMAGES['autocomplete_button'] = WT_THEME_DIR.'images/buttons/autocomplete.gif';
+$WT_IMAGES['calendar_button'] = WT_THEME_DIR.'images/buttons/calendar.gif';
+$WT_IMAGES['family_button'] = WT_THEME_DIR.'images/buttons/family.gif';
+$WT_IMAGES['indi_button'] = WT_THEME_DIR.'images/buttons/indi.gif';
+$WT_IMAGES['keyboard_button'] = WT_THEME_DIR.'images/buttons/keyboard.gif';
+$WT_IMAGES['media_button'] = WT_THEME_DIR.'images/buttons/media.gif';
+$WT_IMAGES['place_button'] = WT_THEME_DIR.'images/buttons/place.gif';
+$WT_IMAGES['repository_button'] = WT_THEME_DIR.'images/buttons/repository.gif';
+$WT_IMAGES['source_button'] = WT_THEME_DIR.'images/buttons/source.gif';
+$WT_IMAGES['note_button'] = WT_THEME_DIR.'images/buttons/note.gif';
+$WT_IMAGES['head_button'] = WT_THEME_DIR.'images/buttons/head.gif';
+$WT_IMAGES['find_facts_button'] = WT_THEME_DIR.'images/buttons/find_facts.png';
 
 // Media images
-$WT_IMAGES['media']['audio'] = WT_THEME_DIR.'images/media/audio.png';
-$WT_IMAGES['media']['doc'] = WT_THEME_DIR.'images/media/doc.gif';
-$WT_IMAGES['media']['flash'] = WT_THEME_DIR.'images/media/flash.png';
-$WT_IMAGES['media']['flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
-$WT_IMAGES['media']['ged'] = WT_THEME_DIR.'images/media/ged.gif';
-$WT_IMAGES['media']['globe'] = WT_THEME_DIR.'images/media/globe.png';
-$WT_IMAGES['media']['html'] = WT_THEME_DIR.'images/media/html.gif';
-$WT_IMAGES['media']['picasa'] = WT_THEME_DIR.'images/media/picasa.png';
-$WT_IMAGES['media']['pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
-$WT_IMAGES['media']['tex'] = WT_THEME_DIR.'images/media/tex.gif';
-$WT_IMAGES['media']['wmv'] = WT_THEME_DIR.'images/media/wmv.png';
-$WT_IMAGES['media']['wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
+$WT_IMAGES['media_audio'] = WT_THEME_DIR.'images/media/audio.png';
+$WT_IMAGES['media_doc'] = WT_THEME_DIR.'images/media/doc.gif';
+$WT_IMAGES['media_flash'] = WT_THEME_DIR.'images/media/flash.png';
+$WT_IMAGES['media_flashrem'] = WT_THEME_DIR.'images/media/flashrem.png';
+$WT_IMAGES['media_ged'] = WT_THEME_DIR.'images/media/ged.gif';
+$WT_IMAGES['media_globe'] = WT_THEME_DIR.'images/media/globe.png';
+$WT_IMAGES['media_html'] = WT_THEME_DIR.'images/media/html.gif';
+$WT_IMAGES['media_picasa'] = WT_THEME_DIR.'images/media/picasa.png';
+$WT_IMAGES['media_pdf'] = WT_THEME_DIR.'images/media/pdf.gif';
+$WT_IMAGES['media_tex'] = WT_THEME_DIR.'images/media/tex.gif';
+$WT_IMAGES['media_wmv'] = WT_THEME_DIR.'images/media/wmv.png';
+$WT_IMAGES['media_wmvrem'] = WT_THEME_DIR.'images/media/wmvrem.png';
 
 //- other images
-$WT_IMAGES['add']['other'] = WT_THEME_DIR.'images/add.gif';
-$WT_IMAGES['darrow']['other'] = WT_THEME_DIR.'images/darrow.gif';
-$WT_IMAGES['darrow2']['other'] = WT_THEME_DIR.'images/darrow2.gif';
-$WT_IMAGES['ddarrow']['other'] = WT_THEME_DIR.'images/ddarrow.gif';
-$WT_IMAGES['dline']['other'] = WT_THEME_DIR.'images/dline.gif';
-$WT_IMAGES['dline2']['other'] = WT_THEME_DIR.'images/dline2.gif';
-$WT_IMAGES['webtrees']['other'] = WT_THEME_DIR.'images/webtrees.png';
-$WT_IMAGES['hline']['other'] = WT_THEME_DIR.'images/hline.gif';
-$WT_IMAGES['larrow']['other'] = WT_THEME_DIR.'images/larrow.gif';
-$WT_IMAGES['larrow2']['other'] = WT_THEME_DIR.'images/larrow2.gif';
-$WT_IMAGES['ldarrow']['other'] = WT_THEME_DIR.'images/ldarrow.gif';
-$WT_IMAGES['minus']['other'] = WT_THEME_DIR.'images/minus.gif';
-$WT_IMAGES['note']['other'] = WT_THEME_DIR.'images/notes.gif';
-$WT_IMAGES['plus']['other'] = WT_THEME_DIR.'images/plus.gif';
-$WT_IMAGES['rarrow']['other'] = WT_THEME_DIR.'images/rarrow.gif';
-$WT_IMAGES['rarrow2']['other'] = WT_THEME_DIR.'images/rarrow2.gif';
-$WT_IMAGES['rdarrow']['other'] = WT_THEME_DIR.'images/rdarrow.gif';
-$WT_IMAGES['remove']['other']	= WT_THEME_DIR.'images/remove.gif';
-$WT_IMAGES['spacer']['other'] = WT_THEME_DIR.'images/spacer.gif';
-$WT_IMAGES['uarrow']['other'] = WT_THEME_DIR.'images/uarrow.gif';
-$WT_IMAGES['uarrow2']['other'] = WT_THEME_DIR.'images/uarrow2.gif';
-$WT_IMAGES['uarrow3']['other'] = WT_THEME_DIR.'images/uarrow3.gif';
-$WT_IMAGES['udarrow']['other'] = WT_THEME_DIR.'images/udarrow.gif';
-$WT_IMAGES['vline']['other'] = WT_THEME_DIR.'images/vline.gif';
-$WT_IMAGES['zoomin']['other'] = WT_THEME_DIR.'images/zoomin.gif';
-$WT_IMAGES['zoomout']['other'] = WT_THEME_DIR.'images/zoomout.gif';
-$WT_IMAGES['stop']['other'] = WT_THEME_DIR.'images/stop.gif';
-$WT_IMAGES['pin-out']['other'] = WT_THEME_DIR.'images/pin-out.png';
-$WT_IMAGES['pin-in']['other'] = WT_THEME_DIR.'images/pin-in.png';
-$WT_IMAGES['default_image_M']['other'] = WT_THEME_DIR.'images/silhouette_male.gif';
-$WT_IMAGES['default_image_F']['other'] = WT_THEME_DIR.'images/silhouette_female.gif';
-$WT_IMAGES['default_image_U']['other'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
-$WT_IMAGES['slide_open']['other'] = WT_THEME_DIR.'images/open.png';
-$WT_IMAGES['slide_close']['other'] = WT_THEME_DIR.'images/close.png';
+$WT_IMAGES['add'] = WT_THEME_DIR.'images/add.gif';
+$WT_IMAGES['darrow'] = WT_THEME_DIR.'images/darrow.gif';
+$WT_IMAGES['darrow2'] = WT_THEME_DIR.'images/darrow2.gif';
+$WT_IMAGES['ddarrow'] = WT_THEME_DIR.'images/ddarrow.gif';
+$WT_IMAGES['dline'] = WT_THEME_DIR.'images/dline.gif';
+$WT_IMAGES['dline2'] = WT_THEME_DIR.'images/dline2.gif';
+$WT_IMAGES['webtrees'] = WT_THEME_DIR.'images/webtrees.png';
+$WT_IMAGES['hline'] = WT_THEME_DIR.'images/hline.gif';
+$WT_IMAGES['larrow'] = WT_THEME_DIR.'images/larrow.gif';
+$WT_IMAGES['larrow2'] = WT_THEME_DIR.'images/larrow2.gif';
+$WT_IMAGES['ldarrow'] = WT_THEME_DIR.'images/ldarrow.gif';
+$WT_IMAGES['minus'] = WT_THEME_DIR.'images/minus.gif';
+$WT_IMAGES['note'] = WT_THEME_DIR.'images/notes.gif';
+$WT_IMAGES['plus'] = WT_THEME_DIR.'images/plus.gif';
+$WT_IMAGES['rarrow'] = WT_THEME_DIR.'images/rarrow.gif';
+$WT_IMAGES['rarrow2'] = WT_THEME_DIR.'images/rarrow2.gif';
+$WT_IMAGES['rdarrow'] = WT_THEME_DIR.'images/rdarrow.gif';
+$WT_IMAGES['remove']	= WT_THEME_DIR.'images/remove.gif';
+$WT_IMAGES['spacer'] = WT_THEME_DIR.'images/spacer.gif';
+$WT_IMAGES['uarrow'] = WT_THEME_DIR.'images/uarrow.gif';
+$WT_IMAGES['uarrow2'] = WT_THEME_DIR.'images/uarrow2.gif';
+$WT_IMAGES['uarrow3'] = WT_THEME_DIR.'images/uarrow3.gif';
+$WT_IMAGES['udarrow'] = WT_THEME_DIR.'images/udarrow.gif';
+$WT_IMAGES['vline'] = WT_THEME_DIR.'images/vline.gif';
+$WT_IMAGES['zoomin'] = WT_THEME_DIR.'images/zoomin.gif';
+$WT_IMAGES['zoomout'] = WT_THEME_DIR.'images/zoomout.gif';
+$WT_IMAGES['stop'] = WT_THEME_DIR.'images/stop.gif';
+$WT_IMAGES['pin-out'] = WT_THEME_DIR.'images/pin-out.png';
+$WT_IMAGES['pin-in'] = WT_THEME_DIR.'images/pin-in.png';
+$WT_IMAGES['default_image_M'] = WT_THEME_DIR.'images/silhouette_male.gif';
+$WT_IMAGES['default_image_F'] = WT_THEME_DIR.'images/silhouette_female.gif';
+$WT_IMAGES['default_image_U'] = WT_THEME_DIR.'images/silhouette_unknown.gif';
+$WT_IMAGES['slide_open'] = WT_THEME_DIR.'images/open.png';
+$WT_IMAGES['slide_close'] = WT_THEME_DIR.'images/close.png';
 
 // - lifespan chart arrows
-$WT_IMAGES['lsltarrow']['other'] = WT_THEME_DIR.'images/lsltarrow.gif';
-$WT_IMAGES['lsrtarrow']['other'] = WT_THEME_DIR.'images/lsrtarrow.gif';
-$WT_IMAGES['lsdnarrow']['other'] = WT_THEME_DIR.'images/lsdnarrow.gif';
-$WT_IMAGES['lsuparrow']['other'] = WT_THEME_DIR.'images/lsuparrow.gif';
+$WT_IMAGES['lsltarrow'] = WT_THEME_DIR.'images/lsltarrow.gif';
+$WT_IMAGES['lsrtarrow'] = WT_THEME_DIR.'images/lsrtarrow.gif';
+$WT_IMAGES['lsdnarrow'] = WT_THEME_DIR.'images/lsdnarrow.gif';
+$WT_IMAGES['lsuparrow'] = WT_THEME_DIR.'images/lsuparrow.gif';
 
 //-- Variables for the Fan chart
 $fanChart = array(