diff --git a/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_checkbox-cross.png b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_checkbox_cross.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/atlas/atlas_global_checkbox-cross.png
rename to binaries/data/mods/official/art/textures/ui/atlas/atlas_global_checkbox_cross.png
diff --git a/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_checkbox-tick.png b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_checkbox_tick.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/atlas/atlas_global_checkbox-tick.png
rename to binaries/data/mods/official/art/textures/ui/atlas/atlas_global_checkbox_tick.png
diff --git a/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_radiobutton-lit.png b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_radiobutton_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/atlas/atlas_global_radiobutton-lit.png
rename to binaries/data/mods/official/art/textures/ui/atlas/atlas_global_radiobutton_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_tab-lit.png b/binaries/data/mods/official/art/textures/ui/atlas/atlas_global_tab_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/atlas/atlas_global_tab-lit.png
rename to binaries/data/mods/official/art/textures/ui/atlas/atlas_global_tab_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/exit_button_16-over.png b/binaries/data/mods/official/art/textures/ui/exit_button_16_over.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/exit_button_16-over.png
rename to binaries/data/mods/official/art/textures/ui/exit_button_16_over.png
diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_0ad-icon.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_0ad_icon.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/global/ui_gen_0ad-icon.png
rename to binaries/data/mods/official/art/textures/ui/global/ui_gen_0ad_icon.png
diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_0ad-icon-black.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_0ad_icon_black.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/global/ui_gen_0ad-icon-black.png
rename to binaries/data/mods/official/art/textures/ui/global/ui_gen_0ad_icon_black.png
diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_border-bottom-20px.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_border_bottom_20px.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/global/ui_gen_border-bottom-20px.png
rename to binaries/data/mods/official/art/textures/ui/global/ui_gen_border_bottom_20px.png
diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_border-corner-15px.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_border_corner_15px.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/global/ui_gen_border-corner-15px.png
rename to binaries/data/mods/official/art/textures/ui/global/ui_gen_border_corner_15px.png
diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_border-left-20px.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_border_left_20px.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/global/ui_gen_border-left-20px.png
rename to binaries/data/mods/official/art/textures/ui/global/ui_gen_border_left_20px.png
diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_border-right-20px.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_border_right_20px.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/global/ui_gen_border-right-20px.png
rename to binaries/data/mods/official/art/textures/ui/global/ui_gen_border_right_20px.png
diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_border-top-20px.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_border_top_20px.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/global/ui_gen_border-top-20px.png
rename to binaries/data/mods/official/art/textures/ui/global/ui_gen_border_top_20px.png
diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_bullet-icon.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_bullet_icon.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/global/ui_gen_bullet-icon.png
rename to binaries/data/mods/official/art/textures/ui/global/ui_gen_bullet_icon.png
diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_button-wood.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_button_wood.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/global/ui_gen_button-wood.png
rename to binaries/data/mods/official/art/textures/ui/global/ui_gen_button_wood.png
diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_infinity-icon.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_infinity_icon.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/global/ui_gen_infinity-icon.png
rename to binaries/data/mods/official/art/textures/ui/global/ui_gen_infinity_icon.png
diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_titlebar-left.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_titlebar_left.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/global/ui_gen_titlebar-left.png
rename to binaries/data/mods/official/art/textures/ui/global/ui_gen_titlebar_left.png
diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_titlebar-middle.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_titlebar_middle.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/global/ui_gen_titlebar-middle.png
rename to binaries/data/mods/official/art/textures/ui/global/ui_gen_titlebar_middle.png
diff --git a/binaries/data/mods/official/art/textures/ui/global/ui_gen_titlebar-right.png b/binaries/data/mods/official/art/textures/ui/global/ui_gen_titlebar_right.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/global/ui_gen_titlebar-right.png
rename to binaries/data/mods/official/art/textures/ui/global/ui_gen_titlebar_right.png
diff --git a/binaries/data/mods/official/art/textures/ui/pregame/ui_pregame_mainmenu_background-lit.png b/binaries/data/mods/official/art/textures/ui/pregame/ui_pregame_mainmenu_background_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/pregame/ui_pregame_mainmenu_background-lit.png
rename to binaries/data/mods/official/art/textures/ui/pregame/ui_pregame_mainmenu_background_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom1-lit.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom1_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom1-lit.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom1_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom2-lit.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom2_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom2-lit.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom2_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom3-lit.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom3_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom3-lit.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom3_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom4-lit.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom4_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom4-lit.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segbottom4_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft1-lit.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft1_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft1-lit.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft1_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft2-lit.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft2_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft2-lit.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft2_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft3-lit.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft3_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft3-lit.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft3_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft4-lit.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft4_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft4-lit.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segleft4_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop1-lit.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop1_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop1-lit.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop1_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop2-lit.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop2_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop2-lit.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop2_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop3-lit.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop3_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop3-lit.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop3_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop4-lit.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop4_lit.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop4-lit.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_minimap_segtop4_lit.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_status_bg-bottom.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_status_bg_bottom.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_status_bg-bottom.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_status_bg_bottom.png
diff --git a/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_status_bg-top.png b/binaries/data/mods/official/art/textures/ui/session/ui_session_panel_status_bg_top.png
similarity index 100%
rename from binaries/data/mods/official/art/textures/ui/session/ui_session_panel_status_bg-top.png
rename to binaries/data/mods/official/art/textures/ui/session/ui_session_panel_status_bg_top.png
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Attack-Attackx.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Attack_Attackx.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Attack-Attackx.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Attack_Attackx.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Attack-Chargex.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Attack_Chargex.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Attack-Chargex.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Attack_Chargex.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Attack-Engagex.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Attack_Engagex.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Attack-Engagex.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Attack_Engagex.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Attack-ForMyFamily.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Attack_ForMyFamily.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Attack-ForMyFamily.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Attack_ForMyFamily.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Attack-Warcry.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Attack_Warcry.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Attack-Warcry.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Attack_Warcry.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Attack-ZeusSaviourandVictory.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Attack_ZeusSaviourandVictory.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Attack-ZeusSaviourandVictory.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Attack_ZeusSaviourandVictory.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Command-AsYouWish.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Command_AsYouWish.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Command-AsYouWish.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Command_AsYouWish.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Command-ByYourCommand.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Command_ByYourCommand.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Command-ByYourCommand.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Command_ByYourCommand.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Command-IObey.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Command_IObey.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Command-IObey.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Command_IObey.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Command-ImComing.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Command_ImComing.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Command-ImComing.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Command_ImComing.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Command-MyLiege.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Command_MyLiege.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Command-MyLiege.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Command_MyLiege.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Command-OnMyWay.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Command_OnMyWay.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Command-OnMyWay.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Command_OnMyWay.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Command-WithMyHonour.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Command_WithMyHonour.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Command-WithMyHonour.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Command_WithMyHonour.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Command-YesMyLord.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Command_YesMyLord.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Command-YesMyLord.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Command_YesMyLord.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Build.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Build.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Build.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Build.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Chop.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Chop.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Chop.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Chop.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Farm.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Farm.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Farm.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Farm.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Fish.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Fish.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Fish.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Fish.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Gather.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Gather.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Gather.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Gather.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Heal.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Heal.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Heal.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Heal.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Herd.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Herd.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Herd.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Herd.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Hunt.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Hunt.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Hunt.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Hunt.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Mine.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Mine.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Mine.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Mine.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Repair.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Repair.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Econ-Repair.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Econ_Repair.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Select-AtYourService.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Select_AtYourService.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Select-AtYourService.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Select_AtYourService.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Select-HowMayIServeYouq.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Select_HowMayIServeYouq.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Select-HowMayIServeYouq.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Select_HowMayIServeYouq.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Select-MyLiegeq.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Select_MyLiegeq.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Select-MyLiegeq.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Select_MyLiegeq.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Select-MyLordq.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Select_MyLordq.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Select-MyLordq.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Select_MyLordq.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Select-OrdersSireq.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Select_OrdersSireq.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Select-OrdersSireq.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Select_OrdersSireq.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Select-Ready.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Select_Ready.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Select-Ready.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Select_Ready.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Select-ReadySire.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Select_ReadySire.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Select-ReadySire.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Select_ReadySire.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Select-Yesq.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Select_Yesq.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Select-Yesq.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Select_Yesq.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Select-YourOrdersq.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Select_YourOrdersq.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Select-YourOrdersq.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Select_YourOrdersq.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Select-YourWishq.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Select_YourWishq.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Select-YourWishq.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Select_YourWishq.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Stance-Advancex.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Stance_Advancex.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Stance-Advancex.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Stance_Advancex.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Stance-Formationx.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Stance_Formationx.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Stance-Formationx.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Stance_Formationx.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Stance-HoldYourPosition.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Stance_HoldYourPosition.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Stance-HoldYourPosition.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Stance_HoldYourPosition.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Stance-March.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Stance_March.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Stance-March.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Stance_March.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Stance-Retreat.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Stance_Retreat.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Stance-Retreat.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Stance_Retreat.ogg
diff --git a/binaries/data/mods/official/audio/voice/hellenes/soldier/Stance-SurroundThem.ogg b/binaries/data/mods/official/audio/voice/hellenes/soldier/Stance_SurroundThem.ogg
similarity index 100%
rename from binaries/data/mods/official/audio/voice/hellenes/soldier/Stance-SurroundThem.ogg
rename to binaries/data/mods/official/audio/voice/hellenes/soldier/Stance_SurroundThem.ogg
diff --git a/binaries/data/mods/official/gui/gui.dtd b/binaries/data/mods/official/gui/gui.dtd
index 2d927c6439..b176b1746d 100755
--- a/binaries/data/mods/official/gui/gui.dtd
+++ b/binaries/data/mods/official/gui/gui.dtd
@@ -27,36 +27,36 @@
 <!-- Defaults are not put in here, because it ruins the concept of styles -->
 
 <!ENTITY % ex_settings
- "buffer-zone				CDATA #IMPLIED
+ "buffer_zone				CDATA #IMPLIED
   checked				%bool; #IMPLIED
   font					CDATA #IMPLIED
-  fov-wedge-color			CDATA #IMPLIED
+  fov_wedge_color			CDATA #IMPLIED
   hotkey				CDATA #IMPLIED
-  cell-id				CDATA #IMPLIED
-  input-initvalue-destroyed-at-focus	%bool; #IMPLIED
-  rectcolor-selected			CDATA #IMPLIED
+  cell_id				CDATA #IMPLIED
+  input_initvalue_destroyed_at_focus	%bool; #IMPLIED
+  rectcolor_selected			CDATA #IMPLIED
   scrollbar				%bool; #IMPLIED
-  scrollbar-style			CDATA #IMPLIED
+  scrollbar_style			CDATA #IMPLIED
   sprite				CDATA #IMPLIED
   sprite2				CDATA #IMPLIED
-  sprite-bar				CDATA #IMPLIED
-  sprite-background			CDATA #IMPLIED
-  sprite-disabled			CDATA #IMPLIED
-  sprite2-disabled			CDATA #IMPLIED
-  sprite-over				CDATA #IMPLIED
-  sprite2-over				CDATA #IMPLIED
-  sprite-pressed			CDATA #IMPLIED
-  sprite2-pressed			CDATA #IMPLIED
-  square-side				CDATA #IMPLIED
+  sprite_bar				CDATA #IMPLIED
+  sprite_background			CDATA #IMPLIED
+  sprite_disabled			CDATA #IMPLIED
+  sprite2_disabled			CDATA #IMPLIED
+  sprite_over				CDATA #IMPLIED
+  sprite2_over				CDATA #IMPLIED
+  sprite_pressed			CDATA #IMPLIED
+  sprite2_pressed			CDATA #IMPLIED
+  square_side				CDATA #IMPLIED
   textcolor				CDATA #IMPLIED
-  textcolor-disabled			CDATA #IMPLIED
-  textcolor-over			CDATA #IMPLIED
-  textcolor-pressed			CDATA #IMPLIED
-  textcolor-selected			CDATA #IMPLIED
-  text-align				%align; #IMPLIED
-  text-valign				%valign; #IMPLIED
+  textcolor_disabled			CDATA #IMPLIED
+  textcolor_over			CDATA #IMPLIED
+  textcolor_pressed			CDATA #IMPLIED
+  textcolor_selected			CDATA #IMPLIED
+  text_align				%align; #IMPLIED
+  text_valign				%valign; #IMPLIED
   tooltip				CDATA #IMPLIED
-  tooltip-style				CDATA #IMPLIED"
+  tooltip_style				CDATA #IMPLIED"
 >
 
 <!--
@@ -106,22 +106,22 @@
 <!ATTLIST scrollbar
   name					CDATA #REQUIRED
   width					CDATA #IMPLIED
-  scroll-wheel				%bool; #IMPLIED
+  scroll_wheel				%bool; #IMPLIED
   alwaysshown				%bool; #IMPLIED
-  scroll-speed				CDATA #IMPLIED
-  sprite-button-top			CDATA #IMPLIED
-  sprite-button-top-pressed		CDATA #IMPLIED
-  sprite-button-top-disabled		CDATA #IMPLIED
-  sprite-button-top-over		CDATA #IMPLIED
-  sprite-button-bottom			CDATA #IMPLIED
-  sprite-button-bottom-pressed		CDATA #IMPLIED
-  sprite-button-bottom-disabled		CDATA #IMPLIED
-  sprite-button-bottom-over		CDATA #IMPLIED
-  sprite-bar-vertical			CDATA #IMPLIED
-  sprite-bar-vertical-over		CDATA #IMPLIED
-  sprite-bar-vertical-pressed		CDATA #IMPLIED
-  sprite-back-vertical			CDATA #IMPLIED
-  minimum-bar-size			CDATA #IMPLIED
+  scroll_speed				CDATA #IMPLIED
+  sprite_button_top			CDATA #IMPLIED
+  sprite_button_top_pressed		CDATA #IMPLIED
+  sprite_button_top_disabled		CDATA #IMPLIED
+  sprite_button_top_over		CDATA #IMPLIED
+  sprite_button_bottom			CDATA #IMPLIED
+  sprite_button_bottom_pressed		CDATA #IMPLIED
+  sprite_button_bottom_disabled		CDATA #IMPLIED
+  sprite_button_bottom_over		CDATA #IMPLIED
+  sprite_bar_vertical			CDATA #IMPLIED
+  sprite_bar_vertical_over		CDATA #IMPLIED
+  sprite_bar_vertical_pressed		CDATA #IMPLIED
+  sprite_back_vertical			CDATA #IMPLIED
+  minimum_bar_size			CDATA #IMPLIED
 >
 
 <!--
@@ -131,7 +131,7 @@
   name					CDATA #REQUIRED
   texture				CDATA #REQUIRED
   size					CDATA #REQUIRED
-  cell-id				CDATA #IMPLIED
+  cell_id				CDATA #IMPLIED
 >
 
 <!--
@@ -141,14 +141,14 @@
   name					CDATA #REQUIRED
   sprite				CDATA #IMPLIED
   anchor				CDATA #IMPLIED
-  buffer-zone				CDATA #IMPLIED
+  buffer_zone				CDATA #IMPLIED
   font					CDATA #IMPLIED
   maxwidth				CDATA #IMPLIED
   offset				CDATA #IMPLIED
   textcolor				CDATA #IMPLIED
   delay					CDATA #IMPLIED
-  use-object				CDATA #IMPLIED
-  hide-object				CDATA #IMPLIED
+  use_object				CDATA #IMPLIED
+  hide_object				CDATA #IMPLIED
 >
 
 
@@ -167,17 +167,17 @@
 <!ATTLIST image
   texture				CDATA #IMPLIED
   size					CDATA #IMPLIED
-  texture-size				CDATA #IMPLIED
-  real-texture-placement		CDATA #IMPLIED
-  cell-size				CDATA #IMPLIED
+  texture_size				CDATA #IMPLIED
+  real_texture_placement		CDATA #IMPLIED
+  cell_size				CDATA #IMPLIED
   backcolor				CDATA #IMPLIED
   bordercolor				CDATA #IMPLIED
   border				%bool; #IMPLIED
-  z-level				CDATA #IMPLIED
+  z_level				CDATA #IMPLIED
 >
 
 <!ATTLIST effect
-  add-color				CDATA #IMPLIED
-  multiply-color			CDATA #IMPLIED
+  add_color				CDATA #IMPLIED
+  multiply_color			CDATA #IMPLIED
   grayscale				CDATA #IMPLIED
 >
diff --git a/binaries/data/mods/official/gui/test/2_mainmenu.xml b/binaries/data/mods/official/gui/test/2_mainmenu.xml
index 9931ee289c..1211f93956 100755
--- a/binaries/data/mods/official/gui/test/2_mainmenu.xml
+++ b/binaries/data/mods/official/gui/test/2_mainmenu.xml
@@ -17,43 +17,43 @@
 			curr_music.loop();
 		]]></action>
 
-		<object type="image" name="pregame-mainmenu-background-image" sprite="pregame-mainmenu-background" size="0 0 100% 100%" z="100" hidden="false" ghost="true"/>
+		<object type="image" name="pregame_mainmenu_background_image" sprite="pregame_mainmenu_background" size="0 0 100% 100%" z="100" hidden="false" ghost="true"/>
 
-		<object type="button" name="pregame-mainmenu-sp-button" sprite-over="pregame-mainmenu-spbt" size="52.9296875% 23.95833333% 67.578125% 42.317708333%" z="101" hidden="false"
-			tooltip-style="pregame-mainmenu-tooltip" tooltip="Want to move some Dudes around or test something? Click here to start a new game on the default map.">
+		<object type="button" name="pregame_mainmenu_sp_button" sprite_over="pregame_mainmenu_spbt" size="52.9296875% 23.95833333% 67.578125% 42.317708333%" z="101" hidden="false"
+			tooltip_style="pregame_mainmenu_tooltip" tooltip="Want to move some Dudes around or test something? Click here to start a new game on the default map.">
 			<action on="Press"><![CDATA[
 				GUIObjectUnhide("pregame_subwindow_bkg");
 				GUIObjectUnhide("pregame_sp_mapsel");
 			]]></action>
 		</object>
 
-		<object type="button" name="pregame-mainmenu-mp-button" sprite-over="pregame-mainmenu-mpbt" size="60.80% 48.50% 74.40% 66.55%" z="101" hidden="false"
-			tooltip-style="pregame-mainmenu-tooltip" tooltip="Tired of playing with yourself? Fight against one or more human players in a multiplayer game.">
+		<object type="button" name="pregame_mainmenu_mp_button" sprite_over="pregame_mainmenu_mpbt" size="60.80% 48.50% 74.40% 66.55%" z="101" hidden="false"
+			tooltip_style="pregame_mainmenu_tooltip" tooltip="Tired of playing with yourself? Fight against one or more human players in a multiplayer game.">
 			<action on="Press"><![CDATA[
 				getGUIObjectByName("pregame_subwindow_bkg").hidden = false;
 				getGUIObjectByName("pregame_mp_ip").hidden = false;
 			]]></action>
 		</object>
 
-		<object type="button" name="pregame-mainmenu-ed-button" sprite-over="pregame-mainmenu-edbt" size="44.00% 61.50% 63.75% 83.55%" z="101" hidden="false"
-			tooltip-style="pregame-mainmenu-tooltip" tooltip="Come forth and witness a totally non-functioning Editor, a mere shadow of its potential self!">
+		<object type="button" name="pregame_mainmenu_ed_button" sprite_over="pregame_mainmenu_edbt" size="44.00% 61.50% 63.75% 83.55%" z="101" hidden="false"
+			tooltip_style="pregame_mainmenu_tooltip" tooltip="Come forth and witness a totally non-functioning Editor, a mere shadow of its potential self!">
 			<action on="Press"><![CDATA[
 				GUIObjectHide("pregame_gui");
 				GUIObjectUnhide("atlas_gui");
 			]]></action>
 		</object>
 
-		<object type="image" name="pregame-mainmenu-0ad-logo" sprite="pregame-mainmenu-0ad-logo-480x218" size="21.1914062% 3.125% 68.0664062% 31.5104166%" z="102" hidden="false" ghost="true"/>
+		<object type="image" name="pregame_mainmenu_0ad_logo" sprite="pregame_mainmenu_0ad_logo_480x218" size="21.1914062% 3.125% 68.0664062% 31.5104166%" z="102" hidden="false" ghost="true"/>
 
-		<object type="text" name="pregame-mainmenu-versionnumber" size="43% 24% 43%+282 24%+25" z="103" textcolor="237 227 167" font="prospero16" hidden="false" ghost="true">
+		<object type="text" name="pregame_mainmenu_versionnumber" size="43% 24% 43%+282 24%+25" z="103" textcolor="237 227 167" font="prospero16" hidden="false" ghost="true">
 			{buildTime}
 			<action on="Load"><![CDATA[
 				this.caption = "Build: " + buildTime(0) + " " + getLanguageID();
 			]]></action>
 		</object>
 
-		<object type="button" name="pregame-mainmenu-wfg-logo" sprite="pregame-mainmenu-wfg-logo-256x64" size="10 91.666666%-30 25.9765% 100%-30" z="102" hidden="false"
-			tooltip-style="pregame-mainmenu-tooltip" tooltip="These are the guys who made this game. Visit them at http://www.wildfiregames.com/0ad/">
+		<object type="button" name="pregame_mainmenu_wfg_logo" sprite="pregame_mainmenu_wfg_logo_256x64" size="10 91.666666%-30 25.9765% 100%-30" z="102" hidden="false"
+			tooltip_style="pregame_mainmenu_tooltip" tooltip="These are the guys who made this game. Visit them at http://www.wildfiregames.com/0ad/">
 			<action on="Press"><![CDATA[
 				btCode = new Array("GUIObjectHide('mb_main');");
 				messageBox(420, 420, "[icon=0ad_icon] A.D. - History Is Yours For The Taking\nby Wildfire Games, 2002-2005\n\nVersion 0.1.2 (PASAP II)\n\n" +
@@ -62,10 +62,10 @@
 			]]></action>
 		</object>
 
-		<object type="text" name="pregame-mainmenu-tooltip" sprite="pregame-mainmenu-tooltip-background" size="69% 6.3802% 97.0703125% 28.125%" font="prospero16" textcolor="255 255 255" z="104" hidden="true" ghost="true">tooltipText</object>
+		<object type="text" name="pregame_mainmenu_tooltip" sprite="pregame_mainmenu_tooltip_background" size="69% 6.3802% 97.0703125% 28.125%" font="prospero16" textcolor="255 255 255" z="104" hidden="true" ghost="true">tooltipText</object>
 
-		<object type="button" name="exit_button" sprite="exit_sprite" sprite-over="exit_sprite-over" size="100%-18 2 100%-2 18" z="104" hidden="false"
-			tooltip-style="pregame-mainmenu-tooltip" tooltip="Tired of 0 A.D. ? Click here to leave and reenter the real world.">
+		<object type="button" name="exit_button" sprite="exit_sprite" sprite_over="exit_sprite_over" size="100%-18 2 100%-2 18" z="104" hidden="false"
+			tooltip_style="pregame_mainmenu_tooltip" tooltip="Tired of 0 A.D. ? Click here to leave and reenter the real world.">
 			<action on="Press"><![CDATA[
 				btCaptions = new Array("Yes, let me out!", "Nooooo!");
 				btCode = new Array("exit();", "");
@@ -76,21 +76,21 @@
 
 	<object type="empty" name="pregame_subwindows" size="0 0 100% 100%" z="1" hidden="false">
 
-		<object type="image" name="pregame_subwindow_bkg" sprite="translucent-background" size="0 0 100% 100%" z="105" hidden="true"/>
+		<object type="image" name="pregame_subwindow_bkg" sprite="translucent_background" size="0 0 100% 100%" z="105" hidden="true"/>
 
 			<object type="button" name="pregame_mp_ip" sprite="0ad_window" z="106" hidden="true">
 				<action on="Load"><![CDATA[
 					setSizeCoord("pregame_mp_ip", crd_pregame_iphost_bkg_x, crd_pregame_iphost_bkg_y, crd_pregame_iphost_bkg_x+crd_pregame_iphost_bkg_width, crd_pregame_iphost_bkg_y+crd_pregame_iphost_bkg_height, mid_screen, mid_screen, mid_screen, mid_screen);
 				]]></action>
 
-			<object type="button" name="pregame_ip_host_titlebar" sprite="0ad_window_title" font="prospero18" z="165" text-align="center" text-valign="center">
+			<object type="button" name="pregame_ip_host_titlebar" sprite="0ad_window_title" font="prospero18" z="165" text_align="center" text_valign="center">
 						<action on="Load"><![CDATA[
 							getGUIObjectByName("pregame_ip_host_titlebar").caption = "Direct IP Connect";
 							setSizeCoord("pregame_ip_host_titlebar", crd_pregame_iphost_titlebar_x, crd_pregame_iphost_titlebar_y, crd_pregame_iphost_titlebar_x+crd_pregame_iphost_titlebar_width, crd_pregame_iphost_titlebar_y+crd_pregame_iphost_titlebar_height, mid_screen, mid_screen, mid_screen, mid_screen);
 						]]></action>
 			</object>
 
-			<object type="button" name="pregame_ip_host_exit_button" sprite="exit_sprite" sprite-over="exit_sprite-over">
+			<object type="button" name="pregame_ip_host_exit_button" sprite="exit_sprite" sprite_over="exit_sprite_over">
 				<action on="Load"><![CDATA[
 					setSizeCoord("pregame_ip_host_exit_button", crd_pregame_iphost_exit_button_x, crd_pregame_iphost_exit_button_y, crd_pregame_iphost_exit_button_x+crd_pregame_iphost_exit_button_width, crd_pregame_iphost_exit_button_y+crd_pregame_iphost_exit_button_height, mid_screen, mid_screen, mid_screen, mid_screen);
 				]]></action>
@@ -107,7 +107,7 @@
 				]]></action>
 			</object>
 
-                        <object type="image" name="pregame_mp_ip_divider1" sprite="only-black-border">
+                        <object type="image" name="pregame_mp_ip_divider1" sprite="only_black_border">
                         <action on="Load"><![CDATA[
                                 setSizeCoord("pregame_mp_ip_divider1", -230, -130, 230, -130, mid_screen, mid_screen, mid_screen, mid_screen);
                         ]]></action>
@@ -118,13 +118,13 @@
                                 Player Name (temporary):
                         </object>
                         
-                        <object type="input" name="pregame_mp_ip_playername" sprite="only-black" absolute="false" size="220 80 350 100" textcolor="0 0 0">
+                        <object type="input" name="pregame_mp_ip_playername" sprite="only_black" absolute="false" size="220 80 350 100" textcolor="0 0 0">
                                 Player
                         </object>
                         <!-- END PLAYER NAME controls -->
 
                         <!-- HOST GAME controls -->
-                        <object type="image" name="pregame_mp_ip_divider2" sprite="only-black-border">
+                        <object type="image" name="pregame_mp_ip_divider2" sprite="only_black_border">
                         <action on="Load"><![CDATA[
                                 setSizeCoord("pregame_mp_ip_divider2", -230, -75, 230, -75, mid_screen, mid_screen, mid_screen, mid_screen);
                         ]]></action>
@@ -134,11 +134,11 @@
                                 Map Name:
                         </object>
 
-                        <object type="input" name="pregame_mp_ip_host_mapname" sprite="only-black" absolute="false" size="50 150 200 170" textcolor="0 0 0">
+                        <object type="input" name="pregame_mp_ip_host_mapname" sprite="only_black" absolute="false" size="50 150 200 170" textcolor="0 0 0">
                                 test01
                         </object>
 
-                        <object type="button" name="pregame_mp_ip_host_bt" sprite="message_box-button-normal" sprite-over="message_box-button-over" text-align="center" text-valign="center">
+                        <object type="button" name="pregame_mp_ip_host_bt" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center">
                                 Host Game
                                 <action on="Load"><![CDATA[
                                         setSizeCoord("pregame_mp_ip_host_bt", 50, -60, 150, -30, mid_screen, mid_screen, mid_screen, mid_screen);
@@ -150,7 +150,7 @@
                         <!-- END HOST GAME controls -->
                         
                         <!-- JOIN GAME controls -->
-                        <object type="image" name="pregame_mp_ip_divider3" sprite="only-black-border">
+                        <object type="image" name="pregame_mp_ip_divider3" sprite="only_black_border">
                                 <action on="Load"><![CDATA[
                                         setSizeCoord("pregame_mp_ip_divider3", -230, -20, 230, -20, mid_screen, mid_screen, mid_screen, mid_screen);
                                 ]]></action>
@@ -160,11 +160,11 @@
                                 IP address:
                         </object>
 
-                        <object type="input" name="pregame_mp_ip_joinip" sprite="only-black" absolute="false" size="50 210 200 230" textcolor="0 0 0">
+                        <object type="input" name="pregame_mp_ip_joinip" sprite="only_black" absolute="false" size="50 210 200 230" textcolor="0 0 0">
                                 127.0.0.1
                         </object>
 
-                        <object type="button" name="pregame_mp_ip_join_bt" sprite="message_box-button-normal" sprite-over="message_box-button-over" text-align="center" text-valign="center">
+                        <object type="button" name="pregame_mp_ip_join_bt" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center">
                                 Join Game
                                 <action on="Load"><![CDATA[
                                         setSizeCoord("pregame_mp_ip_join_bt", 50, 0, 150, 30, mid_screen, mid_screen, mid_screen, mid_screen);
@@ -181,7 +181,7 @@
                 <object type="button" name="pregame_sp_mapsel" sprite="0ad_window" z="106" hidden="true" size="50%-150 50%-90 50%+150 50%+90">
 
                         <!-- The placement of this titlebar object is VERY hackish (see y-placement), but it doesn't work any other way so far, and this dialog will be temporary anyway -->
-                        <object type="button" name="pregame_sp_mapsel_titlebar" sprite="0ad_window_title" font="prospero18" z="165" text-align="center" text-valign="center" absolute="false" size="50%-130 0%-22 50%+130 0%-14">
+                        <object type="button" name="pregame_sp_mapsel_titlebar" sprite="0ad_window_title" font="prospero18" z="165" text_align="center" text_valign="center" absolute="false" size="50%-130 0%-22 50%+130 0%-14">
                                 Map selection
                         </object>
 
@@ -193,11 +193,11 @@
                                 Map Name:
                         </object>
 
-                        <object type="input" name="pregame_sp_mapname" sprite="only-black" absolute="false" size="130 90 290 110" textcolor="255 255 255">
+                        <object type="input" name="pregame_sp_mapname" sprite="only_black" absolute="false" size="130 90 290 110" textcolor="255 255 255">
                                 test01.pmp
                         </object>
 
-                        <object type="button" name="pregame_sp_start_bt" sprite="message_box-button-normal" sprite-over="message_box-button-over" text-align="center" text-valign="center" absolute="false" size="50%-100 100%-50 50%-10 100%-20">
+                        <object type="button" name="pregame_sp_start_bt" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center" absolute="false" size="50%-100 100%-50 50%-10 100%-20">
                                 Start Game
                                 <action on="Press"><![CDATA[
                                         // Check wheter we have a correct file extension, to avoid crashes
@@ -218,7 +218,7 @@
                                 ]]></action>
                         </object>
 
-                        <object type="button" name="pregame_sp_mapsel_abort_button" sprite="message_box-button-normal" sprite-over="message_box-button-over" text-align="center" text-valign="center" absolute="false" size="50%+10 100%-50 50%+90 100%-20">
+                        <object type="button" name="pregame_sp_mapsel_abort_button" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center" absolute="false" size="50%+10 100%-50 50%+90 100%-20">
                                 Abort
                                 <action on="Press"><![CDATA[
                                         GUIObjectHide("pregame_subwindow_bkg");
diff --git a/binaries/data/mods/official/gui/test/3_loading.xml b/binaries/data/mods/official/gui/test/3_loading.xml
index 042b4a5e64..9302d6da0b 100644
--- a/binaries/data/mods/official/gui/test/3_loading.xml
+++ b/binaries/data/mods/official/gui/test/3_loading.xml
@@ -13,36 +13,36 @@
 	<object type="empty" name="loading_screen" size="0 0 100% 100%" z="1" ghost="true" hidden="true">
                 <!-- background -->
 		<object type="image" name="loading_screen_background_black" sprite="black_bkg" size="0 0 100% 10" z="99" hidden="false" />
-		<object type="image" name="loading_screen_background_image" sprite="message_box-gen-background" size="0 10 100% 100%" z="100" hidden="false" />
+		<object type="image" name="loading_screen_background_image" sprite="message_box_gen_background" size="0 10 100% 100%" z="100" hidden="false" />
 
                 <!-- top -->
-		<object type="image" name="loading_screen_border-corner-lt" size="0 10 15 25" sprite="message_box-corner" absolute="false" z="161"  hidden="false"/>
-		<object type="image" name="loading_screen_border-top" size="15 10 100%-15 42" sprite="message_box-border-top" absolute="false" z="161"  hidden="false"/>
-		<object type="image" name="loading_screen_border-corner-rt" size="100%-15 10 100% 25" sprite="message_box-corner" absolute="false" z="161"  hidden="false"/>
+		<object type="image" name="loading_screen_border_corner_lt" size="0 10 15 25" sprite="message_box_corner" absolute="false" z="161"  hidden="false"/>
+		<object type="image" name="loading_screen_border_top" size="15 10 100%-15 42" sprite="message_box_border_top" absolute="false" z="161"  hidden="false"/>
+		<object type="image" name="loading_screen_border_corner_rt" size="100%-15 10 100% 25" sprite="message_box_corner" absolute="false" z="161"  hidden="false"/>
 
 		<!-- left/right -->
-		<object type="image" name="loading_screen_border-left" size="0 25 20 100%-15" sprite="message_box-border-left" absolute="false" z="162"  hidden="false"/>
-		<object type="image" name="loading_screen_border-right" size="100%-32 25 100% 100%-15" sprite="message_box-border-right" absolute="false" z="161"  hidden="false"/>
+		<object type="image" name="loading_screen_border_left" size="0 25 20 100%-15" sprite="message_box_border_left" absolute="false" z="162"  hidden="false"/>
+		<object type="image" name="loading_screen_border_right" size="100%-32 25 100% 100%-15" sprite="message_box_border_right" absolute="false" z="161"  hidden="false"/>
                         
 		<!-- bottom -->
-		<object type="image" name="loading_screen_border-corner-lb" size="0 100%-15 15 100%" sprite="message_box-corner" absolute="false" z="161" hidden="false"/>
-		<object type="image" name="loading_screen_border-bottom" size="15 100%-32 100%-15 100%" sprite="message_box-border-bottom" absolute="false" z="162" hidden="false"/>
-		<object type="image" name="loading_screen_border-corner-rb" size="100%-15 100%-15 100% 100%" sprite="message_box-corner" absolute="false" z="161" hidden="false"/>
+		<object type="image" name="loading_screen_border_corner_lb" size="0 100%-15 15 100%" sprite="message_box_corner" absolute="false" z="161" hidden="false"/>
+		<object type="image" name="loading_screen_border_bottom" size="15 100%-32 100%-15 100%" sprite="message_box_border_bottom" absolute="false" z="162" hidden="false"/>
+		<object type="image" name="loading_screen_border_corner_rb" size="100%-15 100%-15 100% 100%" sprite="message_box_corner" absolute="false" z="161" hidden="false"/>
                         
 		<!-- titlebar -->
-		<object type="image" name="loading_screen_titlebar-left" size="15% 0 15%+64 32" sprite="message_box-titlebar-left" absolute="false" z="164" hidden="false"/>
-		<object type="image" name="loading_screen_titlebar-middle" size="15%+64 0 85%-64 32" sprite="message_box-titlebar-middle" absolute="false" z="164" hidden="false"/>
-		<object type="image" name="loading_screen_titlebar-right" size="85%-64 0 85% 32" sprite="message_box-titlebar-right" absolute="false" z="164" hidden="false"/>
-		<object type="button" name="loading_screen_titlebar-text" size="15%+54 4 85%-54 32" absolute="false" font="prospero18" z="165" text-align="center" text-valign="center" hidden="false"/>
+		<object type="image" name="loading_screen_titlebar_left" size="15% 0 15%+64 32" sprite="message_box_titlebar_left" absolute="false" z="164" hidden="false"/>
+		<object type="image" name="loading_screen_titlebar_middle" size="15%+64 0 85%-64 32" sprite="message_box_titlebar_middle" absolute="false" z="164" hidden="false"/>
+		<object type="image" name="loading_screen_titlebar_right" size="85%-64 0 85% 32" sprite="message_box_titlebar_right" absolute="false" z="164" hidden="false"/>
+		<object type="button" name="loading_screen_titlebar_text" size="15%+54 4 85%-54 32" absolute="false" font="prospero18" z="165" text_align="center" text_valign="center" hidden="false"/>
 
 		<!-- progress bar -->
-		<object type="button" name="loading_screen_progress_bar_text" size="0%+32 100%-205 100%-32 100%-185" font="tahoma14" textcolor="0 0 0" text-align="center" text-valign="center" z="165" hidden="false"/>
+		<object type="button" name="loading_screen_progress_bar_text" size="0%+32 100%-205 100%-32 100%-185" font="tahoma14" textcolor="0 0 0" text_align="center" text_valign="center" z="165" hidden="false"/>
 		<object type="progressbar" name="loading_screen_progress_bar" style="blue_bar_outlined" size="0%+32 100%-185 100%-32 100%-160" z="165" hidden="false"/>
                         
 		<!-- text -->
 		<object type="text" name="loading_screen_text" size="32 40 100%-32 100%-100" absolute="false" font="prospero18" z="165" hidden="false"/>
 
-		<object type="button" name="loading_screen_tip" sprite="only-white-border" size="32 100%-150 100%-32 100%-32" font="tahoma18" text-valign="center" textcolor="0 0 0" z="165" hidden="false"/>
+		<object type="button" name="loading_screen_tip" sprite="only_white_border" size="32 100%-150 100%-32 100%-32" font="tahoma18" text_valign="center" textcolor="0 0 0" z="165" hidden="false"/>
 	</object>
 
 </objects>
diff --git a/binaries/data/mods/official/gui/test/4_session.xml b/binaries/data/mods/official/gui/test/4_session.xml
index 51f73dfaa1..62528429f9 100644
--- a/binaries/data/mods/official/gui/test/4_session.xml
+++ b/binaries/data/mods/official/gui/test/4_session.xml
@@ -621,7 +621,7 @@
 			</object>
 
 			<!-- PLAYER / CIV NAME HEADING -->
-			<object type="button" name="session_panel_status_heading" font="verdana10" textcolor="200 200 200" text-align="center" ghost="true" z="70" hidden="false">
+			<object type="button" name="session_panel_status_heading" font="verdana10" textcolor="200 200 200" text_align="center" ghost="true" z="70" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_heading_x, crd_status_orb_heading_y, crd_status_orb_heading_x+crd_status_orb_heading_width, crd_status_orb_heading_y+crd_status_orb_heading_height, left_screen, top_screen, left_screen, top_screen,
@@ -648,7 +648,7 @@
 			</object>
 
 			<!-- HITPOINTS BAR -->
-			<object type="progressbar" name="session_panel_status_icon_hp_bar" style="group_portrait_bar" sprite-background="back-bar" ghost="true" z="70" hidden="false">
+			<object type="progressbar" name="session_panel_status_icon_hp_bar" style="group_portrait_bar" sprite_background="back_bar" ghost="true" z="70" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_hpbar_x, crd_status_orb_hpbar_y, crd_status_orb_hpbar_x+crd_status_orb_hpbar_width, crd_status_orb_hpbar_y+crd_status_orb_hpbar_height, left_screen, top_screen, left_screen, top_screen,
@@ -657,7 +657,7 @@
 			</object>
 
 			<!-- HITPOINTS TEXT -->
-			<object type="button" name="session_panel_status_icon_hp_text" font="verdana10" textcolor="0 255 0" text-align="left" text-valign="center" ghost="true" z="70" hidden="false">
+			<object type="button" name="session_panel_status_icon_hp_text" font="verdana10" textcolor="0 255 0" text_align="left" text_valign="center" ghost="true" z="70" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_hpbar_text_x, crd_status_orb_hpbar_text_y, crd_status_orb_hpbar_text_x+crd_status_orb_hpbar_text_width, crd_status_orb_hpbar_text_y+crd_status_orb_hpbar_text_height, left_screen, top_screen, left_screen, top_screen,
@@ -666,7 +666,7 @@
 			</object>
 
 			<!-- EXPERIENCE BAR -->
-			<object type="progressbar" name="session_panel_status_icon_xp_bar" style="up_bar" sprite-background="back-bar" ghost="true" z="70" hidden="false">
+			<object type="progressbar" name="session_panel_status_icon_xp_bar" style="up_bar" sprite_background="back_bar" ghost="true" z="70" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_xpbar_x, crd_status_orb_xpbar_y, crd_status_orb_xpbar_x+crd_status_orb_xpbar_width, crd_status_orb_xpbar_y+crd_status_orb_xpbar_height, left_screen, top_screen, left_screen, top_screen,
@@ -675,7 +675,7 @@
 			</object>
 
 			<!-- EXPERIENCE TEXT -->
-			<object type="button" name="session_panel_status_icon_xp_text" font="verdana10" textcolor="255 255 0" text-align="left" text-valign="center" ghost="true" z="70" hidden="false">
+			<object type="button" name="session_panel_status_icon_xp_text" font="verdana10" textcolor="255 255 0" text_align="left" text_valign="center" ghost="true" z="70" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_xpbar_text_x, crd_status_orb_xpbar_text_y, crd_status_orb_xpbar_text_x+crd_status_orb_xpbar_text_width, crd_status_orb_xpbar_text_y+crd_status_orb_xpbar_text_height, left_screen, top_screen, left_screen, top_screen,
@@ -693,7 +693,7 @@
 			</object>
 
 			<!-- GARRISON/SUPPLY COUNTER -->
-			<object type="button" name="session_panel_status_stat1" font="verdana11" textcolor="255 255 255" text-align="center" text-valign="bottom" ghost="true" z="70" hidden="false">
+			<object type="button" name="session_panel_status_stat1" font="verdana11" textcolor="255 255 255" text_align="center" text_valign="bottom" ghost="true" z="70" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_status_orb_stat1_x, crd_status_orb_stat1_y, crd_status_orb_stat1_x+crd_status_orb_stat1_width, crd_status_orb_stat1_y+crd_status_orb_stat1_height, left_screen, top_screen, left_screen, top_screen,
@@ -1418,28 +1418,28 @@
 				]]></action>
 			</object>
 
-			<object type="button" name="session_panel_minimap_segleft1" sprite="session_panel_minimap_segleft1" sprite-over="session_panel_minimap_segleft1-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segleft1" sprite="session_panel_minimap_segleft1" sprite_over="session_panel_minimap_segleft1_lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segleft1_x, crd_map_orb_segleft1_y, crd_map_orb_segleft1_x+crd_map_orb_segleft1_width, crd_map_orb_segleft1_y+crd_map_orb_segleft1_height, right_screen, top_screen, right_screen, top_screen,
 					crd_map_orb_segleft1_x, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft1_y, crd_map_orb_segleft1_x+crd_map_orb_segleft1_width, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft1_y+crd_map_orb_segleft1_height, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_panel_minimap_segleft2" sprite="session_panel_minimap_segleft2" sprite-over="session_panel_minimap_segleft2-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segleft2" sprite="session_panel_minimap_segleft2" sprite_over="session_panel_minimap_segleft2_lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segleft2_x, crd_map_orb_segleft2_y, crd_map_orb_segleft2_x+crd_map_orb_segleft2_width, crd_map_orb_segleft2_y+crd_map_orb_segleft2_height, right_screen, top_screen, right_screen, top_screen,
 					crd_map_orb_segleft2_x, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft2_y, crd_map_orb_segleft2_x+crd_map_orb_segleft2_width, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft2_y+crd_map_orb_segleft2_height, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_panel_minimap_segleft3" sprite="session_panel_minimap_segleft3" sprite-over="session_panel_minimap_segleft3-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segleft3" sprite="session_panel_minimap_segleft3" sprite_over="session_panel_minimap_segleft3_lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segleft3_x, crd_map_orb_segleft3_y, crd_map_orb_segleft3_x+crd_map_orb_segleft3_width, crd_map_orb_segleft3_y+crd_map_orb_segleft3_height, right_screen, top_screen, right_screen, top_screen,
 					crd_map_orb_segleft3_x, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft3_y, crd_map_orb_segleft3_x+crd_map_orb_segleft3_width, -crd_map_orb_minimap_y-crd_map_orb_minimap_height+crd_map_orb_segleft3_y+crd_map_orb_segleft3_height, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_panel_minimap_segleft4" hotkey="menu.game" sprite="session_panel_minimap_segleft4" sprite-over="session_panel_minimap_segleft4-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segleft4" hotkey="menu.game" sprite="session_panel_minimap_segleft4" sprite_over="session_panel_minimap_segleft4_lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segleft4_x, crd_map_orb_segleft4_y, crd_map_orb_segleft4_x+crd_map_orb_segleft4_width, crd_map_orb_segleft4_y+crd_map_orb_segleft4_height, right_screen, top_screen, right_screen, top_screen,
@@ -1450,28 +1450,28 @@
 				]]></action>
 			</object>
 
-			<object type="button" name="session_panel_minimap_segbottom1" sprite="session_panel_minimap_segbottom1" sprite-over="session_panel_minimap_segbottom1-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segbottom1" sprite="session_panel_minimap_segbottom1" sprite_over="session_panel_minimap_segbottom1_lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segbottom1_x, crd_map_orb_segbottom1_y, crd_map_orb_segbottom1_x+crd_map_orb_segbottom1_width, crd_map_orb_segbottom1_y+crd_map_orb_segbottom1_height, right_screen, top_screen, right_screen, top_screen,
 					crd_map_orb_segbottom1_x, -crd_map_orb_minimap_y-crd_map_orb_segbottom1_y-crd_map_orb_segbottom1_height, crd_map_orb_segbottom1_x+crd_map_orb_segbottom1_width, -crd_map_orb_minimap_y-crd_map_orb_segbottom1_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_panel_minimap_segbottom2" sprite="session_panel_minimap_segbottom2" sprite-over="session_panel_minimap_segbottom2-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segbottom2" sprite="session_panel_minimap_segbottom2" sprite_over="session_panel_minimap_segbottom2_lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segbottom2_x, crd_map_orb_segbottom2_y, crd_map_orb_segbottom2_x+crd_map_orb_segbottom2_width, crd_map_orb_segbottom2_y+crd_map_orb_segbottom2_height, right_screen, top_screen, right_screen, top_screen,
 					crd_map_orb_segbottom2_x, -crd_map_orb_minimap_y-crd_map_orb_segbottom2_y-crd_map_orb_segbottom2_height, crd_map_orb_segbottom2_x+crd_map_orb_segbottom2_width, -crd_map_orb_minimap_y-crd_map_orb_segbottom2_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_panel_minimap_segbottom3" sprite="session_panel_minimap_segbottom3" sprite-over="session_panel_minimap_segbottom3-lit" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segbottom3" sprite="session_panel_minimap_segbottom3" sprite_over="session_panel_minimap_segbottom3_lit" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segbottom3_x, crd_map_orb_segbottom3_y, crd_map_orb_segbottom3_x+crd_map_orb_segbottom3_width, crd_map_orb_segbottom3_y+crd_map_orb_segbottom3_height, right_screen, top_screen, right_screen, top_screen,
 					crd_map_orb_segbottom3_x, -crd_map_orb_minimap_y-crd_map_orb_segbottom3_y-crd_map_orb_segbottom3_height, crd_map_orb_segbottom3_x+crd_map_orb_segbottom3_width, -crd_map_orb_minimap_y-crd_map_orb_segbottom3_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_panel_minimap_segbottom4" sprite="session_panel_minimap_segbottom4" sprite-over="session_panel_minimap_segbottom4-lit" hotkey="menu.game" z="60" hidden="false">
+			<object type="button" name="session_panel_minimap_segbottom4" sprite="session_panel_minimap_segbottom4" sprite_over="session_panel_minimap_segbottom4_lit" hotkey="menu.game" z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_map_orb_segbottom4_x, crd_map_orb_segbottom4_y, crd_map_orb_segbottom4_x+crd_map_orb_segbottom4_width, crd_map_orb_segbottom4_y+crd_map_orb_segbottom4_height, right_screen, top_screen, right_screen, top_screen,
@@ -1488,63 +1488,63 @@
 				GUIObjectToggle("session_team_tray");
 			]]></action>
 
-			<object type="button" name="session_team_tray_1" style="action" text-align="left" z="70">1
+			<object type="button" name="session_team_tray_1" style="action" text_align="left" z="70">1
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_1_x, crd_team_tray_1_y, crd_team_tray_1_x+crd_team_tray_1_width, crd_team_tray_1_y+crd_team_tray_1_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_1_x, -crd_team_tray_1_y-crd_team_tray_1_height, crd_team_tray_1_x+crd_team_tray_1_width, -crd_team_tray_1_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_team_tray_2" style="action" text-align="left" z="70">2
+			<object type="button" name="session_team_tray_2" style="action" text_align="left" z="70">2
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_2_x, crd_team_tray_2_y, crd_team_tray_2_x+crd_team_tray_2_width, crd_team_tray_2_y+crd_team_tray_2_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_2_x, -crd_team_tray_2_y-crd_team_tray_2_height, crd_team_tray_2_x+crd_team_tray_2_width, -crd_team_tray_2_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_team_tray_3" style="action" text-align="left" z="70">3
+			<object type="button" name="session_team_tray_3" style="action" text_align="left" z="70">3
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_3_x, crd_team_tray_3_y, crd_team_tray_3_x+crd_team_tray_3_width, crd_team_tray_3_y+crd_team_tray_3_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_3_x, -crd_team_tray_3_y-crd_team_tray_3_height, crd_team_tray_3_x+crd_team_tray_3_width, -crd_team_tray_3_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_team_tray_4" style="action" text-align="left" z="70">4
+			<object type="button" name="session_team_tray_4" style="action" text_align="left" z="70">4
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_4_x, crd_team_tray_4_y, crd_team_tray_4_x+crd_team_tray_4_width, crd_team_tray_4_y+crd_team_tray_4_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_4_x, -crd_team_tray_4_y-crd_team_tray_4_height, crd_team_tray_4_x+crd_team_tray_4_width, -crd_team_tray_4_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_team_tray_5" style="action" text-align="left" z="70">5
+			<object type="button" name="session_team_tray_5" style="action" text_align="left" z="70">5
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_5_x, crd_team_tray_5_y, crd_team_tray_5_x+crd_team_tray_5_width, crd_team_tray_5_y+crd_team_tray_5_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_5_x, -crd_team_tray_5_y-crd_team_tray_5_height, crd_team_tray_5_x+crd_team_tray_5_width, -crd_team_tray_5_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_team_tray_6" style="action" text-align="left" z="70">6
+			<object type="button" name="session_team_tray_6" style="action" text_align="left" z="70">6
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_6_x, crd_team_tray_6_y, crd_team_tray_6_x+crd_team_tray_6_width, crd_team_tray_6_y+crd_team_tray_6_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_6_x, -crd_team_tray_6_y-crd_team_tray_6_height, crd_team_tray_6_x+crd_team_tray_6_width, -crd_team_tray_6_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_team_tray_7" style="action" text-align="left" z="70">7
+			<object type="button" name="session_team_tray_7" style="action" text_align="left" z="70">7
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_7_x, crd_team_tray_7_y, crd_team_tray_7_x+crd_team_tray_7_width, crd_team_tray_7_y+crd_team_tray_7_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_7_x, -crd_team_tray_7_y-crd_team_tray_7_height, crd_team_tray_7_x+crd_team_tray_7_width, -crd_team_tray_7_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_team_tray_8" style="action" text-align="left" z="70">8
+			<object type="button" name="session_team_tray_8" style="action" text_align="left" z="70">8
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_8_x, crd_team_tray_8_y, crd_team_tray_8_x+crd_team_tray_8_width, crd_team_tray_8_y+crd_team_tray_8_height, right_screen, top_screen, right_screen, top_screen,
 					crd_team_tray_8_x, -crd_team_tray_8_y-crd_team_tray_8_height, crd_team_tray_8_x+crd_team_tray_8_width, -crd_team_tray_8_y, right_screen, bottom_screen, right_screen, bottom_screen);
 				]]></action>
 			</object>
-			<object type="button" name="session_team_tray_9" style="action" text-align="left" z="70">9
+			<object type="button" name="session_team_tray_9" style="action" text_align="left" z="70">9
 				<action on="Load"><![CDATA[
 					AddSizeCoord(this.name,
 					crd_team_tray_9_x, crd_team_tray_9_y, crd_team_tray_9_x+crd_team_tray_9_width, crd_team_tray_9_y+crd_team_tray_9_height, right_screen, top_screen, right_screen, top_screen,
@@ -1585,7 +1585,7 @@
 				</object>
 
 				<!-- End Game button -->
-				<object type="button" name="subwindow_ingame_menu_End_Game_Button" sprite="message_box-button-normal" sprite-over="message_box-button-over" hotkey="endgame" text-align="center" text-valign="center" z="170" hidden="false">
+				<object type="button" name="subwindow_ingame_menu_End_Game_Button" sprite="message_box_button_normal" sprite_over="message_box_button_over" hotkey="endgame" text_align="center" text_valign="center" z="170" hidden="false">
 					<action on="Load"><![CDATA[
 						this.caption = "Resign Game";
 						AddSizeCoord(this.name,
@@ -1601,7 +1601,7 @@
 				</object>
 
 				<!-- Exit button -->
-				<object type="button" name="subwindow_ingame_menu_Exit_Button" sprite="message_box-button-normal" sprite-over="message_box-button-over" text-align="center" text-valign="center" z="170" hidden="false">
+				<object type="button" name="subwindow_ingame_menu_Exit_Button" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center" z="170" hidden="false">
 					<action on="Load"><![CDATA[
 						this.caption = "Exit Game";
 						AddSizeCoord(this.name,
@@ -1616,7 +1616,7 @@
 				</object>
 
 				<!-- Return button -->
-				<object type="button" name="subwindow_ingame_menu_Return_Button" sprite="message_box-button-normal" sprite-over="message_box-button-over" text-align="center" text-valign="center" z="170" hidden="false">
+				<object type="button" name="subwindow_ingame_menu_Return_Button" sprite="message_box_button_normal" sprite_over="message_box_button_over" text_align="center" text_valign="center" z="170" hidden="false">
 					<action on="Load"><![CDATA[
 						this.caption = "Return to Game";
 						AddSizeCoord(this.name,
diff --git a/binaries/data/mods/official/gui/test/5_manual.xml b/binaries/data/mods/official/gui/test/5_manual.xml
index a86cf0ac81..d91e504b89 100644
--- a/binaries/data/mods/official/gui/test/5_manual.xml
+++ b/binaries/data/mods/official/gui/test/5_manual.xml
@@ -20,7 +20,7 @@
 			}
 		]]></action>
 
-        	<object type="text" name="manual_bkg" sprite="translucent-background" size="50%-200 0%+50 50%+200 100%-50" font="prospero16" textcolor="255 255 255" z="100" hidden="false" ghost="true">
+        	<object type="text" name="manual_bkg" sprite="translucent_background" size="50%-200 0%+50 50%+200 100%-50" font="prospero16" textcolor="255 255 255" z="100" hidden="false" ghost="true">
 			<action on="Tick"><![CDATA[
 				if (selection.length && !( getGUIObjectByName( "manual_gui" ).hidden ))
 				{
@@ -31,13 +31,13 @@
 
    	    	<object type="button" name="manual_portrait" style="portrait" size="50%-192 0%+80 50%-128 0%+144" z="100" ghost="true"/>
 
-		<object type="text" name="manual_name" sprite="translucent-background" size="50%-195 0%+149 50%+195 100%-205" font="prospero14" textcolor="255 255 255" z="100" ghost="true"/>
+		<object type="text" name="manual_name" sprite="translucent_background" size="50%-195 0%+149 50%+195 100%-205" font="prospero14" textcolor="255 255 255" z="100" ghost="true"/>
 
 		<!-- Gee needs to implement text clipping, so long text doesn't get clipped to these scroll windows yet. Scroll bars also don't block world input yet. -->
-		<object type="text" name="manual_rollover" scrollbar="true" scrollbar-style="manual_scrollbar" sprite="translucent-background" size="50%-126 0%+80 50%+195 0%+144" font="prospero16" textcolor="255 255 255" z="100" ghost="false"/>
-   	    	<object type="text" name="manual_history" scrollbar="true" scrollbar-style="manual_scrollbar" sprite="translucent-background" size="50%-195 100%-200 50%+195 100%-55" font="prospero16" textcolor="255 255 255" z="100" ghost="false"/>
+		<object type="text" name="manual_rollover" scrollbar="true" scrollbar_style="manual_scrollbar" sprite="translucent_background" size="50%-126 0%+80 50%+195 0%+144" font="prospero16" textcolor="255 255 255" z="100" ghost="false"/>
+   	    	<object type="text" name="manual_history" scrollbar="true" scrollbar_style="manual_scrollbar" sprite="translucent_background" size="50%-195 100%-200 50%+195 100%-55" font="prospero16" textcolor="255 255 255" z="100" ghost="false"/>
 
-		<object type="button" name="manual_exit_button" sprite="exit_sprite" sprite-over="exit_sprite-over" size="50%+184 0%+50 50%+200 0%+66" ghost="false" z="100" hidden="false">
+		<object type="button" name="manual_exit_button" sprite="exit_sprite" sprite_over="exit_sprite_over" size="50%+184 0%+50 50%+200 0%+66" ghost="false" z="100" hidden="false">
 			<action on="Press"><![CDATA[
 				// Close manual.
 				ManualGUI = getGUIObjectByName("manual_gui");
diff --git a/binaries/data/mods/official/gui/test/7_atlas.xml b/binaries/data/mods/official/gui/test/7_atlas.xml
index 7ced700f8b..ddbd95391a 100644
--- a/binaries/data/mods/official/gui/test/7_atlas.xml
+++ b/binaries/data/mods/official/gui/test/7_atlas.xml
@@ -73,7 +73,7 @@
 					setSizeCoord("atlas_mainborder_menu_bkg", crd_atlas_mainborder_menu_bkg_x, crd_atlas_mainborder_menu_bkg_y, -crd_atlas_mainborder_menu_bkg_width, crd_atlas_mainborder_menu_bkg_y+crd_atlas_mainborder_menu_bkg_height, left_screen, top_screen, right_screen, top_screen);
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_maximise_arrow" sprite="atlas_global_arrow_dn" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Maximise Arrow[font=tahoma10]\nClick to maximise the toolbar." z="60" hidden="true">
+			<object type="button" name="atlas_mainborder_toolbar_maximise_arrow" sprite="atlas_global_arrow_dn" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Maximise Arrow[font=tahoma10]\nClick to maximise the toolbar." z="60" hidden="true">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_maximise_arrow", -crd_atlas_mainborder_toolbar_maximise_arrow_x-crd_atlas_mainborder_toolbar_maximise_arrow_width, crd_atlas_mainborder_toolbar_maximise_arrow_y, -crd_atlas_mainborder_toolbar_maximise_arrow_x, crd_atlas_mainborder_toolbar_maximise_arrow_y+crd_atlas_mainborder_toolbar_maximise_arrow_height, right_screen, top_screen, right_screen, top_screen);
 				]]></action>
@@ -90,7 +90,7 @@
 					setSizeCoord("atlas_mainborder_toolbar_bkg", crd_atlas_mainborder_toolbar_bkg_x, crd_atlas_mainborder_toolbar_bkg_y, -crd_atlas_mainborder_toolbar_bkg_width, crd_atlas_mainborder_toolbar_bkg_y+crd_atlas_mainborder_toolbar_bkg_height, left_screen, top_screen, right_screen, top_screen);
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_fully_minimise_arrow" sprite="atlas_global_arrow_up" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Fully Minimise Arrow[font=tahoma10]\nClick to fully minimise the toolbar." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_fully_minimise_arrow" sprite="atlas_global_arrow_up" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Fully Minimise Arrow[font=tahoma10]\nClick to fully minimise the toolbar." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_fully_minimise_arrow", -crd_atlas_mainborder_toolbar_fully_minimise_arrow_x-crd_atlas_mainborder_toolbar_fully_minimise_arrow_width, crd_atlas_mainborder_toolbar_fully_minimise_arrow_y, -crd_atlas_mainborder_toolbar_fully_minimise_arrow_x, crd_atlas_mainborder_toolbar_fully_minimise_arrow_y+crd_atlas_mainborder_toolbar_fully_minimise_arrow_height, right_screen, top_screen, right_screen, top_screen);
 				]]></action>
@@ -98,7 +98,7 @@
 					atlasFullyMinimiseToolbar();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_fully_maximise_arrow" sprite="atlas_global_arrow_dn" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Full Maximise Arrow[font=tahoma10]\nClick to fully maximise the toolbar." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_fully_maximise_arrow" sprite="atlas_global_arrow_dn" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Full Maximise Arrow[font=tahoma10]\nClick to fully maximise the toolbar." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_fully_maximise_arrow", -crd_atlas_mainborder_toolbar_fully_maximise_arrow_x-crd_atlas_mainborder_toolbar_fully_maximise_arrow_width, crd_atlas_mainborder_toolbar_fully_maximise_arrow_y, -crd_atlas_mainborder_toolbar_fully_maximise_arrow_x, crd_atlas_mainborder_toolbar_fully_maximise_arrow_y+crd_atlas_mainborder_toolbar_fully_maximise_arrow_height, right_screen, top_screen, right_screen, top_screen);
 				]]></action>
@@ -115,7 +115,7 @@
 					setSizeCoord("atlas_mainborder_toolbar_bkg_max", crd_atlas_mainborder_toolbar_bkg_max_x, crd_atlas_mainborder_toolbar_bkg_max_y, -crd_atlas_mainborder_toolbar_bkg_max_width, crd_atlas_mainborder_toolbar_bkg_max_y+crd_atlas_mainborder_toolbar_bkg_max_height, left_screen, top_screen, right_screen, top_screen);
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_minimise_arrow" sprite="atlas_global_arrow_up" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Minimise Arrow[font=tahoma10]\nClick to minimise the toolbar." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_minimise_arrow" sprite="atlas_global_arrow_up" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Minimise Arrow[font=tahoma10]\nClick to minimise the toolbar." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_minimise_arrow", -crd_atlas_mainborder_toolbar_minimise_arrow_x-crd_atlas_mainborder_toolbar_minimise_arrow_width, crd_atlas_mainborder_toolbar_minimise_arrow_y, -crd_atlas_mainborder_toolbar_minimise_arrow_x, crd_atlas_mainborder_toolbar_minimise_arrow_y+crd_atlas_mainborder_toolbar_minimise_arrow_height, right_screen, top_screen, right_screen, top_screen);
 				]]></action>
@@ -128,7 +128,7 @@
 		<!-- TOP: TOOLBAR BUTTONS: ROW 1 -->
 		<object type="empty" name="atlas_mainborder_toolbar_button_row_1" size="0 0 100% 100%" z="1" hidden="false">
 			<!-- TOP: TOOLBAR: BUTTONS -->
-			<object type="button" name="atlas_mainborder_toolbar_button_1" cell-id="1" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_1" cell_id="1" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_1", crd_atlas_mainborder_toolbar_button_1_x, crd_atlas_mainborder_toolbar_button_1_y, crd_atlas_mainborder_toolbar_button_1_x+crd_atlas_mainborder_toolbar_button_1_width, crd_atlas_mainborder_toolbar_button_1_y+crd_atlas_mainborder_toolbar_button_1_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -136,7 +136,7 @@
 					atlasToolbarButton_1();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_2" cell-id="2" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_2" cell_id="2" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_2", crd_atlas_mainborder_toolbar_button_2_x, crd_atlas_mainborder_toolbar_button_2_y, crd_atlas_mainborder_toolbar_button_2_x+crd_atlas_mainborder_toolbar_button_2_width, crd_atlas_mainborder_toolbar_button_2_y+crd_atlas_mainborder_toolbar_button_2_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -144,7 +144,7 @@
 					atlasToolbarButton_2();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_3" cell-id="3" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_3" cell_id="3" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_3", crd_atlas_mainborder_toolbar_button_3_x, crd_atlas_mainborder_toolbar_button_3_y, crd_atlas_mainborder_toolbar_button_3_x+crd_atlas_mainborder_toolbar_button_3_width, crd_atlas_mainborder_toolbar_button_3_y+crd_atlas_mainborder_toolbar_button_3_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -152,7 +152,7 @@
 					atlasToolbarButton_3();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_4" cell-id="4" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_4" cell_id="4" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_4", crd_atlas_mainborder_toolbar_button_4_x, crd_atlas_mainborder_toolbar_button_4_y, crd_atlas_mainborder_toolbar_button_4_x+crd_atlas_mainborder_toolbar_button_4_width, crd_atlas_mainborder_toolbar_button_4_y+crd_atlas_mainborder_toolbar_button_4_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -160,7 +160,7 @@
 					atlasToolbarButton_4();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_5" cell-id="5" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_5" cell_id="5" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_5", crd_atlas_mainborder_toolbar_button_5_x, crd_atlas_mainborder_toolbar_button_5_y, crd_atlas_mainborder_toolbar_button_5_x+crd_atlas_mainborder_toolbar_button_5_width, crd_atlas_mainborder_toolbar_button_5_y+crd_atlas_mainborder_toolbar_button_5_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -168,7 +168,7 @@
 					atlasToolbarButton_5();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_6" cell-id="6" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_6" cell_id="6" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_6", crd_atlas_mainborder_toolbar_button_6_x, crd_atlas_mainborder_toolbar_button_6_y, crd_atlas_mainborder_toolbar_button_6_x+crd_atlas_mainborder_toolbar_button_6_width, crd_atlas_mainborder_toolbar_button_6_y+crd_atlas_mainborder_toolbar_button_6_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -176,7 +176,7 @@
 					atlasToolbarButton_6();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_7" cell-id="7" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_7" cell_id="7" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_7", crd_atlas_mainborder_toolbar_button_7_x, crd_atlas_mainborder_toolbar_button_7_y, crd_atlas_mainborder_toolbar_button_7_x+crd_atlas_mainborder_toolbar_button_7_width, crd_atlas_mainborder_toolbar_button_7_y+crd_atlas_mainborder_toolbar_button_7_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -184,7 +184,7 @@
 					atlasToolbarButton_7();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_8" cell-id="8" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_8" cell_id="8" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_8", crd_atlas_mainborder_toolbar_button_8_x, crd_atlas_mainborder_toolbar_button_8_y, crd_atlas_mainborder_toolbar_button_8_x+crd_atlas_mainborder_toolbar_button_8_width, crd_atlas_mainborder_toolbar_button_8_y+crd_atlas_mainborder_toolbar_button_8_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -192,7 +192,7 @@
 					atlasToolbarButton_8();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_9" cell-id="9" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_9" cell_id="9" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_9", crd_atlas_mainborder_toolbar_button_9_x, crd_atlas_mainborder_toolbar_button_9_y, crd_atlas_mainborder_toolbar_button_9_x+crd_atlas_mainborder_toolbar_button_9_width, crd_atlas_mainborder_toolbar_button_9_y+crd_atlas_mainborder_toolbar_button_9_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -200,7 +200,7 @@
 					atlasToolbarButton_9();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_10" cell-id="10" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_10" cell_id="10" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_10", crd_atlas_mainborder_toolbar_button_10_x, crd_atlas_mainborder_toolbar_button_10_y, crd_atlas_mainborder_toolbar_button_10_x+crd_atlas_mainborder_toolbar_button_10_width, crd_atlas_mainborder_toolbar_button_10_y+crd_atlas_mainborder_toolbar_button_10_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -208,7 +208,7 @@
 					atlasToolbarButton_10();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_11" cell-id="11" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_11" cell_id="11" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_11", crd_atlas_mainborder_toolbar_button_11_x, crd_atlas_mainborder_toolbar_button_11_y, crd_atlas_mainborder_toolbar_button_11_x+crd_atlas_mainborder_toolbar_button_11_width, crd_atlas_mainborder_toolbar_button_11_y+crd_atlas_mainborder_toolbar_button_11_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -216,7 +216,7 @@
 					atlasToolbarButton_11();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_12" cell-id="12" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_12" cell_id="12" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_12", crd_atlas_mainborder_toolbar_button_12_x, crd_atlas_mainborder_toolbar_button_12_y, crd_atlas_mainborder_toolbar_button_12_x+crd_atlas_mainborder_toolbar_button_12_width, crd_atlas_mainborder_toolbar_button_12_y+crd_atlas_mainborder_toolbar_button_12_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -224,7 +224,7 @@
 					atlasToolbarButton_12();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_13" cell-id="13" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_13" cell_id="13" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_13", crd_atlas_mainborder_toolbar_button_13_x, crd_atlas_mainborder_toolbar_button_13_y, crd_atlas_mainborder_toolbar_button_13_x+crd_atlas_mainborder_toolbar_button_13_width, crd_atlas_mainborder_toolbar_button_13_y+crd_atlas_mainborder_toolbar_button_13_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -232,7 +232,7 @@
 					atlasToolbarButton_13();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_14" cell-id="14" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_14" cell_id="14" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_14", crd_atlas_mainborder_toolbar_button_14_x, crd_atlas_mainborder_toolbar_button_14_y, crd_atlas_mainborder_toolbar_button_14_x+crd_atlas_mainborder_toolbar_button_14_width, crd_atlas_mainborder_toolbar_button_14_y+crd_atlas_mainborder_toolbar_button_14_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -240,7 +240,7 @@
 					atlasToolbarButton_14();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_15" cell-id="15" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_15" cell_id="15" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_15", crd_atlas_mainborder_toolbar_button_15_x, crd_atlas_mainborder_toolbar_button_15_y, crd_atlas_mainborder_toolbar_button_15_x+crd_atlas_mainborder_toolbar_button_15_width, crd_atlas_mainborder_toolbar_button_15_y+crd_atlas_mainborder_toolbar_button_15_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -248,7 +248,7 @@
 					atlasToolbarButton_15();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_16" cell-id="16" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_16" cell_id="16" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_16", crd_atlas_mainborder_toolbar_button_16_x, crd_atlas_mainborder_toolbar_button_16_y, crd_atlas_mainborder_toolbar_button_16_x+crd_atlas_mainborder_toolbar_button_16_width, crd_atlas_mainborder_toolbar_button_16_y+crd_atlas_mainborder_toolbar_button_16_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -256,7 +256,7 @@
 					atlasToolbarButton_16();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_17" cell-id="17" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_17" cell_id="17" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_17", crd_atlas_mainborder_toolbar_button_17_x, crd_atlas_mainborder_toolbar_button_17_y, crd_atlas_mainborder_toolbar_button_17_x+crd_atlas_mainborder_toolbar_button_17_width, crd_atlas_mainborder_toolbar_button_17_y+crd_atlas_mainborder_toolbar_button_17_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -264,7 +264,7 @@
 					atlasToolbarButton_17();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_18" cell-id="18" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_18" cell_id="18" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_18", crd_atlas_mainborder_toolbar_button_18_x, crd_atlas_mainborder_toolbar_button_18_y, crd_atlas_mainborder_toolbar_button_18_x+crd_atlas_mainborder_toolbar_button_18_width, crd_atlas_mainborder_toolbar_button_18_y+crd_atlas_mainborder_toolbar_button_18_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -272,7 +272,7 @@
 					atlasToolbarButton_18();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_19" cell-id="19" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_19" cell_id="19" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_19", crd_atlas_mainborder_toolbar_button_19_x, crd_atlas_mainborder_toolbar_button_19_y, crd_atlas_mainborder_toolbar_button_19_x+crd_atlas_mainborder_toolbar_button_19_width, crd_atlas_mainborder_toolbar_button_19_y+crd_atlas_mainborder_toolbar_button_19_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -280,7 +280,7 @@
 					atlasToolbarButton_19();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_20" cell-id="20" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_20" cell_id="20" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_20", crd_atlas_mainborder_toolbar_button_20_x, crd_atlas_mainborder_toolbar_button_20_y, crd_atlas_mainborder_toolbar_button_20_x+crd_atlas_mainborder_toolbar_button_20_width, crd_atlas_mainborder_toolbar_button_20_y+crd_atlas_mainborder_toolbar_button_20_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -288,7 +288,7 @@
 					atlasToolbarButton_20();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_21" cell-id="21" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_21" cell_id="21" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_21", crd_atlas_mainborder_toolbar_button_21_x, crd_atlas_mainborder_toolbar_button_21_y, crd_atlas_mainborder_toolbar_button_21_x+crd_atlas_mainborder_toolbar_button_21_width, crd_atlas_mainborder_toolbar_button_21_y+crd_atlas_mainborder_toolbar_button_21_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -296,7 +296,7 @@
 					atlasToolbarButton_21();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_22" cell-id="22" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_22" cell_id="22" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_22", crd_atlas_mainborder_toolbar_button_22_x, crd_atlas_mainborder_toolbar_button_22_y, crd_atlas_mainborder_toolbar_button_22_x+crd_atlas_mainborder_toolbar_button_22_width, crd_atlas_mainborder_toolbar_button_22_y+crd_atlas_mainborder_toolbar_button_22_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -304,7 +304,7 @@
 					atlasToolbarButton_22();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_23" cell-id="23" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_23" cell_id="23" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_23", crd_atlas_mainborder_toolbar_button_23_x, crd_atlas_mainborder_toolbar_button_23_y, crd_atlas_mainborder_toolbar_button_23_x+crd_atlas_mainborder_toolbar_button_23_width, crd_atlas_mainborder_toolbar_button_23_y+crd_atlas_mainborder_toolbar_button_23_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -312,7 +312,7 @@
 					atlasToolbarButton_23();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_24" cell-id="24" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_24" cell_id="24" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_24", crd_atlas_mainborder_toolbar_button_24_x, crd_atlas_mainborder_toolbar_button_24_y, crd_atlas_mainborder_toolbar_button_24_x+crd_atlas_mainborder_toolbar_button_24_width, crd_atlas_mainborder_toolbar_button_24_y+crd_atlas_mainborder_toolbar_button_24_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -320,7 +320,7 @@
 					atlasToolbarButton_24();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_25" cell-id="25" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_25" cell_id="25" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_25", crd_atlas_mainborder_toolbar_button_25_x, crd_atlas_mainborder_toolbar_button_25_y, crd_atlas_mainborder_toolbar_button_25_x+crd_atlas_mainborder_toolbar_button_25_width, crd_atlas_mainborder_toolbar_button_25_y+crd_atlas_mainborder_toolbar_button_25_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -328,7 +328,7 @@
 					atlasToolbarButton_25();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_26" cell-id="26" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_26" cell_id="26" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_26", crd_atlas_mainborder_toolbar_button_26_x, crd_atlas_mainborder_toolbar_button_26_y, crd_atlas_mainborder_toolbar_button_26_x+crd_atlas_mainborder_toolbar_button_26_width, crd_atlas_mainborder_toolbar_button_26_y+crd_atlas_mainborder_toolbar_button_26_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -336,7 +336,7 @@
 					atlasToolbarButton_26();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_27" cell-id="27" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_27" cell_id="27" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_27", crd_atlas_mainborder_toolbar_button_27_x, crd_atlas_mainborder_toolbar_button_27_y, crd_atlas_mainborder_toolbar_button_27_x+crd_atlas_mainborder_toolbar_button_27_width, crd_atlas_mainborder_toolbar_button_27_y+crd_atlas_mainborder_toolbar_button_27_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -344,7 +344,7 @@
 					atlasToolbarButton_27();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_28" cell-id="28" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_28" cell_id="28" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_28", crd_atlas_mainborder_toolbar_button_28_x, crd_atlas_mainborder_toolbar_button_28_y, crd_atlas_mainborder_toolbar_button_28_x+crd_atlas_mainborder_toolbar_button_28_width, crd_atlas_mainborder_toolbar_button_28_y+crd_atlas_mainborder_toolbar_button_28_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -352,7 +352,7 @@
 					atlasToolbarButton_28();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_29" cell-id="29" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_29" cell_id="29" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_29", crd_atlas_mainborder_toolbar_button_29_x, crd_atlas_mainborder_toolbar_button_29_y, crd_atlas_mainborder_toolbar_button_29_x+crd_atlas_mainborder_toolbar_button_29_width, crd_atlas_mainborder_toolbar_button_29_y+crd_atlas_mainborder_toolbar_button_29_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -360,7 +360,7 @@
 					atlasToolbarButton_29();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_30" cell-id="30" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_30" cell_id="30" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_30", crd_atlas_mainborder_toolbar_button_30_x, crd_atlas_mainborder_toolbar_button_30_y, crd_atlas_mainborder_toolbar_button_30_x+crd_atlas_mainborder_toolbar_button_30_width, crd_atlas_mainborder_toolbar_button_30_y+crd_atlas_mainborder_toolbar_button_30_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -368,7 +368,7 @@
 					atlasToolbarButton_30();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_31" cell-id="31" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_31" cell_id="31" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_31", crd_atlas_mainborder_toolbar_button_31_x, crd_atlas_mainborder_toolbar_button_31_y, crd_atlas_mainborder_toolbar_button_31_x+crd_atlas_mainborder_toolbar_button_31_width, crd_atlas_mainborder_toolbar_button_31_y+crd_atlas_mainborder_toolbar_button_31_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -376,7 +376,7 @@
 					atlasToolbarButton_31();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_32" cell-id="32" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_32" cell_id="32" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_32", crd_atlas_mainborder_toolbar_button_32_x, crd_atlas_mainborder_toolbar_button_32_y, crd_atlas_mainborder_toolbar_button_32_x+crd_atlas_mainborder_toolbar_button_32_width, crd_atlas_mainborder_toolbar_button_32_y+crd_atlas_mainborder_toolbar_button_32_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -384,7 +384,7 @@
 					atlasToolbarButton_32();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_33" cell-id="33" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_33" cell_id="33" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_33", crd_atlas_mainborder_toolbar_button_33_x, crd_atlas_mainborder_toolbar_button_33_y, crd_atlas_mainborder_toolbar_button_33_x+crd_atlas_mainborder_toolbar_button_33_width, crd_atlas_mainborder_toolbar_button_33_y+crd_atlas_mainborder_toolbar_button_33_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -392,7 +392,7 @@
 					atlasToolbarButton_33();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_34" cell-id="34" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_34" cell_id="34" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_34", crd_atlas_mainborder_toolbar_button_34_x, crd_atlas_mainborder_toolbar_button_34_y, crd_atlas_mainborder_toolbar_button_34_x+crd_atlas_mainborder_toolbar_button_34_width, crd_atlas_mainborder_toolbar_button_34_y+crd_atlas_mainborder_toolbar_button_34_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -400,7 +400,7 @@
 					atlasToolbarButton_34();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_35" cell-id="35" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_35" cell_id="35" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_35", crd_atlas_mainborder_toolbar_button_35_x, crd_atlas_mainborder_toolbar_button_35_y, crd_atlas_mainborder_toolbar_button_35_x+crd_atlas_mainborder_toolbar_button_35_width, crd_atlas_mainborder_toolbar_button_35_y+crd_atlas_mainborder_toolbar_button_35_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -408,7 +408,7 @@
 					atlasToolbarButton_35();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_36" cell-id="36" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_36" cell_id="36" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_36", crd_atlas_mainborder_toolbar_button_36_x, crd_atlas_mainborder_toolbar_button_36_y, crd_atlas_mainborder_toolbar_button_36_x+crd_atlas_mainborder_toolbar_button_36_width, crd_atlas_mainborder_toolbar_button_36_y+crd_atlas_mainborder_toolbar_button_36_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -416,7 +416,7 @@
 					atlasToolbarButton_36();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_37" cell-id="37" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_37" cell_id="37" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_37", crd_atlas_mainborder_toolbar_button_37_x, crd_atlas_mainborder_toolbar_button_37_y, crd_atlas_mainborder_toolbar_button_37_x+crd_atlas_mainborder_toolbar_button_37_width, crd_atlas_mainborder_toolbar_button_37_y+crd_atlas_mainborder_toolbar_button_37_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -424,7 +424,7 @@
 					atlasToolbarButton_37();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_38" cell-id="38" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_38" cell_id="38" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_38", crd_atlas_mainborder_toolbar_button_38_x, crd_atlas_mainborder_toolbar_button_38_y, crd_atlas_mainborder_toolbar_button_38_x+crd_atlas_mainborder_toolbar_button_38_width, crd_atlas_mainborder_toolbar_button_38_y+crd_atlas_mainborder_toolbar_button_38_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -432,7 +432,7 @@
 					atlasToolbarButton_38();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_39" cell-id="39" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_39" cell_id="39" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_39", crd_atlas_mainborder_toolbar_button_39_x, crd_atlas_mainborder_toolbar_button_39_y, crd_atlas_mainborder_toolbar_button_39_x+crd_atlas_mainborder_toolbar_button_39_width, crd_atlas_mainborder_toolbar_button_39_y+crd_atlas_mainborder_toolbar_button_39_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -440,7 +440,7 @@
 					atlasToolbarButton_39();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_40" cell-id="40" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_40" cell_id="40" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_40", crd_atlas_mainborder_toolbar_button_40_x, crd_atlas_mainborder_toolbar_button_40_y, crd_atlas_mainborder_toolbar_button_40_x+crd_atlas_mainborder_toolbar_button_40_width, crd_atlas_mainborder_toolbar_button_40_y+crd_atlas_mainborder_toolbar_button_40_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -453,7 +453,7 @@
 		<!-- TOP: TOOLBAR BUTTONS: ROW 2 -->
 		<object type="empty" name="atlas_mainborder_toolbar_button_row_2" size="0 0 100% 100%" z="1" hidden="true">
 			<!-- TOP: TOOLBAR: BUTTONS -->
-			<object type="button" name="atlas_mainborder_toolbar_button_41" cell-id="41" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_41" cell_id="41" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_41", crd_atlas_mainborder_toolbar_button_41_x, crd_atlas_mainborder_toolbar_button_41_y, crd_atlas_mainborder_toolbar_button_41_x+crd_atlas_mainborder_toolbar_button_41_width, crd_atlas_mainborder_toolbar_button_41_y+crd_atlas_mainborder_toolbar_button_41_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -461,7 +461,7 @@
 					atlasToolbarButton_41();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_42" cell-id="42" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_42" cell_id="42" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_42", crd_atlas_mainborder_toolbar_button_42_x, crd_atlas_mainborder_toolbar_button_42_y, crd_atlas_mainborder_toolbar_button_42_x+crd_atlas_mainborder_toolbar_button_42_width, crd_atlas_mainborder_toolbar_button_42_y+crd_atlas_mainborder_toolbar_button_42_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -469,7 +469,7 @@
 					atlasToolbarButton_42();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_43" cell-id="43" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_43" cell_id="43" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_43", crd_atlas_mainborder_toolbar_button_43_x, crd_atlas_mainborder_toolbar_button_43_y, crd_atlas_mainborder_toolbar_button_43_x+crd_atlas_mainborder_toolbar_button_43_width, crd_atlas_mainborder_toolbar_button_43_y+crd_atlas_mainborder_toolbar_button_43_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -477,7 +477,7 @@
 					atlasToolbarButton_43();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_44" cell-id="44" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_44" cell_id="44" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_44", crd_atlas_mainborder_toolbar_button_44_x, crd_atlas_mainborder_toolbar_button_44_y, crd_atlas_mainborder_toolbar_button_44_x+crd_atlas_mainborder_toolbar_button_44_width, crd_atlas_mainborder_toolbar_button_44_y+crd_atlas_mainborder_toolbar_button_44_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -485,7 +485,7 @@
 					atlasToolbarButton_44();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_45" cell-id="45" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_45" cell_id="45" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_45", crd_atlas_mainborder_toolbar_button_45_x, crd_atlas_mainborder_toolbar_button_45_y, crd_atlas_mainborder_toolbar_button_45_x+crd_atlas_mainborder_toolbar_button_45_width, crd_atlas_mainborder_toolbar_button_45_y+crd_atlas_mainborder_toolbar_button_45_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -493,7 +493,7 @@
 					atlasToolbarButton_45();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_46" cell-id="46" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_46" cell_id="46" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_46", crd_atlas_mainborder_toolbar_button_46_x, crd_atlas_mainborder_toolbar_button_46_y, crd_atlas_mainborder_toolbar_button_46_x+crd_atlas_mainborder_toolbar_button_46_width, crd_atlas_mainborder_toolbar_button_46_y+crd_atlas_mainborder_toolbar_button_46_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -501,7 +501,7 @@
 					atlasToolbarButton_46();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_47" cell-id="47" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_47" cell_id="47" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_47", crd_atlas_mainborder_toolbar_button_47_x, crd_atlas_mainborder_toolbar_button_47_y, crd_atlas_mainborder_toolbar_button_47_x+crd_atlas_mainborder_toolbar_button_47_width, crd_atlas_mainborder_toolbar_button_47_y+crd_atlas_mainborder_toolbar_button_47_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -509,7 +509,7 @@
 					atlasToolbarButton_47();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_48" cell-id="48" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_48" cell_id="48" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_48", crd_atlas_mainborder_toolbar_button_48_x, crd_atlas_mainborder_toolbar_button_48_y, crd_atlas_mainborder_toolbar_button_48_x+crd_atlas_mainborder_toolbar_button_48_width, crd_atlas_mainborder_toolbar_button_48_y+crd_atlas_mainborder_toolbar_button_48_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -517,7 +517,7 @@
 					atlasToolbarButton_48();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_49" cell-id="49" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_49" cell_id="49" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_49", crd_atlas_mainborder_toolbar_button_49_x, crd_atlas_mainborder_toolbar_button_49_y, crd_atlas_mainborder_toolbar_button_49_x+crd_atlas_mainborder_toolbar_button_49_width, crd_atlas_mainborder_toolbar_button_49_y+crd_atlas_mainborder_toolbar_button_49_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -525,7 +525,7 @@
 					atlasToolbarButton_49();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_50" cell-id="50" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_50" cell_id="50" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_50", crd_atlas_mainborder_toolbar_button_50_x, crd_atlas_mainborder_toolbar_button_50_y, crd_atlas_mainborder_toolbar_button_50_x+crd_atlas_mainborder_toolbar_button_50_width, crd_atlas_mainborder_toolbar_button_50_y+crd_atlas_mainborder_toolbar_button_50_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -533,7 +533,7 @@
 					atlasToolbarButton_50();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_51" cell-id="51" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_51" cell_id="51" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_51", crd_atlas_mainborder_toolbar_button_51_x, crd_atlas_mainborder_toolbar_button_51_y, crd_atlas_mainborder_toolbar_button_51_x+crd_atlas_mainborder_toolbar_button_51_width, crd_atlas_mainborder_toolbar_button_51_y+crd_atlas_mainborder_toolbar_button_51_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -541,7 +541,7 @@
 					atlasToolbarButton_51();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_52" cell-id="52" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_52" cell_id="52" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_52", crd_atlas_mainborder_toolbar_button_52_x, crd_atlas_mainborder_toolbar_button_52_y, crd_atlas_mainborder_toolbar_button_52_x+crd_atlas_mainborder_toolbar_button_52_width, crd_atlas_mainborder_toolbar_button_52_y+crd_atlas_mainborder_toolbar_button_52_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -549,7 +549,7 @@
 					atlasToolbarButton_52();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_53" cell-id="53" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_53" cell_id="53" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_53", crd_atlas_mainborder_toolbar_button_53_x, crd_atlas_mainborder_toolbar_button_53_y, crd_atlas_mainborder_toolbar_button_53_x+crd_atlas_mainborder_toolbar_button_53_width, crd_atlas_mainborder_toolbar_button_53_y+crd_atlas_mainborder_toolbar_button_53_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -557,7 +557,7 @@
 					atlasToolbarButton_53();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_54" cell-id="54" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_54" cell_id="54" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_54", crd_atlas_mainborder_toolbar_button_54_x, crd_atlas_mainborder_toolbar_button_54_y, crd_atlas_mainborder_toolbar_button_54_x+crd_atlas_mainborder_toolbar_button_54_width, crd_atlas_mainborder_toolbar_button_54_y+crd_atlas_mainborder_toolbar_button_54_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -565,7 +565,7 @@
 					atlasToolbarButton_54();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_55" cell-id="55" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_55" cell_id="55" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_55", crd_atlas_mainborder_toolbar_button_55_x, crd_atlas_mainborder_toolbar_button_55_y, crd_atlas_mainborder_toolbar_button_55_x+crd_atlas_mainborder_toolbar_button_55_width, crd_atlas_mainborder_toolbar_button_55_y+crd_atlas_mainborder_toolbar_button_55_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -573,7 +573,7 @@
 					atlasToolbarButton_55();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_56" cell-id="56" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_56" cell_id="56" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_56", crd_atlas_mainborder_toolbar_button_56_x, crd_atlas_mainborder_toolbar_button_56_y, crd_atlas_mainborder_toolbar_button_56_x+crd_atlas_mainborder_toolbar_button_56_width, crd_atlas_mainborder_toolbar_button_56_y+crd_atlas_mainborder_toolbar_button_56_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -581,7 +581,7 @@
 					atlasToolbarButton_56();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_57" cell-id="57" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_57" cell_id="57" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_57", crd_atlas_mainborder_toolbar_button_57_x, crd_atlas_mainborder_toolbar_button_57_y, crd_atlas_mainborder_toolbar_button_57_x+crd_atlas_mainborder_toolbar_button_57_width, crd_atlas_mainborder_toolbar_button_57_y+crd_atlas_mainborder_toolbar_button_57_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -589,7 +589,7 @@
 					atlasToolbarButton_57();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_58" cell-id="58" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_58" cell_id="58" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_58", crd_atlas_mainborder_toolbar_button_58_x, crd_atlas_mainborder_toolbar_button_58_y, crd_atlas_mainborder_toolbar_button_58_x+crd_atlas_mainborder_toolbar_button_58_width, crd_atlas_mainborder_toolbar_button_58_y+crd_atlas_mainborder_toolbar_button_58_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -597,7 +597,7 @@
 					atlasToolbarButton_58();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_59" cell-id="59" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_59" cell_id="59" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_59", crd_atlas_mainborder_toolbar_button_59_x, crd_atlas_mainborder_toolbar_button_59_y, crd_atlas_mainborder_toolbar_button_59_x+crd_atlas_mainborder_toolbar_button_59_width, crd_atlas_mainborder_toolbar_button_59_y+crd_atlas_mainborder_toolbar_button_59_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -605,7 +605,7 @@
 					atlasToolbarButton_59();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_60" cell-id="60" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_60" cell_id="60" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_60", crd_atlas_mainborder_toolbar_button_60_x, crd_atlas_mainborder_toolbar_button_60_y, crd_atlas_mainborder_toolbar_button_60_x+crd_atlas_mainborder_toolbar_button_60_width, crd_atlas_mainborder_toolbar_button_60_y+crd_atlas_mainborder_toolbar_button_60_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -613,7 +613,7 @@
 					atlasToolbarButton_60();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_61" cell-id="61" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_61" cell_id="61" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_61", crd_atlas_mainborder_toolbar_button_61_x, crd_atlas_mainborder_toolbar_button_61_y, crd_atlas_mainborder_toolbar_button_61_x+crd_atlas_mainborder_toolbar_button_61_width, crd_atlas_mainborder_toolbar_button_61_y+crd_atlas_mainborder_toolbar_button_61_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -621,7 +621,7 @@
 					atlasToolbarButton_61();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_62" cell-id="62" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_62" cell_id="62" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_62", crd_atlas_mainborder_toolbar_button_62_x, crd_atlas_mainborder_toolbar_button_62_y, crd_atlas_mainborder_toolbar_button_62_x+crd_atlas_mainborder_toolbar_button_62_width, crd_atlas_mainborder_toolbar_button_62_y+crd_atlas_mainborder_toolbar_button_62_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -629,7 +629,7 @@
 					atlasToolbarButton_62();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_63" cell-id="63" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_63" cell_id="63" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_63", crd_atlas_mainborder_toolbar_button_63_x, crd_atlas_mainborder_toolbar_button_63_y, crd_atlas_mainborder_toolbar_button_63_x+crd_atlas_mainborder_toolbar_button_63_width, crd_atlas_mainborder_toolbar_button_63_y+crd_atlas_mainborder_toolbar_button_63_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -637,7 +637,7 @@
 					atlasToolbarButton_63();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_64" cell-id="64" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_64" cell_id="64" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_64", crd_atlas_mainborder_toolbar_button_64_x, crd_atlas_mainborder_toolbar_button_64_y, crd_atlas_mainborder_toolbar_button_64_x+crd_atlas_mainborder_toolbar_button_64_width, crd_atlas_mainborder_toolbar_button_64_y+crd_atlas_mainborder_toolbar_button_64_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -645,7 +645,7 @@
 					atlasToolbarButton_64();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_65" cell-id="65" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_65" cell_id="65" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_65", crd_atlas_mainborder_toolbar_button_65_x, crd_atlas_mainborder_toolbar_button_65_y, crd_atlas_mainborder_toolbar_button_65_x+crd_atlas_mainborder_toolbar_button_65_width, crd_atlas_mainborder_toolbar_button_65_y+crd_atlas_mainborder_toolbar_button_65_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -653,7 +653,7 @@
 					atlasToolbarButton_65();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_66" cell-id="66" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_66" cell_id="66" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_66", crd_atlas_mainborder_toolbar_button_66_x, crd_atlas_mainborder_toolbar_button_66_y, crd_atlas_mainborder_toolbar_button_66_x+crd_atlas_mainborder_toolbar_button_66_width, crd_atlas_mainborder_toolbar_button_66_y+crd_atlas_mainborder_toolbar_button_66_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -661,7 +661,7 @@
 					atlasToolbarButton_66();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_67" cell-id="67" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_67" cell_id="67" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_67", crd_atlas_mainborder_toolbar_button_67_x, crd_atlas_mainborder_toolbar_button_67_y, crd_atlas_mainborder_toolbar_button_67_x+crd_atlas_mainborder_toolbar_button_67_width, crd_atlas_mainborder_toolbar_button_67_y+crd_atlas_mainborder_toolbar_button_67_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -669,7 +669,7 @@
 					atlasToolbarButton_67();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_68" cell-id="68" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_68" cell_id="68" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_68", crd_atlas_mainborder_toolbar_button_68_x, crd_atlas_mainborder_toolbar_button_68_y, crd_atlas_mainborder_toolbar_button_68_x+crd_atlas_mainborder_toolbar_button_68_width, crd_atlas_mainborder_toolbar_button_68_y+crd_atlas_mainborder_toolbar_button_68_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -677,7 +677,7 @@
 					atlasToolbarButton_68();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_69" cell-id="69" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_69" cell_id="69" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_69", crd_atlas_mainborder_toolbar_button_69_x, crd_atlas_mainborder_toolbar_button_69_y, crd_atlas_mainborder_toolbar_button_69_x+crd_atlas_mainborder_toolbar_button_69_width, crd_atlas_mainborder_toolbar_button_69_y+crd_atlas_mainborder_toolbar_button_69_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -685,7 +685,7 @@
 					atlasToolbarButton_69();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_70" cell-id="70" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_70" cell_id="70" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_70", crd_atlas_mainborder_toolbar_button_70_x, crd_atlas_mainborder_toolbar_button_70_y, crd_atlas_mainborder_toolbar_button_70_x+crd_atlas_mainborder_toolbar_button_70_width, crd_atlas_mainborder_toolbar_button_70_y+crd_atlas_mainborder_toolbar_button_70_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -693,7 +693,7 @@
 					atlasToolbarButton_70();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_71" cell-id="71" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_71" cell_id="71" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_71", crd_atlas_mainborder_toolbar_button_71_x, crd_atlas_mainborder_toolbar_button_71_y, crd_atlas_mainborder_toolbar_button_71_x+crd_atlas_mainborder_toolbar_button_71_width, crd_atlas_mainborder_toolbar_button_71_y+crd_atlas_mainborder_toolbar_button_71_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -701,7 +701,7 @@
 					atlasToolbarButton_71();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_72" cell-id="72" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_72" cell_id="72" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_72", crd_atlas_mainborder_toolbar_button_72_x, crd_atlas_mainborder_toolbar_button_72_y, crd_atlas_mainborder_toolbar_button_72_x+crd_atlas_mainborder_toolbar_button_72_width, crd_atlas_mainborder_toolbar_button_72_y+crd_atlas_mainborder_toolbar_button_72_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -709,7 +709,7 @@
 					atlasToolbarButton_72();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_73" cell-id="73" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_73" cell_id="73" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_73", crd_atlas_mainborder_toolbar_button_73_x, crd_atlas_mainborder_toolbar_button_73_y, crd_atlas_mainborder_toolbar_button_73_x+crd_atlas_mainborder_toolbar_button_73_width, crd_atlas_mainborder_toolbar_button_73_y+crd_atlas_mainborder_toolbar_button_73_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -717,7 +717,7 @@
 					atlasToolbarButton_73();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_74" cell-id="74" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_74" cell_id="74" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_74", crd_atlas_mainborder_toolbar_button_74_x, crd_atlas_mainborder_toolbar_button_74_y, crd_atlas_mainborder_toolbar_button_74_x+crd_atlas_mainborder_toolbar_button_74_width, crd_atlas_mainborder_toolbar_button_74_y+crd_atlas_mainborder_toolbar_button_74_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -725,7 +725,7 @@
 					atlasToolbarButton_74();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_75" cell-id="75" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_75" cell_id="75" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_75", crd_atlas_mainborder_toolbar_button_75_x, crd_atlas_mainborder_toolbar_button_75_y, crd_atlas_mainborder_toolbar_button_75_x+crd_atlas_mainborder_toolbar_button_75_width, crd_atlas_mainborder_toolbar_button_75_y+crd_atlas_mainborder_toolbar_button_75_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -733,7 +733,7 @@
 					atlasToolbarButton_75();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_76" cell-id="76" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_76" cell_id="76" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_76", crd_atlas_mainborder_toolbar_button_76_x, crd_atlas_mainborder_toolbar_button_76_y, crd_atlas_mainborder_toolbar_button_76_x+crd_atlas_mainborder_toolbar_button_76_width, crd_atlas_mainborder_toolbar_button_76_y+crd_atlas_mainborder_toolbar_button_76_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -741,7 +741,7 @@
 					atlasToolbarButton_76();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_77" cell-id="77" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_77" cell_id="77" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_77", crd_atlas_mainborder_toolbar_button_77_x, crd_atlas_mainborder_toolbar_button_77_y, crd_atlas_mainborder_toolbar_button_77_x+crd_atlas_mainborder_toolbar_button_77_width, crd_atlas_mainborder_toolbar_button_77_y+crd_atlas_mainborder_toolbar_button_77_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -749,7 +749,7 @@
 					atlasToolbarButton_77();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_78" cell-id="78" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_78" cell_id="78" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_78", crd_atlas_mainborder_toolbar_button_78_x, crd_atlas_mainborder_toolbar_button_78_y, crd_atlas_mainborder_toolbar_button_78_x+crd_atlas_mainborder_toolbar_button_78_width, crd_atlas_mainborder_toolbar_button_78_y+crd_atlas_mainborder_toolbar_button_78_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -757,7 +757,7 @@
 					atlasToolbarButton_78();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_79" cell-id="39" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_79" cell_id="39" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_79", crd_atlas_mainborder_toolbar_button_79_x, crd_atlas_mainborder_toolbar_button_79_y, crd_atlas_mainborder_toolbar_button_79_x+crd_atlas_mainborder_toolbar_button_79_width, crd_atlas_mainborder_toolbar_button_79_y+crd_atlas_mainborder_toolbar_button_79_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -765,7 +765,7 @@
 					atlasToolbarButton_79();
 				]]></action>
 			</object>
-			<object type="button" name="atlas_mainborder_toolbar_button_80" cell-id="80" sprite="atlas_sheet_toolbar_button" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
+			<object type="button" name="atlas_mainborder_toolbar_button_80" cell_id="80" sprite="atlas_sheet_toolbar_button" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Toolbar Button[font=tahoma10]\nClick to perform some yet-to-be-determined function." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_mainborder_toolbar_button_80", crd_atlas_mainborder_toolbar_button_80_x, crd_atlas_mainborder_toolbar_button_80_y, crd_atlas_mainborder_toolbar_button_80_x+crd_atlas_mainborder_toolbar_button_80_width, crd_atlas_mainborder_toolbar_button_80_y+crd_atlas_mainborder_toolbar_button_80_height, left_screen, top_screen, left_screen, top_screen);
 				]]></action>
@@ -776,7 +776,7 @@
 		</object>
 
 		<!-- LT: LOGO -->
-		<object type="text" name="atlas_mainborder_lt_corner" sprite="atlas_mainborder_lt_corner" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]0 A.D. Logo[font=tahoma10]\nMmm, nothing like the smell of blatant self-promotion in the morning ..." z="60" hidden="false">
+		<object type="text" name="atlas_mainborder_lt_corner" sprite="atlas_mainborder_lt_corner" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]0 A.D. Logo[font=tahoma10]\nMmm, nothing like the smell of blatant self-promotion in the morning ..." z="60" hidden="false">
 			<action on="Load"><![CDATA[
 				setSizeCoord("atlas_mainborder_lt_corner", crd_atlas_mainborder_lt_corner_x, crd_atlas_mainborder_lt_corner_y, crd_atlas_mainborder_lt_corner_x+crd_atlas_mainborder_lt_corner_width, crd_atlas_mainborder_lt_corner_y+crd_atlas_mainborder_lt_corner_height, left_screen, top_screen, left_screen, top_screen);
 			]]></action>
@@ -791,7 +791,7 @@
 				]]></action>
 			</object>
 			<!-- RT: INFO WINDOW BAR -->
-			<object type="text" name="atlas_info_window" sprite="atlas_window_white" font="tahoma10" textcolor="0 0 0" text-align="left" text-valign="center" tooltip-style="atlas_tooltip" tooltip="[font=tahoma10b]Info Window[font=tahoma10]\nInformation about the current scenario." z="60" hidden="false">
+			<object type="text" name="atlas_info_window" sprite="atlas_window_white" font="tahoma10" textcolor="0 0 0" text_align="left" text_valign="center" tooltip_style="atlas_tooltip" tooltip="[font=tahoma10b]Info Window[font=tahoma10]\nInformation about the current scenario." z="60" hidden="false">
 				<action on="Load"><![CDATA[
 					setSizeCoord("atlas_info_window", -crd_atlas_info_window_x-crd_atlas_info_window_width, crd_atlas_info_window_y, -crd_atlas_info_window_x, crd_atlas_info_window_y+crd_atlas_info_window_height, right_screen, top_screen, right_screen, top_screen);
 					setInterval(atlasUpdateInfoWindow, 500);
diff --git a/binaries/data/mods/official/gui/test/9_global.xml b/binaries/data/mods/official/gui/test/9_global.xml
index 365eae0a28..0e07252430 100644
--- a/binaries/data/mods/official/gui/test/9_global.xml
+++ b/binaries/data/mods/official/gui/test/9_global.xml
@@ -57,27 +57,27 @@
                         <object type="image" size="0 0 100% 100%" name="mb_blocker" hidden="false" />
                         
                         <!-- background -->
-                        <object type="image" size="0 10 100% 100%" name="mb_background" sprite="message_box-gen-background" absolute="false" z="160" />
+                        <object type="image" size="0 10 100% 100%" name="mb_background" sprite="message_box_gen_background" absolute="false" z="160" />
 
                         <!-- top -->
-                        <object type="image" name="mb_border-corner-lt" size="0 10 15 25" sprite="message_box-corner" absolute="false" z="161" />
-                        <object type="image" name="mb_border-top" size="15 10 100%-15 42" sprite="message_box-border-top" absolute="false" z="161" />
-                        <object type="image" name="mb_border-corner-rt" size="100%-15 10 100% 25" sprite="message_box-corner" absolute="false" z="161" />
+                        <object type="image" name="mb_border_corner_lt" size="0 10 15 25" sprite="message_box_corner" absolute="false" z="161" />
+                        <object type="image" name="mb_border_top" size="15 10 100%-15 42" sprite="message_box_border_top" absolute="false" z="161" />
+                        <object type="image" name="mb_border_corner_rt" size="100%-15 10 100% 25" sprite="message_box_corner" absolute="false" z="161" />
 
                         <!-- left/right -->
-                        <object type="image" name="mb_border-left" size="0 25 20 100%-15" sprite="message_box-border-left" absolute="false" z="162" />
-                        <object type="image" name="mb_border-right" size="100%-32 25 100% 100%-15" sprite="message_box-border-right" absolute="false" z="161" />
+                        <object type="image" name="mb_border_left" size="0 25 20 100%-15" sprite="message_box_border_left" absolute="false" z="162" />
+                        <object type="image" name="mb_border_right" size="100%-32 25 100% 100%-15" sprite="message_box_border_right" absolute="false" z="161" />
                         
                         <!-- bottom -->
-                        <object type="image" name="mb_border-corner-lb" size="0 100%-15 15 100%" sprite="message_box-corner" absolute="false" z="161" />
-                        <object type="image" name="mb_border-bottom" size="15 100%-32 100%-15 100%" sprite="message_box-border-bottom" absolute="false" z="162" />
-                        <object type="image" name="mb_border-corner-rb" size="100%-15 100%-15 100% 100%" sprite="message_box-corner" absolute="false" z="161" />
+                        <object type="image" name="mb_border_corner_lb" size="0 100%-15 15 100%" sprite="message_box_corner" absolute="false" z="161" />
+                        <object type="image" name="mb_border_bottom" size="15 100%-32 100%-15 100%" sprite="message_box_border_bottom" absolute="false" z="162" />
+                        <object type="image" name="mb_border_corner_rb" size="100%-15 100%-15 100% 100%" sprite="message_box_corner" absolute="false" z="161" />
                         
                         <!-- titlebar -->
-                        <object type="image" name="mb_titlebar-left" size="15% 0 15%+64 32" sprite="message_box-titlebar-left" absolute="false" z="164" />
-                        <object type="image" name="mb_titlebar-middle" size="15%+64 0 85%-64 32" sprite="message_box-titlebar-middle" absolute="false" z="164" />
-                        <object type="image" name="mb_titlebar-right" size="85%-64 0 85% 32" sprite="message_box-titlebar-right" absolute="false" z="164" />
-                        <object type="button" name="mb_titlebar-text" size="15%+54 4 85%-54 32" absolute="false" font="prospero18" z="165" text-align="center" text-valign="center">mbTitle</object>
+                        <object type="image" name="mb_titlebar_left" size="15% 0 15%+64 32" sprite="message_box_titlebar_left" absolute="false" z="164" />
+                        <object type="image" name="mb_titlebar_middle" size="15%+64 0 85%-64 32" sprite="message_box_titlebar_middle" absolute="false" z="164" />
+                        <object type="image" name="mb_titlebar_right" size="85%-64 0 85% 32" sprite="message_box_titlebar_right" absolute="false" z="164" />
+                        <object type="button" name="mb_titlebar_text" size="15%+54 4 85%-54 32" absolute="false" font="prospero18" z="165" text_align="center" text_valign="center">mbTitle</object>
                         
                         <!-- text -->
                         <object type="text" name="mb_text" size="32 40 100%-32 100%-100" absolute="false" font="prospero18" z="165" ghost="true">
@@ -85,21 +85,21 @@
                         </object>
                         
                         <!-- buttons -->
-                        <object type="button" name="mb_button1" size="40 100%-80 33%-30 100%-50" absolute="false" sprite="message_box-button-normal" sprite-over="message_box-button-over" font="prospero18" z="165" text-align="center" text-valign="center">
+                        <object type="button" name="mb_button1" size="40 100%-80 33%-30 100%-50" absolute="false" sprite="message_box_button_normal" sprite_over="message_box_button_over" font="prospero18" z="165" text_align="center" text_valign="center">
                                 mbButton1Caption
                                 <action on="Press"><![CDATA[
                                         eval(getGUIGlobal().mbButton1Code);
                                         GUIObjectHide('mb_main');
                                 ]]></action>
                         </object>
-                        <object type="button" name="mb_button2" size="33%+30 100%-80 66%-40 100%-50" absolute="false" sprite="message_box-button-normal" sprite-over="message_box-button-over" font="prospero18" z="165" text-align="center" text-valign="center">
+                        <object type="button" name="mb_button2" size="33%+30 100%-80 66%-40 100%-50" absolute="false" sprite="message_box_button_normal" sprite_over="message_box_button_over" font="prospero18" z="165" text_align="center" text_valign="center">
                                 mbButton2Caption
                                 <action on="Press"><![CDATA[
                                         eval(getGUIGlobal().mbButton2Code);
                                         GUIObjectHide('mb_main');
                                 ]]></action>
                         </object>
-                        <object type="button" name="mb_button3" size="66%+30 100%-80 100%-40 100%-50" absolute="false" sprite="message_box-button-normal" sprite-over="message_box-button-over" font="prospero18" z="165" text-align="center" text-valign="center">
+                        <object type="button" name="mb_button3" size="66%+30 100%-80 100%-40 100%-50" absolute="false" sprite="message_box_button_normal" sprite_over="message_box_button_over" font="prospero18" z="165" text_align="center" text_valign="center">
                                 mbButton3Caption
                                 <action on="Press"><![CDATA[
                                         eval(getGUIGlobal().mbButton2Code);
diff --git a/binaries/data/mods/official/gui/test/functions_coord.js b/binaries/data/mods/official/gui/test/functions_coord.js
index 9e92343cb7..4768fa7c74 100644
--- a/binaries/data/mods/official/gui/test/functions_coord.js
+++ b/binaries/data/mods/official/gui/test/functions_coord.js
@@ -117,22 +117,22 @@ function FlipGUI(NewGUIType)
 					switch (SizeCoord[FlipGUILoop].name){
 						case "session_panel_minimap_segbottom1":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = SizeCoord[FlipGUILoop].name + "-lit";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = SizeCoord[FlipGUILoop].name + "_lit";
 						break;
 						case "session_panel_minimap_segbottom2":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = SizeCoord[FlipGUILoop].name + "-lit";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = SizeCoord[FlipGUILoop].name + "_lit";
 						break;
 						case "session_panel_minimap_segbottom3":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = SizeCoord[FlipGUILoop].name + "-lit";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = SizeCoord[FlipGUILoop].name + "_lit";
 						break;
 						case "session_panel_minimap_segbottom4":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = SizeCoord[FlipGUILoop].name;
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = SizeCoord[FlipGUILoop].name + "-lit";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = SizeCoord[FlipGUILoop].name + "_lit";
 						break;
 						case "session_panel_status_bg":
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_status_bg-top";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_status_bg_top";
 						break;
 						default:
 						break;
@@ -143,22 +143,22 @@ function FlipGUI(NewGUIType)
 					switch (SizeCoord[FlipGUILoop].name){
 						case "session_panel_minimap_segbottom1":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop1";
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = "session_panel_minimap_segtop1-lit";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = "session_panel_minimap_segtop1_lit";
 						break;
 						case "session_panel_minimap_segbottom2":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop2";
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = "session_panel_minimap_segtop2-lit";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = "session_panel_minimap_segtop2_lit";
 						break;
 						case "session_panel_minimap_segbottom3":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop3";
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = "session_panel_minimap_segtop3-lit";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = "session_panel_minimap_segtop3_lit";
 						break;
 						case "session_panel_minimap_segbottom4":
 							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_minimap_segtop4";
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name)["sprite-over"] = "session_panel_minimap_segtop4-lit";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite_over = "session_panel_minimap_segtop4_lit";
 						break;
 						case "session_panel_status_bg":
-							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_status_bg-bottom";
+							getGUIObjectByName(SizeCoord[FlipGUILoop].name).sprite = "session_panel_status_bg_bottom";
 						break;
 						default:
 						break;
diff --git a/binaries/data/mods/official/gui/test/functions_global.js b/binaries/data/mods/official/gui/test/functions_global.js
index 9dda3b04ae..75ac45466c 100755
--- a/binaries/data/mods/official/gui/test/functions_global.js
+++ b/binaries/data/mods/official/gui/test/functions_global.js
@@ -40,7 +40,7 @@ TODO: Make button code work for any number of buttons without extending the code
 function messageBox(mbWidth, mbHeight, mbMessage, mbTitle, mbMode, mbButtonCaptions, mbButtonsCode) {
 
         mbMainObj = getGUIObjectByName("mb_main");
-        mbTitleObj = getGUIObjectByName("mb_titlebar-text");
+        mbTitleObj = getGUIObjectByName("mb_titlebar_text");
         mbTextObj = getGUIObjectByName("mb_text");
         
         mbButton1Obj = getGUIObjectByName("mb_button1");
diff --git a/binaries/data/mods/official/gui/test/functions_session.js b/binaries/data/mods/official/gui/test/functions_session.js
index 279132dc7b..79eb04e5f0 100755
--- a/binaries/data/mods/official/gui/test/functions_session.js
+++ b/binaries/data/mods/official/gui/test/functions_session.js
@@ -85,7 +85,7 @@ function startLoadingScreen()
         GUIObjectUnhide("loading_screen");
         console.write("Loading " + g_GameAttributes.mapFile + " (" + g_GameAttributes.numPlayers + " players) ...");
 
-        getGUIObjectByName("loading_screen_titlebar-text").caption = "Loading Scenario ...";
+        getGUIObjectByName("loading_screen_titlebar_text").caption = "Loading Scenario ...";
         getGUIObjectByName("loading_screen_progress_bar_text").caption = "... Reticulating splines ...";
         getGUIObjectByName("loading_screen_progress_bar").caption = 80;
         getGUIObjectByName("loading_screen_text").caption = "LOADING " + g_GameAttributes.mapFile + " ...\nPlease wait ...\n(Yes, we know the progress bar doesn't do diddly squat right now)\nJust keep waiting ...\nIt'll get there ...\nAlmost done ...\nTrust me!";
@@ -118,8 +118,8 @@ function setPortrait(objectName, portraitString, portraitCell)
 
         // Accepts an object and specifies its default, rollover (lit) and disabled (grey) sprites.
         // Sprite Format: "ui_portrait_"portraitString
-        // Sprite Format: "ui_portrait_"portraitString"-lit"
-        // Sprite Format: "ui_portrait_"portraitString"-grey"
+        // Sprite Format: "ui_portrait_"portraitString"_lit"
+        // Sprite Format: "ui_portrait_"portraitString"_grey"
         // Note: Make sure the file follows this naming convention or bad things could happen.
 
         // Get GUI object
@@ -128,12 +128,12 @@ function setPortrait(objectName, portraitString, portraitCell)
         // Set the three portraits.
         GUIObject.sprite = "ui_portrait_" + portraitString;
         // Note we need to use a special syntax here (object["param"] instead of object.param because dashes aren't actually in JS's variable-naming conventions.
-        GUIObject["sprite-over"] = GUIObject.sprite + "-lit";
-        GUIObject["sprite-disabled"] = GUIObject.sprite + "-grey";
+        GUIObject.sprite_over = GUIObject.sprite + "_lit";
+        GUIObject.sprite_disabled = GUIObject.sprite + "_grey";
 
         // If the source texture is a multi-frame image (icon sheet), specify correct cell.
         if (portraitCell)
-                GUIObject["cell-id"] = portraitCell;
+                GUIObject.cell_id = portraitCell;
 }
 
 // ====================================================================
diff --git a/binaries/data/mods/official/gui/test/functions_session_status_orb.js b/binaries/data/mods/official/gui/test/functions_session_status_orb.js
index 06e250f9dd..c4d3a10563 100755
--- a/binaries/data/mods/official/gui/test/functions_session_status_orb.js
+++ b/binaries/data/mods/official/gui/test/functions_session_status_orb.js
@@ -744,7 +744,7 @@ function UpdateStatusOrb()
 	if (selection[0].traits.up.rank > 1)
 	{
 		GUIObject.sprite = "ui_icon_sheet_statistic";
-		GUIObject["cell-id"] = stat_rank1 + (selection[0].traits.up.rank-2);
+		GUIObject.cell_id = stat_rank1 + (selection[0].traits.up.rank-2);
 	}
 	else
 		GUIObject.sprite = "";
diff --git a/binaries/data/mods/official/gui/test/functions_utility_music.js b/binaries/data/mods/official/gui/test/functions_utility_music.js
index 58fbc43979..c9b4a9c82e 100755
--- a/binaries/data/mods/official/gui/test/functions_utility_music.js
+++ b/binaries/data/mods/official/gui/test/functions_utility_music.js
@@ -68,22 +68,22 @@ function newRandomSound(soundType, soundSubType, soundPrePath)
 					switch (randomSound)
 					{
 						case 1:
-							randomFileName = "Attack-Attackx.ogg"
+							randomFileName = "Attack_Attackx.ogg"
 						break;
 						case 2:
-							randomFileName = "Attack-Chargex.ogg"
+							randomFileName = "Attack_Chargex.ogg"
 						break;
 						case 3:
-							randomFileName = "Attack-Engagex.ogg"
+							randomFileName = "Attack_Engagex.ogg"
 						break;
 						case 4:
-							randomFileName = "Attack-ForMyFamily.ogg"
+							randomFileName = "Attack_ForMyFamily.ogg"
 						break;
 						case 5:
-							randomFileName = "Attack-Warcry.ogg"
+							randomFileName = "Attack_Warcry.ogg"
 						break;
 						case 6:
-							randomFileName = "Attack-ZeusSaviourandVictory.ogg"
+							randomFileName = "Attack_ZeusSaviourandVictory.ogg"
 						break;
 					}
 				break;
@@ -95,28 +95,28 @@ function newRandomSound(soundType, soundSubType, soundPrePath)
 					switch (randomSound)
 					{
 						case 1:
-							randomFileName = "Command-AsYouWish.ogg"
+							randomFileName = "Command_AsYouWish.ogg"
 						break;
 						case 2:
-							randomFileName = "Command-ByYourCommand.ogg"
+							randomFileName = "Command_ByYourCommand.ogg"
 						break;
 						case 3:
-							randomFileName = "Command-ImComing.ogg"
+							randomFileName = "Command_ImComing.ogg"
 						break;
 						case 4:
-							randomFileName = "Command-IObey.ogg"
+							randomFileName = "Command_IObey.ogg"
 						break;
 						case 5:
-							randomFileName = "Command-MyLiege.ogg"
+							randomFileName = "Command_MyLiege.ogg"
 						break;
 						case 6:
-							randomFileName = "Command-OnMyWay.ogg"
+							randomFileName = "Command_OnMyWay.ogg"
 						break;
 						case 7:
-							randomFileName = "Command-WithMyHonour.ogg"
+							randomFileName = "Command_WithMyHonour.ogg"
 						break;
 						case 8:
-							randomFileName = "Command-YesMyLord.ogg"
+							randomFileName = "Command_YesMyLord.ogg"
 						break;
 					}
 				break;
@@ -128,34 +128,34 @@ function newRandomSound(soundType, soundSubType, soundPrePath)
 					switch (randomSound)
 					{
 						case 1:
-							randomFileName = "Select-AtYourService.ogg"
+							randomFileName = "Select_AtYourService.ogg"
 						break;
 						case 2:
-							randomFileName = "Select-HowMayIServeYouq.ogg"
+							randomFileName = "Select_HowMayIServeYouq.ogg"
 						break;
 						case 3:
-							randomFileName = "Select-MyLiegeq.ogg"
+							randomFileName = "Select_MyLiegeq.ogg"
 						break;
 						case 4:
-							randomFileName = "Select-MyLordq.ogg"
+							randomFileName = "Select_MyLordq.ogg"
 						break;
 						case 5:
-							randomFileName = "Select-OrdersSireq.ogg"
+							randomFileName = "Select_OrdersSireq.ogg"
 						break;
 						case 6:
-							randomFileName = "Select-Ready.ogg"
+							randomFileName = "Select_Ready.ogg"
 						break;
 						case 7:
-							randomFileName = "Select-ReadySire.ogg"
+							randomFileName = "Select_ReadySire.ogg"
 						break;
 						case 8:
-							randomFileName = "Select-Yesq.ogg"
+							randomFileName = "Select_Yesq.ogg"
 						break;
 						case 9:
-							randomFileName = "Select-YourOrdersq.ogg"
+							randomFileName = "Select_YourOrdersq.ogg"
 						break;
 						case 10:
-							randomFileName = "Select-YourWishq.ogg"
+							randomFileName = "Select_YourWishq.ogg"
 						break;
 					}
 				break;
diff --git a/binaries/data/mods/official/gui/test/hello.xml b/binaries/data/mods/official/gui/test/hello.xml
index 6e70027b19..bb259eecdc 100755
--- a/binaries/data/mods/official/gui/test/hello.xml
+++ b/binaries/data/mods/official/gui/test/hello.xml
@@ -48,7 +48,7 @@
       ]]></action>
     </object>
 
-    <object type="button" name="arena-button" sprite="sprite1" size="710 32 726 48" z="200" hotkey="orbital.toggle" font="prospero14" text-align="center" text-valign="center" hidden="true">v
+    <object type="button" name="arena_button" sprite="sprite1" size="710 32 726 48" z="200" hotkey="orbital.toggle" font="prospero14" text_align="center" text_valign="center" hidden="true">v
       <action on="Press"><![CDATA[
         var arena = getGUIObjectByName('arena');
         arena.hidden = !arena.hidden;
diff --git a/binaries/data/mods/official/gui/test/setup.xml b/binaries/data/mods/official/gui/test/setup.xml
index cd452e4cae..29d424383f 100755
--- a/binaries/data/mods/official/gui/test/setup.xml
+++ b/binaries/data/mods/official/gui/test/setup.xml
@@ -3,93 +3,93 @@
 <!DOCTYPE setup SYSTEM "..\gui.dtd">
 
 <setup>
-        <scrollbar name="sb" width="18" minimum-bar-size="5"
-                sprite-button-top="sprite2"
-                sprite-button-top-over="null"
-                sprite-button-bottom="sprite2"
-                sprite-button-bottom-over="null"
-                sprite-back-vertical="grey"
-                sprite-bar-vertical="sprite2"
-                sprite-bar-vertical-over="null"
-                sprite-bar-vertical-pressed="null"
-                sprite-button-bottom-pressed="sprite2-pressed"
-                sprite-button-top-pressed="sprite2-pressed"
+        <scrollbar name="sb" width="18" minimum_bar_size="5"
+                sprite_button_top="sprite2"
+                sprite_button_top_over="null"
+                sprite_button_bottom="sprite2"
+                sprite_button_bottom_over="null"
+                sprite_back_vertical="grey"
+                sprite_bar_vertical="sprite2"
+                sprite_bar_vertical_over="null"
+                sprite_bar_vertical_pressed="null"
+                sprite_button_bottom_pressed="sprite2_pressed"
+                sprite_button_top_pressed="sprite2_pressed"
         />
 
-        <scrollbar name="sb2" width="37" minimum-bar-size="5"
-                sprite-button-top="scroll"
-                sprite-button-top-over="null"
-                sprite-button-bottom="scroll"
-                sprite-button-bottom-over="null"
-                sprite-back-vertical="null"
-                sprite-bar-vertical="scroll-bar"
-                sprite-bar-vertical-over="null"
-                sprite-bar-vertical-pressed="null"
-                sprite-button-bottom-pressed="scroll"
-                sprite-button-top-pressed="scroll"
+        <scrollbar name="sb2" width="37" minimum_bar_size="5"
+                sprite_button_top="scroll"
+                sprite_button_top_over="null"
+                sprite_button_bottom="scroll"
+                sprite_button_bottom_over="null"
+                sprite_back_vertical="null"
+                sprite_bar_vertical="scroll_bar"
+                sprite_bar_vertical_over="null"
+                sprite_bar_vertical_pressed="null"
+                sprite_button_bottom_pressed="scroll"
+                sprite_button_top_pressed="scroll"
         />
 
-        <scrollbar name="manual_scrollbar" width="12" minimum-bar-size="4" alwaysshown="false"
-                sprite-button-top="sprite2"
-                sprite-button-top-over="scroll"
-                sprite-button-bottom="sprite2"
-                sprite-button-bottom-over="scroll"
-                sprite-back-vertical="grey"
-                sprite-bar-vertical="sprite2"
-                sprite-bar-vertical-over="scroll"
-                sprite-bar-vertical-pressed="sprite2-pressed"
-                sprite-button-bottom-pressed="sprite2-pressed"
-                sprite-button-top-pressed="sprite2-pressed"
+        <scrollbar name="manual_scrollbar" width="12" minimum_bar_size="4" alwaysshown="false"
+                sprite_button_top="sprite2"
+                sprite_button_top_over="scroll"
+                sprite_button_bottom="sprite2"
+                sprite_button_bottom_over="scroll"
+                sprite_back_vertical="grey"
+                sprite_bar_vertical="sprite2"
+                sprite_bar_vertical_over="scroll"
+                sprite_bar_vertical_pressed="sprite2_pressed"
+                sprite_button_bottom_pressed="sprite2_pressed"
+                sprite_button_top_pressed="sprite2_pressed"
         />
 
         <!-- Resource Icons -->
-        <icon name="icon_resource_food" texture="ui_icon_sheet_statistic" cell-id="16" size="20 20" />
-        <icon name="icon_resource_wood" texture="ui_icon_sheet_statistic" cell-id="17" size="20 20" />
-        <icon name="icon_resource_stone" texture="ui_icon_sheet_statistic" cell-id="18" size="20 20" />
-        <icon name="icon_resource_ore" texture="ui_icon_sheet_statistic" cell-id="19" size="20 20" />
-        <icon name="icon_resource_population" texture="ui_icon_sheet_statistic" cell-id="20" size="20 20" />
+        <icon name="icon_resource_food" texture="ui_icon_sheet_statistic" cell_id="16" size="20 20" />
+        <icon name="icon_resource_wood" texture="ui_icon_sheet_statistic" cell_id="17" size="20 20" />
+        <icon name="icon_resource_stone" texture="ui_icon_sheet_statistic" cell_id="18" size="20 20" />
+        <icon name="icon_resource_ore" texture="ui_icon_sheet_statistic" cell_id="19" size="20 20" />
+        <icon name="icon_resource_population" texture="ui_icon_sheet_statistic" cell_id="20" size="20 20" />
 
         <!-- Statistic Icons -->
-        <icon name="icon_statistic_garrison" texture="ui_icon_sheet_statistic" cell-id="12" size="20 20" />
-        <icon name="icon_statistic_rank1" texture="ui_icon_sheet_statistic" cell-id="9" size="20 20" />
-        <icon name="icon_statistic_rank2" texture="ui_icon_sheet_statistic" cell-id="10" size="20 20" />
-        <icon name="icon_statistic_rank3" texture="ui_icon_sheet_statistic" cell-id="11" size="20 20" />
-        <icon name="icon_statistic_hp" texture="ui_icon_sheet_statistic" cell-id="13" size="20 20" />
-        <icon name="icon_statistic_accuracy" texture="ui_icon_sheet_statistic" cell-id="0" size="20 20" />
-        <icon name="icon_statistic_armour" texture="ui_icon_sheet_statistic" cell-id="2" size="20 20" />
-        <icon name="icon_statistic_attack" texture="ui_icon_sheet_statistic" cell-id="1" size="20 20" />
-        <icon name="icon_statistic_crush" texture="ui_icon_sheet_statistic" cell-id="8" size="20 20" />
-        <icon name="icon_statistic_hack" texture="ui_icon_sheet_statistic" cell-id="6" size="20 20" />
-        <icon name="icon_statistic_los" texture="ui_icon_sheet_statistic" cell-id="3" size="20 20" />
-        <icon name="icon_statistic_pierce" texture="ui_icon_sheet_statistic" cell-id="7" size="20 20" />
-        <icon name="icon_statistic_range" texture="ui_icon_sheet_statistic" cell-id="5" size="20 20" />
-        <icon name="icon_statistic_speed" texture="ui_icon_sheet_statistic" cell-id="4" size="20 20" />
+        <icon name="icon_statistic_garrison" texture="ui_icon_sheet_statistic" cell_id="12" size="20 20" />
+        <icon name="icon_statistic_rank1" texture="ui_icon_sheet_statistic" cell_id="9" size="20 20" />
+        <icon name="icon_statistic_rank2" texture="ui_icon_sheet_statistic" cell_id="10" size="20 20" />
+        <icon name="icon_statistic_rank3" texture="ui_icon_sheet_statistic" cell_id="11" size="20 20" />
+        <icon name="icon_statistic_hp" texture="ui_icon_sheet_statistic" cell_id="13" size="20 20" />
+        <icon name="icon_statistic_accuracy" texture="ui_icon_sheet_statistic" cell_id="0" size="20 20" />
+        <icon name="icon_statistic_armour" texture="ui_icon_sheet_statistic" cell_id="2" size="20 20" />
+        <icon name="icon_statistic_attack" texture="ui_icon_sheet_statistic" cell_id="1" size="20 20" />
+        <icon name="icon_statistic_crush" texture="ui_icon_sheet_statistic" cell_id="8" size="20 20" />
+        <icon name="icon_statistic_hack" texture="ui_icon_sheet_statistic" cell_id="6" size="20 20" />
+        <icon name="icon_statistic_los" texture="ui_icon_sheet_statistic" cell_id="3" size="20 20" />
+        <icon name="icon_statistic_pierce" texture="ui_icon_sheet_statistic" cell_id="7" size="20 20" />
+        <icon name="icon_statistic_range" texture="ui_icon_sheet_statistic" cell_id="5" size="20 20" />
+        <icon name="icon_statistic_speed" texture="ui_icon_sheet_statistic" cell_id="4" size="20 20" />
         
         <!-- Generic Icons / malte, 15th nov -->
         <icon name="0ad_icon" texture="0ad_icon" size="16 16" />
         <icon name="bullet_icon" texture="bullet_icon" size="8 8" />
         <icon name="infinity_icon" texture="infinity_icon" size="16 16" />
 
-        <tooltip name="pregame-mainmenu-tooltip"
-                use-object="pregame-mainmenu-tooltip"
-                hide-object="true"
+        <tooltip name="pregame_mainmenu_tooltip"
+                use_object="pregame_mainmenu_tooltip"
+                hide_object="true"
                 delay="0"
         />
 
         <tooltip name="atlas_tooltip"
-                use-object="atlas_tooltip"
-                hide-object="true"
+                use_object="atlas_tooltip"
+                hide_object="true"
                 delay="0"
 	/>
 
-        <tooltip name="session-tooltip"
+        <tooltip name="session_tooltip"
                 maxwidth="300"
                 offset="16 32"
                 anchor="top"
                 delay="500"
-                sprite="session-tooltip-background"
+                sprite="session_tooltip_background"
                 font="tahoma12"
-                buffer-zone="4"
+                buffer_zone="4"
                 textcolor="0 0 0"
         />
 
diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml
index 34c78ec446..3941ab1970 100644
--- a/binaries/data/mods/official/gui/test/sprite1.xml
+++ b/binaries/data/mods/official/gui/test/sprite1.xml
@@ -21,14 +21,14 @@
                 <image backcolor="128 128 128" size="100%-2 1 100%-1 100%-1" />
                 <image backcolor="128 128 128" size="1 100%-2 100%-1 100%-1" />
                 <!-- middle -->
-                <image texture="background.tga" texture-size="0 0 256 256" size="1 1 100%-2 100%-2" />
+                <image texture="background.tga" texture_size="0 0 256 256" size="1 1 100%-2 100%-2" />
         </sprite>
 
         <sprite name="sprite4">
                 <image backcolor="50 50 50" size="0 0 100% 100%" />
         </sprite>
 
-        <sprite name="sprite1-over">
+        <sprite name="sprite1_over">
                 <!-- Starting with top left corner continuing in a clockwise manner -->
                 <image backcolor="255 255 255" size="0 1 1 100%-1" />
                 <image backcolor="255 255 255" size="0 0 100%-1 1" />
@@ -38,10 +38,10 @@
                 <image backcolor="128 128 128" size="1 100%-2 100%-1 100%-1" />
                 <!-- middle -->
                 <image backcolor="200 0 0" size="1 1 100%-2 100%-2" />
-                <image texture="background.tga" texture-size="0 0 256 256" size="2 2 100%-3 100%-3" />
+                <image texture="background.tga" texture_size="0 0 256 256" size="2 2 100%-3 100%-3" />
         </sprite>
 
-        <sprite name="sprite1-ch">
+        <sprite name="sprite1_ch">
                 <!-- Starting with top left corner continuing in a clockwise manner -->
                 <image backcolor="255 255 255" size="0 1 1 100%-1" />
                 <image backcolor="255 255 255" size="0 0 100%-1 1" />
@@ -50,14 +50,14 @@
                 <image backcolor="128 128 128" size="100%-2 1 100%-1 100%-1" />
                 <image backcolor="128 128 128" size="1 100%-2 100%-1 100%-1" />
                 <!-- middle -->
-                <image backcolor="212 208 200" size="4 4 100%-5 100%-5" z-level="1" />
-                <image backcolor="128 0 0" size="4 4 100%-5 100%-5" z-level="1" />
+                <image backcolor="212 208 200" size="4 4 100%-5 100%-5" z_level="1" />
+                <image backcolor="128 0 0" size="4 4 100%-5 100%-5" z_level="1" />
         </sprite>
 
-        <sprite name="sprite1-pressed">
+        <sprite name="sprite1_pressed">
                 <image backcolor="64 64 64" size="0 0 100% 100%" />
-                <image backcolor="128 128 128" size="1 1 100%-1 100%-1" z-level="1" />
-                <image backcolor="212 208 200" size="2 2 100%-2 100%-2" z-level="2" />
+                <image backcolor="128 128 128" size="1 1 100%-1 100%-1" z_level="1" />
+                <image backcolor="212 208 200" size="2 2 100%-2 100%-2" z_level="2" />
         </sprite>
 
         <sprite name="sprite2">
@@ -74,9 +74,9 @@
                 <image backcolor="212 208 200" size="2 2 100%-2 100%-2" />
         </sprite>
 
-        <sprite name="sprite2-pressed">
+        <sprite name="sprite2_pressed">
                 <image backcolor="128 128 128" size="0 0 100% 100%" />
-                <image backcolor="212 208 200" size="1 1 100%-1 100%-1" z-level="1" />
+                <image backcolor="212 208 200" size="1 1 100%-1 100%-1" z_level="1" />
         </sprite>
 
         <sprite name="grey">
@@ -87,7 +87,7 @@
                 <image backcolor="0 0 0" size="0 0 100% 100%" />
         </sprite>
 
-        <sprite name="white-border">
+        <sprite name="white_border">
                 <image backcolor="100 70 120" size="0 0 100% 100%" />
                 <image backcolor="255 255 255" size="-1 -1 100%+1 0" />
                 <image backcolor="255 255 255" size="-1 100% 100%+1 100%+1" />
@@ -97,14 +97,14 @@
 
         <sprite name="scroll">
                 <!--<image backcolor="128 128 128" size="0 0 100% 100%" />-->
-                <image backcolor="150 105 180" size="2 2 100%-2 100%-2" z-level="1" />
+                <image backcolor="150 105 180" size="2 2 100%-2 100%-2" z_level="1" />
         </sprite>
-        <sprite name="scroll-bar">
+        <sprite name="scroll_bar">
                 <!--<image backcolor="128 128 128" size="0 0 100% 100%" />-->
-                <image backcolor="150 105 180" size="2 0 100%-2 100%" z-level="1" />
+                <image backcolor="150 105 180" size="2 0 100%-2 100%" z_level="1" />
         </sprite>
 
-        <sprite name="green-bar">
+        <sprite name="green_bar">
                 <image backcolor="255 255 255" size="0 1 1 100%-1" />
                 <image backcolor="255 255 255" size="0 0 100%-1 1" />
                 <image backcolor="64 64 64" size="100%-1 0 100% 100%" />
@@ -114,7 +114,7 @@
                 <image backcolor="0 200 0" size="0 0 100% 100%" />
         </sprite>
 
-        <sprite name="yellow-bar">
+        <sprite name="yellow_bar">
                 <image backcolor="255 255 255" size="0 1 1 100%-1" />
                 <image backcolor="255 255 255" size="0 0 100%-1 1" />
                 <image backcolor="64 64 64" size="100%-1 0 100% 100%" />
@@ -124,7 +124,7 @@
                 <image backcolor="255 255 0" size="0 0 100% 100%" />
         </sprite>
 
-        <sprite name="blue-bar">
+        <sprite name="blue_bar">
                 <image backcolor="255 255 255" size="0 1 1 100%-1" />
                 <image backcolor="255 255 255" size="0 0 100%-1 1" />
                 <image backcolor="64 64 64" size="100%-1 0 100% 100%" />
@@ -134,7 +134,7 @@
                 <image backcolor="0 0 255" size="0 0 100% 100%" />
         </sprite>
 
-        <sprite name="blue-bar-outlined">
+        <sprite name="blue_bar_outlined">
                 <image backcolor="0 0 0" size="-1 -1 100%+1 0" />
                 <image backcolor="0 0 0" size="-1 100% 100%+1 100%+1" />
                 <image backcolor="0 0 0" size="-1 0 0 100%" />
@@ -142,54 +142,54 @@
                 <image backcolor="0 0 255" size="0 0 100% 100%" />
         </sprite>
 
-        <sprite name="back-bar">
+        <sprite name="back_bar">
                 <image backcolor="200 200 200" size="0 1 1 100%-1" />
                 <image backcolor="200 200 200" size="0 0 100%-1 1" />
                 <image backcolor="200 200 200" size="100%-1 0 100% 100%" />
                 <image backcolor="200 200 200" size="0 100%-1 100%-1 100%" />
         </sprite>
 
-        <sprite name="only-white-border">
+        <sprite name="only_white_border">
                 <image backcolor="255 255 255" size="-1 -1 100%+1 0" />
                 <image backcolor="255 255 255" size="-1 100% 100%+1 100%+1" />
                 <image backcolor="255 255 255" size="-1 0 0 100%" />
                 <image backcolor="255 255 255" size="100% 0 100%+1 100%" />
         </sprite>
 
-        <sprite name="only-black-border">
+        <sprite name="only_black_border">
                 <image backcolor="0 0 0" size="-1 -1 100%+1 0" />
                 <image backcolor="0 0 0" size="-1 100% 100%+1 100%+1" />
                 <image backcolor="0 0 0" size="-1 0 0 100%" />
                 <image backcolor="0 0 0" size="100% 0 100%+1 100%" />
         </sprite>
 
-        <sprite name="only-black">
+        <sprite name="only_black">
                 <image backcolor="0 0 0" size="0 0 100% 100%" />
         </sprite>
 
 	<!-- Standard 0 A.D.-style framed window -->
         <sprite name="0ad_window">
                 <!-- middle -->
-                <image texture="global/ui_gen_background_paper.png" texture-size="0 0 128 128" size="0%-10 0%-10 100%+10 100%+10" />
+                <image texture="global/ui_gen_background_paper.png" texture_size="0 0 128 128" size="0%-10 0%-10 100%+10 100%+10" />
                 <!-- Starting with top left corner continuing in a clockwise manner -->
-		<image texture="global/ui_gen_border-corner-15px.png" real-texture-placement="0 0 15 15" size="0%-25 0%-25 0%-10 0%-10" />
-		<image texture="global/ui_gen_border-top-20px.png" texture-size="0 0 128 32" size="0%-10 0%-25 100%+10 0%+7" />
-		<image texture="global/ui_gen_border-corner-15px.png" real-texture-placement="0 0 15 15" size="100%+10 0%-25 100%+25 0%-10" />
-		<image texture="global/ui_gen_border-right-20px.png" texture-size="0 0 32 128" size="100%-6 0%-10 100%+26 100%+10" />
-		<image texture="global/ui_gen_border-corner-15px.png" real-texture-placement="0 0 15 15" size="100%+10 100%+10 100%+25 100%+25" />
-		<image texture="global/ui_gen_border-bottom-20px.png" texture-size="0 0 128 32" size="0%-10 100%-7 100%+10 100%+25" />
-		<image texture="global/ui_gen_border-corner-15px.png" real-texture-placement="0 0 15 15" size="0%-25 100%+10 0%-10 100%+25" />
-		<image texture="global/ui_gen_border-left-20px.png" texture-size="0 0 32 128" size="0%-25 0%-10 0%+7 100%+10" />
+		<image texture="global/ui_gen_border_corner_15px.png" real_texture_placement="0 0 15 15" size="0%-25 0%-25 0%-10 0%-10" />
+		<image texture="global/ui_gen_border_top_20px.png" texture_size="0 0 128 32" size="0%-10 0%-25 100%+10 0%+7" />
+		<image texture="global/ui_gen_border_corner_15px.png" real_texture_placement="0 0 15 15" size="100%+10 0%-25 100%+25 0%-10" />
+		<image texture="global/ui_gen_border_right_20px.png" texture_size="0 0 32 128" size="100%-6 0%-10 100%+26 100%+10" />
+		<image texture="global/ui_gen_border_corner_15px.png" real_texture_placement="0 0 15 15" size="100%+10 100%+10 100%+25 100%+25" />
+		<image texture="global/ui_gen_border_bottom_20px.png" texture_size="0 0 128 32" size="0%-10 100%-7 100%+10 100%+25" />
+		<image texture="global/ui_gen_border_corner_15px.png" real_texture_placement="0 0 15 15" size="0%-25 100%+10 0%-10 100%+25" />
+		<image texture="global/ui_gen_border_left_20px.png" texture_size="0 0 32 128" size="0%-25 0%-10 0%+7 100%+10" />
         </sprite>
 
 	<!-- Standard 0 A.D.-style window's title bar -->
         <sprite name="0ad_window_title">
-                <image texture="global/ui_gen_titlebar-left.png" real-texture-placement="0 0 64 32" size="0%+0 0%-10 5%+64 0%+22" />
-                <image texture="global/ui_gen_titlebar-middle.png" real-texture-placement="0 0 64 32" size="5%+64 0%-10 95%-64 0%+22" />
-                <image texture="global/ui_gen_titlebar-right.png" real-texture-placement="0 0 64 32" size="95%-64 0%-10 100%+0 0%+22" />
+                <image texture="global/ui_gen_titlebar_left.png" real_texture_placement="0 0 64 32" size="0%+0 0%-10 5%+64 0%+22" />
+                <image texture="global/ui_gen_titlebar_middle.png" real_texture_placement="0 0 64 32" size="5%+64 0%-10 95%-64 0%+22" />
+                <image texture="global/ui_gen_titlebar_right.png" real_texture_placement="0 0 64 32" size="95%-64 0%-10 100%+0 0%+22" />
 	</sprite>
 
-        <sprite name="translucent-background">
+        <sprite name="translucent_background">
                 <image backcolor="0 0 0 85" size="0 0 100% 100%"/>
         </sprite>
 
@@ -200,15 +200,15 @@
         -->
 
         <sprite name="0ad_icon">
-                <image texture="global/ui_gen_0ad-icon-black.png" size="0 0 100% 100%" texture-size="0 0 16 16" />
+                <image texture="global/ui_gen_0ad_icon_black.png" size="0 0 100% 100%" texture_size="0 0 16 16" />
         </sprite>
 
         <sprite name="bullet_icon">
-                <image texture="global/ui_gen_bullet-icon.png" size="0 0 100% 100%" texture-size="0 0 8 8" />
+                <image texture="global/ui_gen_bullet_icon.png" size="0 0 100% 100%" texture_size="0 0 8 8" />
         </sprite>
 
         <sprite name="infinity_icon">
-                <image texture="global/ui_gen_infinity-icon.png" size="0 0 100% 100%" texture-size="0 0 16 16" />
+                <image texture="global/ui_gen_infinity_icon.png" size="0 0 100% 100%" texture_size="0 0 16 16" />
         </sprite>
 
         <!--
@@ -217,48 +217,48 @@
         ==========================================
         -->
 
-        <sprite name="message_box-gen-background">
-                <image texture="global/ui_gen_background_paper.png" size="0 0 100% 100%" texture-size="0 0 128 128" />
+        <sprite name="message_box_gen_background">
+                <image texture="global/ui_gen_background_paper.png" size="0 0 100% 100%" texture_size="0 0 128 128" />
         </sprite>
 
-        <sprite name="message_box-corner">
-                <image texture="global/ui_gen_border-corner-15px.png" size="0 0 100% 100%" real-texture-placement="0 0 15 15" />
+        <sprite name="message_box_corner">
+                <image texture="global/ui_gen_border_corner_15px.png" size="0 0 100% 100%" real_texture_placement="0 0 15 15" />
         </sprite>
 
-        <sprite name="message_box-border-top">
-                <image texture="global/ui_gen_border-top-20px.png" size="0 0 100% 100%" texture-size="0 0 128 32" />
+        <sprite name="message_box_border_top">
+                <image texture="global/ui_gen_border_top_20px.png" size="0 0 100% 100%" texture_size="0 0 128 32" />
         </sprite>
 
-        <sprite name="message_box-border-left">
-                <image texture="global/ui_gen_border-left-20px.png" size="0 0 100% 100%" texture-size="0 0 32 128" />
+        <sprite name="message_box_border_left">
+                <image texture="global/ui_gen_border_left_20px.png" size="0 0 100% 100%" texture_size="0 0 32 128" />
         </sprite>
 
-        <sprite name="message_box-border-right">
-                <image texture="global/ui_gen_border-right-20px.png" size="0 0 100% 100%" texture-size="0 0 32 128" />
+        <sprite name="message_box_border_right">
+                <image texture="global/ui_gen_border_right_20px.png" size="0 0 100% 100%" texture_size="0 0 32 128" />
         </sprite>
 
-        <sprite name="message_box-border-bottom">
-                <image texture="global/ui_gen_border-bottom-20px.png" size="0 0 100% 100%" texture-size="0 0 128 32" />
+        <sprite name="message_box_border_bottom">
+                <image texture="global/ui_gen_border_bottom_20px.png" size="0 0 100% 100%" texture_size="0 0 128 32" />
         </sprite>
 
-        <sprite name="message_box-titlebar-left">
-                <image texture="global/ui_gen_titlebar-left.png" size="0 0 100% 100%" real-texture-placement="0 0 64 32" />
+        <sprite name="message_box_titlebar_left">
+                <image texture="global/ui_gen_titlebar_left.png" size="0 0 100% 100%" real_texture_placement="0 0 64 32" />
         </sprite>
 
-        <sprite name="message_box-titlebar-right">
-                <image texture="global/ui_gen_titlebar-right.png" size="0 0 100% 100%" real-texture-placement="0 0 64 32" />
+        <sprite name="message_box_titlebar_right">
+                <image texture="global/ui_gen_titlebar_right.png" size="0 0 100% 100%" real_texture_placement="0 0 64 32" />
         </sprite>
 
-        <sprite name="message_box-titlebar-middle">
-                <image texture="global/ui_gen_titlebar-middle.png" size="0 0 100% 100%" texture-size="0 0 64 32" />
+        <sprite name="message_box_titlebar_middle">
+                <image texture="global/ui_gen_titlebar_middle.png" size="0 0 100% 100%" texture_size="0 0 64 32" />
         </sprite>
         
-        <sprite name="message_box-button-normal">
-                <image texture="global/ui_gen_button-wood.png" size="0 0 100% 100%" real-texture-placement="0 0 160 31" />
+        <sprite name="message_box_button_normal">
+                <image texture="global/ui_gen_button_wood.png" size="0 0 100% 100%" real_texture_placement="0 0 160 31" />
         </sprite>
         
-        <sprite name="message_box-button-over">
-                <image texture="global/ui_gen_button-wood.png" size="0 0 100% 100%" real-texture-placement="0 32 160 64" />
+        <sprite name="message_box_button_over">
+                <image texture="global/ui_gen_button_wood.png" size="0 0 100% 100%" real_texture_placement="0 32 160 64" />
         </sprite>
 
         <!--
@@ -267,7 +267,7 @@
         ==========================================
         -->
 
-        <sprite name="pregame-mainmenu-tooltip-background">
+        <sprite name="pregame_mainmenu_tooltip_background">
                 <image backcolor="0 0 0 85" size="0 0 100% 100%"/>
         </sprite>
 
@@ -277,28 +277,28 @@
         ==========================================
         -->
 
-        <sprite name="pregame-mainmenu-background">
-                <image texture="pregame/ui_pregame_mainmenu_background.png" real-texture-placement="0 0 1024 768" size="0 0 100% 100%" />
+        <sprite name="pregame_mainmenu_background">
+                <image texture="pregame/ui_pregame_mainmenu_background.png" real_texture_placement="0 0 1024 768" size="0 0 100% 100%" />
         </sprite>
         
-        <sprite name="pregame-mainmenu-0ad-logo-480x218">
-                <image texture="pregame/ui_pregame_mainmenu_0ad_logo.png" real-texture-placement="0 0 480 218" size="0 0 100% 100%" />
+        <sprite name="pregame_mainmenu_0ad_logo_480x218">
+                <image texture="pregame/ui_pregame_mainmenu_0ad_logo.png" real_texture_placement="0 0 480 218" size="0 0 100% 100%" />
         </sprite>
         
-        <sprite name="pregame-mainmenu-wfg-logo-256x64">
-                <image texture="pregame/ui_pregame_mainmenu_wfg_logo.png" real-texture-placement="0 0 256 64" size="0 0 100% 100%" />
+        <sprite name="pregame_mainmenu_wfg_logo_256x64">
+                <image texture="pregame/ui_pregame_mainmenu_wfg_logo.png" real_texture_placement="0 0 256 64" size="0 0 100% 100%" />
         </sprite>
 
-        <sprite name="pregame-mainmenu-spbt">
-                <image texture="pregame/ui_pregame_mainmenu_spbt_over.png" real-texture-placement="1 1 151 142" size="0 0 100% 100%" />
+        <sprite name="pregame_mainmenu_spbt">
+                <image texture="pregame/ui_pregame_mainmenu_spbt_over.png" real_texture_placement="1 1 151 142" size="0 0 100% 100%" />
         </sprite>
 
-        <sprite name="pregame-mainmenu-mpbt">
-                <image texture="pregame/ui_pregame_mainmenu_mpbt_over.png" real-texture-placement="1 1 136 138" size="0 0 100% 100%" />
+        <sprite name="pregame_mainmenu_mpbt">
+                <image texture="pregame/ui_pregame_mainmenu_mpbt_over.png" real_texture_placement="1 1 136 138" size="0 0 100% 100%" />
         </sprite>
 
-        <sprite name="pregame-mainmenu-edbt">
-                <image texture="pregame/ui_pregame_mainmenu_edbt_over.png" real-texture-placement="1 1 203 161" size="0 0 100% 100%" />
+        <sprite name="pregame_mainmenu_edbt">
+                <image texture="pregame/ui_pregame_mainmenu_edbt_over.png" real_texture_placement="1 1 203 161" size="0 0 100% 100%" />
         </sprite>
 
         <!--
@@ -308,7 +308,7 @@
         -->
 
         <sprite name="black_bkg">
-                <image texture="black_bkg_16x16.png" texture-size="0 0 16 16" size="0 0 100% 100%" />
+                <image texture="black_bkg_16x16.png" texture_size="0 0 16 16" size="0 0 100% 100%" />
         </sprite>
         
         <!--
@@ -317,7 +317,7 @@
         ==========================================
         -->
 
-        <sprite name="session-tooltip-background">
+        <sprite name="session_tooltip_background">
                 <image backcolor="255 255 255" size="0 0 100% 100%" border="true" bordercolor="0 0 0"/>
         </sprite>
 
@@ -328,107 +328,107 @@
                 -->
 
                 <sprite name="session_panel_minimap_bg">
-                        <image texture="session/ui_session_panel_minimap_bg.png" texture-size="0 0 256 256" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_bg.png" texture_size="0 0 256 256" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_dummy">
-                        <image texture="session/ui_session_panel_minimap_dummy.png" texture-size="0 0 256 256" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_dummy.png" texture_size="0 0 256 256" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segleft1">
-                        <image texture="session/ui_session_panel_minimap_segleft1.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_segleft1.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segleft2">
-                        <image texture="session/ui_session_panel_minimap_segleft2.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_segleft2.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segleft3">
-                        <image texture="session/ui_session_panel_minimap_segleft3.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_segleft3.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segleft4">
-                        <image texture="session/ui_session_panel_minimap_segleft4.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_segleft4.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segbottom1">
-                        <image texture="session/ui_session_panel_minimap_segbottom1.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_segbottom1.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segbottom2">
-                        <image texture="session/ui_session_panel_minimap_segbottom2.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_segbottom2.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segbottom3">
-                        <image texture="session/ui_session_panel_minimap_segbottom3.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_segbottom3.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segbottom4">
-                        <image texture="session/ui_session_panel_minimap_segbottom4.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_segbottom4.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segtop1">
-                        <image texture="session/ui_session_panel_minimap_segtop1.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_segtop1.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segtop2">
-                        <image texture="session/ui_session_panel_minimap_segtop2.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_segtop2.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segtop3">
-                        <image texture="session/ui_session_panel_minimap_segtop3.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_segtop3.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <sprite name="session_panel_minimap_segtop4">
-                        <image texture="session/ui_session_panel_minimap_segtop4.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                        <image texture="session/ui_session_panel_minimap_segtop4.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
-                <sprite name="session_panel_minimap_segleft1-lit">
-                        <image texture="session/ui_session_panel_minimap_segleft1-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                <sprite name="session_panel_minimap_segleft1_lit">
+                        <image texture="session/ui_session_panel_minimap_segleft1_lit.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
-                <sprite name="session_panel_minimap_segleft2-lit">
-                        <image texture="session/ui_session_panel_minimap_segleft2-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                <sprite name="session_panel_minimap_segleft2_lit">
+                        <image texture="session/ui_session_panel_minimap_segleft2_lit.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
-                <sprite name="session_panel_minimap_segleft3-lit">
-                        <image texture="session/ui_session_panel_minimap_segleft3-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                <sprite name="session_panel_minimap_segleft3_lit">
+                        <image texture="session/ui_session_panel_minimap_segleft3_lit.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
-                <sprite name="session_panel_minimap_segleft4-lit">
-                        <image texture="session/ui_session_panel_minimap_segleft4-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                <sprite name="session_panel_minimap_segleft4_lit">
+                        <image texture="session/ui_session_panel_minimap_segleft4_lit.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
-                <sprite name="session_panel_minimap_segbottom1-lit">
-                        <image texture="session/ui_session_panel_minimap_segbottom1-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                <sprite name="session_panel_minimap_segbottom1_lit">
+                        <image texture="session/ui_session_panel_minimap_segbottom1_lit.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
-                <sprite name="session_panel_minimap_segbottom2-lit">
-                        <image texture="session/ui_session_panel_minimap_segbottom2-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                <sprite name="session_panel_minimap_segbottom2_lit">
+                        <image texture="session/ui_session_panel_minimap_segbottom2_lit.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
-                <sprite name="session_panel_minimap_segbottom3-lit">
-                        <image texture="session/ui_session_panel_minimap_segbottom3-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                <sprite name="session_panel_minimap_segbottom3_lit">
+                        <image texture="session/ui_session_panel_minimap_segbottom3_lit.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
-                <sprite name="session_panel_minimap_segbottom4-lit">
-                        <image texture="session/ui_session_panel_minimap_segbottom4-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                <sprite name="session_panel_minimap_segbottom4_lit">
+                        <image texture="session/ui_session_panel_minimap_segbottom4_lit.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
-                <sprite name="session_panel_minimap_segtop1-lit">
-                        <image texture="session/ui_session_panel_minimap_segtop1-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                <sprite name="session_panel_minimap_segtop1_lit">
+                        <image texture="session/ui_session_panel_minimap_segtop1_lit.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
-                <sprite name="session_panel_minimap_segtop2-lit">
-                        <image texture="session/ui_session_panel_minimap_segtop2-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                <sprite name="session_panel_minimap_segtop2_lit">
+                        <image texture="session/ui_session_panel_minimap_segtop2_lit.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
-                <sprite name="session_panel_minimap_segtop3-lit">
-                        <image texture="session/ui_session_panel_minimap_segtop3-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                <sprite name="session_panel_minimap_segtop3_lit">
+                        <image texture="session/ui_session_panel_minimap_segtop3_lit.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
-                <sprite name="session_panel_minimap_segtop4-lit">
-                        <image texture="session/ui_session_panel_minimap_segtop4-lit.png" texture-size="0 0 64 64" size="0 0 100% 100%" />
+                <sprite name="session_panel_minimap_segtop4_lit">
+                        <image texture="session/ui_session_panel_minimap_segtop4_lit.png" texture_size="0 0 64 64" size="0 0 100% 100%" />
                 </sprite>
 
                 <!--
@@ -437,12 +437,12 @@
                 ==========================================
                 -->
 
-                <sprite name="session_panel_status_bg-top">
-                        <image texture="session/ui_session_panel_status_bg-top.png" texture-size="0 0 256 256" size="0 0 100% 100%" />
+                <sprite name="session_panel_status_bg_top">
+                        <image texture="session/ui_session_panel_status_bg_top.png" texture_size="0 0 256 256" size="0 0 100% 100%" />
                 </sprite>
 
-                <sprite name="session_panel_status_bg-bottom">
-                        <image texture="session/ui_session_panel_status_bg-bottom.png" texture-size="0 0 256 256" size="0 0 100% 100%" />
+                <sprite name="session_panel_status_bg_bottom">
+                        <image texture="session/ui_session_panel_status_bg_bottom.png" texture_size="0 0 256 256" size="0 0 100% 100%" />
                 </sprite>
 
                 <!--
@@ -452,28 +452,28 @@
                 -->
 
                 <sprite name="resource_food_counter">
-                        <image texture="session/icons/ui_icon_sheet_statistic.png" real-texture-placement="0 128 64 192" texture-size="0 0 100% 100%" size="0 0 20 20" />
-                        <image texture="session/ui_session_panel_resource_counter.png" texture-size="0 0 64 64" size="21 0 100% 100%" />
+                        <image texture="session/icons/ui_icon_sheet_statistic.png" real_texture_placement="0 128 64 192" texture_size="0 0 100% 100%" size="0 0 20 20" />
+                        <image texture="session/ui_session_panel_resource_counter.png" texture_size="0 0 64 64" size="21 0 100% 100%" />
                 </sprite>
 
                 <sprite name="resource_wood_counter">
-                        <image texture="session/icons/ui_icon_sheet_statistic.png" real-texture-placement="64 128 128 192" texture-size="0 0 100% 100%" size="0 0 20 20" />
-                        <image texture="session/ui_session_panel_resource_counter.png" texture-size="0 0 64 64" size="21 0 100% 100%" />
+                        <image texture="session/icons/ui_icon_sheet_statistic.png" real_texture_placement="64 128 128 192" texture_size="0 0 100% 100%" size="0 0 20 20" />
+                        <image texture="session/ui_session_panel_resource_counter.png" texture_size="0 0 64 64" size="21 0 100% 100%" />
                 </sprite>
 
                 <sprite name="resource_stone_counter">
-                        <image texture="session/icons/ui_icon_sheet_statistic.png" real-texture-placement="128 128 192 192" texture-size="0 0 100% 100%" size="0 0 20 20" />
-                        <image texture="session/ui_session_panel_resource_counter.png" texture-size="0 0 64 64" size="21 0 100% 100%" />
+                        <image texture="session/icons/ui_icon_sheet_statistic.png" real_texture_placement="128 128 192 192" texture_size="0 0 100% 100%" size="0 0 20 20" />
+                        <image texture="session/ui_session_panel_resource_counter.png" texture_size="0 0 64 64" size="21 0 100% 100%" />
                 </sprite>
 
                 <sprite name="resource_ore_counter">
-                        <image texture="session/icons/ui_icon_sheet_statistic.png" real-texture-placement="192 128 256 192" texture-size="0 0 100% 100%" size="0 0 20 20" />
-                        <image texture="session/ui_session_panel_resource_counter.png" texture-size="0 0 64 64" size="21 0 100% 100%" />
+                        <image texture="session/icons/ui_icon_sheet_statistic.png" real_texture_placement="192 128 256 192" texture_size="0 0 100% 100%" size="0 0 20 20" />
+                        <image texture="session/ui_session_panel_resource_counter.png" texture_size="0 0 64 64" size="21 0 100% 100%" />
                 </sprite>
 
                 <sprite name="resource_population_counter">
-                        <image texture="session/icons/ui_icon_sheet_statistic.png" real-texture-placement="256 128 320 192" texture-size="0 0 100% 100%" size="0 0 20 20" />
-                        <image texture="session/ui_session_panel_resource_counter_long.png" texture-size="0 0 64 64" size="21 0 100% 100%" />
+                        <image texture="session/icons/ui_icon_sheet_statistic.png" real_texture_placement="256 128 320 192" texture_size="0 0 100% 100%" size="0 0 20 20" />
+                        <image texture="session/ui_session_panel_resource_counter_long.png" texture_size="0 0 64 64" size="21 0 100% 100%" />
                 </sprite>
 
                 <!--
@@ -483,7 +483,7 @@
                 -->
 
                 <sprite name="ui_icon_sheet_statistic">
-                        <image texture="session/icons/ui_icon_sheet_statistic.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/icons/ui_icon_sheet_statistic.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
                 <!--
@@ -494,28 +494,28 @@
 
                 <!-- Default (empty) portrait (circular). -->
                 <sprite name="ui_portrait_default_circle">
-                        <image texture="session/portraits/ui_portrait_default_circle.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                        <image texture="session/portraits/ui_portrait_default_circle.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
-                <sprite name="ui_portrait_default_circle-lit">
-			<effect add-color="42 42 42"/>
-                        <image texture="session/portraits/ui_portrait_default_circle.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                <sprite name="ui_portrait_default_circle_lit">
+			<effect add_color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_default_circle.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
-                <sprite name="ui_portrait_default_circle-grey">
+                <sprite name="ui_portrait_default_circle_grey">
 			<effect grayscale=""/>
-                        <image texture="session/portraits/ui_portrait_default_circle.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                        <image texture="session/portraits/ui_portrait_default_circle.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
 
                 <!-- Default (empty) portrait (square). -->
                 <sprite name="ui_portrait_default_square">
-                        <image texture="session/portraits/ui_portrait_default_square.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                        <image texture="session/portraits/ui_portrait_default_square.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
-                <sprite name="ui_portrait_default_square-lit">
-			<effect add-color="42 42 42"/>
-                        <image texture="session/portraits/ui_portrait_default_square.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                <sprite name="ui_portrait_default_square_lit">
+			<effect add_color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_default_square.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
-                <sprite name="ui_portrait_default_square-grey">
+                <sprite name="ui_portrait_default_square_grey">
 			<effect grayscale=""/>
-                        <image texture="session/portraits/ui_portrait_default_square.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                        <image texture="session/portraits/ui_portrait_default_square.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
 
                 <!--
@@ -525,15 +525,15 @@
                 -->
 
                 <sprite name="ui_portrait_sheet_action">
-                        <image texture="session/portraits/ui_portrait_sheet_action.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_action.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_action-lit">
-			<effect add-color="42 42 42"/>
-			<image texture="session/portraits/ui_portrait_sheet_action.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                <sprite name="ui_portrait_sheet_action_lit">
+			<effect add_color="42 42 42"/>
+			<image texture="session/portraits/ui_portrait_sheet_action.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_action-grey">
+                <sprite name="ui_portrait_sheet_action_grey">
 			<effect grayscale=""/>
-                        <image texture="session/portraits/ui_portrait_sheet_action.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_action.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
                 <!--
@@ -544,41 +544,41 @@
 
                 <!-- Pyrogenesis Dude portrait. -->
                 <sprite name="ui_portrait_unit_dude">
-                        <image texture="session/portraits/ui_portrait_unit_dude.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                        <image texture="session/portraits/ui_portrait_unit_dude.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
-                <sprite name="ui_portrait_unit_dude-lit">
-			<effect add-color="42 42 42"/>
-                        <image texture="session/portraits/ui_portrait_unit_dude.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                <sprite name="ui_portrait_unit_dude_lit">
+			<effect add_color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_unit_dude.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
-                <sprite name="ui_portrait_unit_dude-grey">
+                <sprite name="ui_portrait_unit_dude_grey">
 			<effect grayscale=""/>
-                        <image texture="session/portraits/ui_portrait_unit_dude.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                        <image texture="session/portraits/ui_portrait_unit_dude.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
 
                 <!-- Pyrogenesis Dudette portrait. -->
                 <sprite name="ui_portrait_unit_dudette">
-                        <image texture="session/portraits/ui_portrait_unit_dudette.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                        <image texture="session/portraits/ui_portrait_unit_dudette.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
-                <sprite name="ui_portrait_unit_dudette-lit">
-			<effect add-color="42 42 42"/>
-                        <image texture="session/portraits/ui_portrait_unit_dudette.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                <sprite name="ui_portrait_unit_dudette_lit">
+			<effect add_color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_unit_dudette.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
-                <sprite name="ui_portrait_unit_dudette-grey">
+                <sprite name="ui_portrait_unit_dudette_grey">
 			<effect grayscale=""/>
-                        <image texture="session/portraits/ui_portrait_unit_dudette.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                        <image texture="session/portraits/ui_portrait_unit_dudette.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
 
                 <!-- Deciduous Tree portrait. -->
                 <sprite name="ui_portrait_flora_deciduotree">
-                        <image texture="session/portraits/ui_portrait_flora_deciduotree.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                        <image texture="session/portraits/ui_portrait_flora_deciduotree.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
-                <sprite name="ui_portrait_flora_deciduotree-lit">
-			<effect add-color="42 42 42"/>
-                        <image texture="session/portraits/ui_portrait_flora_deciduotree.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                <sprite name="ui_portrait_flora_deciduotree_lit">
+			<effect add_color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_flora_deciduotree.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
-                <sprite name="ui_portrait_flora_deciduotree-grey">
+                <sprite name="ui_portrait_flora_deciduotree_grey">
 			<effect grayscale=""/>
-                        <image texture="session/portraits/ui_portrait_flora_deciduotree.png" texture-size="0 0 100% 100%" size="0 0 100% 100%" />
+                        <image texture="session/portraits/ui_portrait_flora_deciduotree.png" texture_size="0 0 100% 100%" size="0 0 100% 100%" />
                 </sprite>
 
                 <!--
@@ -588,15 +588,15 @@
                 -->
 
                 <sprite name="ui_portrait_sheet_civ_celt">
-                        <image texture="session/portraits/ui_portrait_sheet_civ_celt.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_celt.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_civ_celt-grey">
+                <sprite name="ui_portrait_sheet_civ_celt_grey">
 			<effect grayscale=""/>
-                        <image texture="session/portraits/ui_portrait_sheet_civ_celt.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_celt.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_civ_celt-lit">
-			<effect add-color="42 42 42"/>
-                        <image texture="session/portraits/ui_portrait_sheet_civ_celt.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                <sprite name="ui_portrait_sheet_civ_celt_lit">
+			<effect add_color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_celt.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
                 <!--
@@ -606,15 +606,15 @@
                 -->
 
                 <sprite name="ui_portrait_sheet_civ_hele">
-                        <image texture="session/portraits/ui_portrait_sheet_civ_hele.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_hele.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_civ_hele-grey">
+                <sprite name="ui_portrait_sheet_civ_hele_grey">
 			<effect grayscale=""/>
-                        <image texture="session/portraits/ui_portrait_sheet_civ_hele.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_hele.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_civ_hele-lit">
-			<effect add-color="42 42 42"/>
-                        <image texture="session/portraits/ui_portrait_sheet_civ_hele.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                <sprite name="ui_portrait_sheet_civ_hele_lit">
+			<effect add_color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_hele.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
                 <!--
@@ -624,15 +624,15 @@
                 -->
 
                 <sprite name="ui_portrait_sheet_civ_iber">
-                        <image texture="session/portraits/ui_portrait_sheet_civ_iber.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_iber.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_civ_iber-grey">
+                <sprite name="ui_portrait_sheet_civ_iber_grey">
 			<effect grayscale=""/>
-                        <image texture="session/portraits/ui_portrait_sheet_civ_iber.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_iber.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_civ_iber-lit">
-			<effect add-color="42 42 42"/>
-                        <image texture="session/portraits/ui_portrait_sheet_civ_iber.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                <sprite name="ui_portrait_sheet_civ_iber_lit">
+			<effect add_color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_iber.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
                 <!--
@@ -642,15 +642,15 @@
                 -->
 
                 <sprite name="ui_portrait_sheet_civ_kart">
-                        <image texture="session/portraits/ui_portrait_sheet_civ_kart.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_kart.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_civ_kart-grey">
+                <sprite name="ui_portrait_sheet_civ_kart_grey">
 			<effect grayscale=""/>
-                        <image texture="session/portraits/ui_portrait_sheet_civ_kart.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_kart.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_civ_kart-lit">
-			<effect add-color="42 42 42"/>
-                        <image texture="session/portraits/ui_portrait_sheet_civ_kart.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                <sprite name="ui_portrait_sheet_civ_kart_lit">
+			<effect add_color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_kart.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
                 <!--
@@ -660,15 +660,15 @@
                 -->
 
                 <sprite name="ui_portrait_sheet_civ_pers">
-                        <image texture="session/portraits/ui_portrait_sheet_civ_pers.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_pers.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_civ_pers-grey">
+                <sprite name="ui_portrait_sheet_civ_pers_grey">
 			<effect grayscale=""/>
-                        <image texture="session/portraits/ui_portrait_sheet_civ_pers.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_pers.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_civ_pers-lit">
-			<effect add-color="42 42 42"/>
-                        <image texture="session/portraits/ui_portrait_sheet_civ_pers.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                <sprite name="ui_portrait_sheet_civ_pers_lit">
+			<effect add_color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_pers.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
                 <!--
@@ -678,15 +678,15 @@
                 -->
 
                 <sprite name="ui_portrait_sheet_civ_rome">
-                        <image texture="session/portraits/ui_portrait_sheet_civ_rome.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_rome.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_civ_rome-grey">
+                <sprite name="ui_portrait_sheet_civ_rome_grey">
 			<effect grayscale=""/>
-                        <image texture="session/portraits/ui_portrait_sheet_civ_rome.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_rome.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
-                <sprite name="ui_portrait_sheet_civ_rome-lit">
-			<effect add-color="42 42 42"/>
-                        <image texture="session/portraits/ui_portrait_sheet_civ_rome.png" cell-size="64 64" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                <sprite name="ui_portrait_sheet_civ_rome_lit">
+			<effect add_color="42 42 42"/>
+                        <image texture="session/portraits/ui_portrait_sheet_civ_rome.png" cell_size="64 64" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
                 </sprite>
 
         <!--
@@ -886,41 +886,41 @@
         -->
 
         <sprite name="atlas_mainborder_lt_corner">
-                <image texture="atlas/atlas_mainborder_lt_corner.png" texture-size="0 0 64 64" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_mainborder_lt_corner.png" texture_size="0 0 64 64" size="0 0 100% 100%"/>
         </sprite>
 
         <sprite name="atlas_mainborder_rt_corner">
-                <image texture="atlas/atlas_mainborder_rt_corner.png" texture-size="0 0 256 64" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_mainborder_rt_corner.png" texture_size="0 0 256 64" size="0 0 100% 100%"/>
         </sprite>
 
         <sprite name="atlas_lb_corner">
-                <image texture="atlas/atlas_global_corner_lb.png" texture-size="0 0 32 32" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_corner_lb.png" texture_size="0 0 32 32" size="0 0 100% 100%"/>
         </sprite>
 
         <sprite name="atlas_rb_corner_x2">
-                <image texture="atlas/atlas_global_corner_rb_x2.png" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_corner_rb_x2.png" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
 		<image backcolor="184 190 201" size="0 100%-1 100% 100%"/>
 		<image backcolor="184 190 201" size="100%-1 0 100% 100%"/>
         </sprite>
 
         <sprite name="atlas_global_arrow_up">
-                <image texture="atlas/atlas_global_arrow_up.png" texture-size="0 0 8 4" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_arrow_up.png" texture_size="0 0 8 4" size="0 0 100% 100%"/>
         </sprite>
 
         <sprite name="atlas_global_arrow_dn">
-                <image texture="atlas/atlas_global_arrow_dn.png" texture-size="0 0 8 4" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_arrow_dn.png" texture_size="0 0 8 4" size="0 0 100% 100%"/>
         </sprite>
 
         <sprite name="atlas_global_arrow_lt">
-                <image texture="atlas/atlas_global_arrow_lt.png" texture-size="0 0 4 8" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_arrow_lt.png" texture_size="0 0 4 8" size="0 0 100% 100%"/>
         </sprite>
 
         <sprite name="atlas_global_arrow_rt">
-                <image texture="atlas/atlas_global_arrow_rt.png" texture-size="0 0 4 8" size="0 0 100% 100%"/>
+                <image texture="atlas/atlas_global_arrow_rt.png" texture_size="0 0 4 8" size="0 0 100% 100%"/>
         </sprite>
 
 	<sprite name="atlas_sheet_toolbar_button">
-		<image texture="atlas/atlas_sheet_toolbar_button.png" cell-size="15 15" texture-size="0 0 100% 100%" size="0 0 100% 100%"/>
+		<image texture="atlas/atlas_sheet_toolbar_button.png" cell_size="15 15" texture_size="0 0 100% 100%" size="0 0 100% 100%"/>
 	</sprite>
 
         <!--
@@ -931,10 +931,10 @@
 
         <!-- Exit Button -->
         <sprite name="exit_sprite">
-                <image texture="exit_button_16.png" texture-size="0 0 16 16" size="0 0 100% 100%" />
+                <image texture="exit_button_16.png" texture_size="0 0 16 16" size="0 0 100% 100%" />
         </sprite>
-        <sprite name="exit_sprite-over">
-                <image texture="exit_button_16-over.png" texture-size="0 0 16 16" size="0 0 100% 100%" />
+        <sprite name="exit_sprite_over">
+                <image texture="exit_button_16_over.png" texture_size="0 0 16 16" size="0 0 100% 100%" />
         </sprite>
 
         <!-- Some more temps /Gee -->
diff --git a/binaries/data/mods/official/gui/test/styles.xml b/binaries/data/mods/official/gui/test/styles.xml
index c7ffbca28a..66725bdbd9 100755
--- a/binaries/data/mods/official/gui/test/styles.xml
+++ b/binaries/data/mods/official/gui/test/styles.xml
@@ -9,74 +9,74 @@
 		enabled="true"
 		z="0"
 		absolute="true"
-		scrollbar-style="sb2"
-		buffer-zone="5"
+		scrollbar_style="sb2"
+		buffer_zone="5"
 	/>
 
 	<style name="button"
 		sprite="sprite1"
-		sprite-pressed="sprite1-pressed"
-		sprite-disabled="sprite1-disabled"
-		sprite-over="sprite1-over"
-		sprite2="sprite1-ch"
-		sprite2-pressed="sprite2-pressed"
-		sprite2-disabled="sprite2-disabled"
+		sprite_pressed="sprite1_pressed"
+		sprite_disabled="sprite1_disabled"
+		sprite_over="sprite1_over"
+		sprite2="sprite1_ch"
+		sprite2_pressed="sprite2_pressed"
+		sprite2_disabled="sprite2_disabled"
 	/>
 
 	<style name="resource_counter"
-		text-valign="bottom"
-		text-align="right"
+		text_valign="bottom"
+		text_align="right"
 		font="prospero16"
 		textcolor="255 255 255"
-		tooltip-style="session-tooltip"
+		tooltip_style="session_tooltip"
 		ghost="false"
 	/>
 
 	<!-- Empty entity portrait. -->
 	<style name="portrait"
 		sprite="ui_portrait_default_square"
-		sprite-over="ui_portrait_default_square-lit"
-		sprite-disabled="ui_portrait_default_square-grey"
-		tooltip-style="session-tooltip"
-		text-align="right"
+		sprite_over="ui_portrait_default_square_lit"
+		sprite_disabled="ui_portrait_default_square_grey"
+		tooltip_style="session_tooltip"
+		text_align="right"
 		textcolor="255 255 255"
 	/>
 
 	<style name="action"
 		sprite="ui_portrait_default_circle"
-		sprite-over="ui_portrait_default_circle-lit"
-		sprite-disabled="ui_portrait_default_circle-grey"
-		tooltip-style="session-tooltip"
-		text-align="right"
+		sprite_over="ui_portrait_default_circle_lit"
+		sprite_disabled="ui_portrait_default_circle_grey"
+		tooltip_style="session_tooltip"
+		text_align="right"
 		textcolor="255 255 255"
 	/>
 
 	<!-- Entity progress bar. -->
 	<style name="group_portrait_bar"
-		sprite-background=""
-		sprite-bar="green-bar"
-		tooltip-style="session-tooltip"
+		sprite_background=""
+		sprite_bar="green_bar"
+		tooltip_style="session_tooltip"
 		ghost="true"
 	/>
 
 	<style name="up_bar"
-		sprite-background=""
-		sprite-bar="yellow-bar"
-		tooltip-style="session-tooltip"
+		sprite_background=""
+		sprite_bar="yellow_bar"
+		tooltip_style="session_tooltip"
 		ghost="true"
 	/>
 
 	<style name="blue_bar"
-		sprite-background=""
-		sprite-bar="blue-bar"
-		tooltip-style="session-tooltip"
+		sprite_background=""
+		sprite_bar="blue_bar"
+		tooltip_style="session_tooltip"
 		ghost="true"
 	/>
 
 	<style name="blue_bar_outlined"
-		sprite-background="only-black-border"
-		sprite-bar="blue-bar-outlined"
-		tooltip-style="session-tooltip"
+		sprite_background="only_black_border"
+		sprite_bar="blue_bar_outlined"
+		tooltip_style="session_tooltip"
 		ghost="true"
 	/>
 </styles>
diff --git a/source/gui/CButton.cpp b/source/gui/CButton.cpp
index 44c8352ec0..22cd3253f3 100755
--- a/source/gui/CButton.cpp
+++ b/source/gui/CButton.cpp
@@ -17,22 +17,22 @@ using namespace std;
 //-------------------------------------------------------------------
 CButton::CButton()
 {
-	AddSetting(GUIST_float,					"buffer-zone");
+	AddSetting(GUIST_float,					"buffer_zone");
 	AddSetting(GUIST_CGUIString,			"caption");
 	AddSetting(GUIST_CStr,					"font");
 	AddSetting(GUIST_CGUISpriteInstance,	"sprite");
-	AddSetting(GUIST_CGUISpriteInstance,	"sprite-over");
-	AddSetting(GUIST_CGUISpriteInstance,	"sprite-pressed");
-	AddSetting(GUIST_CGUISpriteInstance,	"sprite-disabled");
-	AddSetting(GUIST_int,					"cell-id");
-	AddSetting(GUIST_EAlign,				"text-align");
-	AddSetting(GUIST_EVAlign,				"text-valign");
+	AddSetting(GUIST_CGUISpriteInstance,	"sprite_over");
+	AddSetting(GUIST_CGUISpriteInstance,	"sprite_pressed");
+	AddSetting(GUIST_CGUISpriteInstance,	"sprite_disabled");
+	AddSetting(GUIST_int,					"cell_id");
+	AddSetting(GUIST_EAlign,				"text_align");
+	AddSetting(GUIST_EVAlign,				"text_valign");
 	AddSetting(GUIST_CColor,				"textcolor");
-	AddSetting(GUIST_CColor,				"textcolor-over");
-	AddSetting(GUIST_CColor,				"textcolor-pressed");
-	AddSetting(GUIST_CColor,				"textcolor-disabled");
+	AddSetting(GUIST_CColor,				"textcolor_over");
+	AddSetting(GUIST_CColor,				"textcolor_pressed");
+	AddSetting(GUIST_CColor,				"textcolor_disabled");
 	AddSetting(GUIST_CStr,					"tooltip");
-	AddSetting(GUIST_CStr,					"tooltip-style");
+	AddSetting(GUIST_CStr,					"tooltip_style");
 
 	// Add text
 	AddText(new SGUIText());
@@ -59,7 +59,7 @@ void CButton::SetupText()
 	GUI<CGUIString>::GetSetting(this, "caption", caption);
 
 	float buffer_zone=0.f;
-	GUI<float>::GetSetting(this, "buffer-zone", buffer_zone);
+	GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
 	*m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, font, m_CachedActualSize.GetWidth(), buffer_zone, this);
 
 	CalculateTextPosition(m_CachedActualSize, m_TextPos, *m_GeneratedTexts[0]);
@@ -90,10 +90,10 @@ void CButton::Draw()
 	int cell_id;
 
 	GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);
-	GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite-over", sprite_over);
-	GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite-pressed", sprite_pressed);
-	GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite-disabled", sprite_disabled);
-	GUI<int>::GetSetting(this, "cell-id", cell_id);
+	GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_over", sprite_over);
+	GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_pressed", sprite_pressed);
+	GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_disabled", sprite_disabled);
+	GUI<int>::GetSetting(this, "cell_id", cell_id);
 
 	DrawButton(m_CachedActualSize,
 			   bz,
diff --git a/source/gui/CCheckBox.cpp b/source/gui/CCheckBox.cpp
index 3b2f3e818a..8079f14a4f 100755
--- a/source/gui/CCheckBox.cpp
+++ b/source/gui/CCheckBox.cpp
@@ -38,16 +38,16 @@ CCheckBox::CCheckBox()
 	AddSetting(GUIST_CGUIString,			"caption");
 	AddSetting(GUIST_bool,					"checked");
 	AddSetting(GUIST_CGUISpriteInstance,	"sprite");
-	AddSetting(GUIST_CGUISpriteInstance,	"sprite-over");
-	AddSetting(GUIST_CGUISpriteInstance,	"sprite-pressed");
-	AddSetting(GUIST_CGUISpriteInstance,	"sprite-disabled");
+	AddSetting(GUIST_CGUISpriteInstance,	"sprite_over");
+	AddSetting(GUIST_CGUISpriteInstance,	"sprite_pressed");
+	AddSetting(GUIST_CGUISpriteInstance,	"sprite_disabled");
 	AddSetting(GUIST_CGUISpriteInstance,	"sprite2");
-	AddSetting(GUIST_CGUISpriteInstance,	"sprite2-over");
-	AddSetting(GUIST_CGUISpriteInstance,	"sprite2-pressed");
-	AddSetting(GUIST_CGUISpriteInstance,	"sprite2-disabled");
-	AddSetting(GUIST_int,					"square-side");
+	AddSetting(GUIST_CGUISpriteInstance,	"sprite2_over");
+	AddSetting(GUIST_CGUISpriteInstance,	"sprite2_pressed");
+	AddSetting(GUIST_CGUISpriteInstance,	"sprite2_disabled");
+	AddSetting(GUIST_int,					"square_side");
 	AddSetting(GUIST_CStr,					"tooltip");
-	AddSetting(GUIST_CStr,					"tooltip-style");
+	AddSetting(GUIST_CStr,					"tooltip_style");
 
 	// Add text
 	AddText(new SGUIText());
@@ -68,7 +68,7 @@ void CCheckBox::SetupText()
 	CGUIString caption;
 	//int square_side;
 	GUI<CGUIString>::GetSetting(this, "caption", caption);
-	//GUI<CGUIString>::GetSetting(this, "square-side", square_side);
+	//GUI<CGUIString>::GetSetting(this, "square_side", square_side);
 
 	// TODO Gee: Establish buffer zones
 	// TODO Gee: research if even "default" should be hardcoded.
@@ -109,7 +109,7 @@ void CCheckBox::Draw()
 	//////////
 
 	int square_side;
-	GUI<int>::GetSetting(this, "square-side", square_side);
+	GUI<int>::GetSetting(this, "square_side", square_side);
 
 	float bz = GetBufferedZ();
 
@@ -130,16 +130,16 @@ void CCheckBox::Draw()
 	if (checked)
 	{
 		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2", sprite);
-		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2-over", sprite_over);
-		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2-pressed", sprite_pressed);
-		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2-disabled", sprite_disabled);
+		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2_over", sprite_over);
+		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2_pressed", sprite_pressed);
+		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite2_disabled", sprite_disabled);
 	}
 	else
 	{
 		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);
-		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite-over", sprite_over);
-		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite-pressed", sprite_pressed);
-		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite-disabled", sprite_disabled);
+		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_over", sprite_over);
+		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_pressed", sprite_pressed);
+		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_disabled", sprite_disabled);
 	}
 
 	DrawButton(rect, 
diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp
index d91ca840e4..be4088f0e1 100755
--- a/source/gui/CGUI.cpp
+++ b/source/gui/CGUI.cpp
@@ -1447,7 +1447,7 @@ void CGUI::Xeromyces_ReadImage(XMBElement Element, CXeromyces* pFile, CGUISprite
 			else image.m_Size = ca;
 		}
 		else
-		if (attr_name == "texture-size")
+		if (attr_name == "texture_size")
 		{
 			CClientArea ca;
 			if (!GUI<CClientArea>::ParseString(attr_value, ca))
@@ -1455,7 +1455,7 @@ void CGUI::Xeromyces_ReadImage(XMBElement Element, CXeromyces* pFile, CGUISprite
 			else image.m_TextureSize = ca;
 		}
 		else
-		if (attr_name == "real-texture-placement")
+		if (attr_name == "real_texture_placement")
 		{
 			CRect rect;
 			if (!GUI<CRect>::ParseString(attr_value, rect))
@@ -1463,7 +1463,7 @@ void CGUI::Xeromyces_ReadImage(XMBElement Element, CXeromyces* pFile, CGUISprite
 			else image.m_TexturePlacementInFile = rect;
 		}
 		else
-		if (attr_name == "cell-size")
+		if (attr_name == "cell_size")
 		{
 			CSize size;
 			if (!GUI<CSize>::ParseString(attr_value, size))
@@ -1471,7 +1471,7 @@ void CGUI::Xeromyces_ReadImage(XMBElement Element, CXeromyces* pFile, CGUISprite
 			else image.m_CellSize = size;
 		}
 		else
-		if (attr_name == "z-level")
+		if (attr_name == "z_level")
 		{
 			float z_level;
 			if (!GUI<float>::ParseString(attr_value, z_level))
@@ -1559,8 +1559,8 @@ void CGUI::Xeromyces_ReadEffects(XMBElement Element, CXeromyces* pFile, SGUIImag
 		} \
 		else
 
-		COLOR("add-color", AddColor)
-		COLOR("multiply-color", MultiplyColor)
+		COLOR("add_color", AddColor)
+		COLOR("multiply_color", MultiplyColor)
 		BOOL("grayscale", Greyscale)
 
 		{
@@ -1636,7 +1636,7 @@ void CGUI::Xeromyces_ReadScrollBarStyle(XMBElement Element, CXeromyces* pFile)
 			scrollbar.m_Width = f;
 		}
 		else
-		if (attr_name == "minimum-bar-size")
+		if (attr_name == "minimum_bar_size")
 		{
 			float f;
 			if (!GUI<float>::ParseString(attr_value, f))
@@ -1646,40 +1646,40 @@ void CGUI::Xeromyces_ReadScrollBarStyle(XMBElement Element, CXeromyces* pFile)
 			scrollbar.m_MinimumBarSize = f;
 		}
 		else
-		if (attr_name == "sprite-button-top")
+		if (attr_name == "sprite_button_top")
 			scrollbar.m_SpriteButtonTop = attr_value;
 		else
-		if (attr_name == "sprite-button-top-pressed")
+		if (attr_name == "sprite_button_top-pressed")
 			scrollbar.m_SpriteButtonTopPressed = attr_value;
 		else
-		if (attr_name == "sprite-button-top-disabled")
+		if (attr_name == "sprite_button_top-disabled")
 			scrollbar.m_SpriteButtonTopDisabled = attr_value;
 		else
-		if (attr_name == "sprite-button-top-over")
+		if (attr_name == "sprite_button_top-over")
 			scrollbar.m_SpriteButtonTopOver = attr_value;
 		else
-		if (attr_name == "sprite-button-bottom")
+		if (attr_name == "sprite_button_bottom")
 			scrollbar.m_SpriteButtonBottom = attr_value;
 		else
-		if (attr_name == "sprite-button-bottom-pressed")
+		if (attr_name == "sprite_button_bottom-pressed")
 			scrollbar.m_SpriteButtonBottomPressed = attr_value;
 		else
-		if (attr_name == "sprite-button-bottom-disabled")
+		if (attr_name == "sprite_button_bottom-disabled")
 			scrollbar.m_SpriteButtonBottomDisabled = attr_value;
 		else
-		if (attr_name == "sprite-button-bottom-over")
+		if (attr_name == "sprite_button_bottom-over")
 			scrollbar.m_SpriteButtonBottomOver = attr_value;
 		else
-		if (attr_name == "sprite-back-vertical")
+		if (attr_name == "sprite_back_vertical")
 			scrollbar.m_SpriteBackVertical = attr_value;
 		else
-		if (attr_name == "sprite-bar-vertical")
+		if (attr_name == "sprite_bar-vertical")
 			scrollbar.m_SpriteBarVertical = attr_value;
 		else
-		if (attr_name == "sprite-bar-vertical-over")
+		if (attr_name == "sprite_bar-vertical-over")
 			scrollbar.m_SpriteBarVerticalOver = attr_value;
 		else
-		if (attr_name == "sprite-bar-vertical-pressed")
+		if (attr_name == "sprite_bar-vertical-pressed")
 			scrollbar.m_SpriteBarVerticalPressed = attr_value;
 	}
 
@@ -1720,7 +1720,7 @@ void CGUI::Xeromyces_ReadIcon(XMBElement Element, CXeromyces* pFile)
 			icon.m_Size = size;
 		}
 		else
-		if (attr_name == "cell-id")
+		if (attr_name == "cell_id")
 		{
 			int cell_id;
 			if (!GUI<int>::ParseString(attr_value, cell_id))
diff --git a/source/gui/CImage.cpp b/source/gui/CImage.cpp
index d9ffecf2e1..ab6c94726a 100755
--- a/source/gui/CImage.cpp
+++ b/source/gui/CImage.cpp
@@ -18,9 +18,9 @@ using namespace std;
 CImage::CImage()
 {
 	AddSetting(GUIST_CGUISpriteInstance,	"sprite");
-	AddSetting(GUIST_int,					"cell-id");
+	AddSetting(GUIST_int,					"cell_id");
 	AddSetting(GUIST_CStr,				"tooltip");
-	AddSetting(GUIST_CStr,				"tooltip-style");
+	AddSetting(GUIST_CStr,				"tooltip_style");
 }
 
 CImage::~CImage()
@@ -36,7 +36,7 @@ void CImage::Draw()
 		CGUISpriteInstance *sprite;
 		int cell_id;
 		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);
-		GUI<int>::GetSetting(this, "cell-id", cell_id);
+		GUI<int>::GetSetting(this, "cell_id", cell_id);
 
 		GetGUI()->DrawSprite(*sprite, cell_id, bz, m_CachedActualSize);
 	}
diff --git a/source/gui/CInput.cpp b/source/gui/CInput.cpp
index 9627379a6f..f9d2bd935f 100755
--- a/source/gui/CInput.cpp
+++ b/source/gui/CInput.cpp
@@ -25,16 +25,16 @@ using namespace std;
 //-------------------------------------------------------------------
 CInput::CInput() : m_iBufferPos(0)
 {
-	AddSetting(GUIST_float,					"buffer-zone");
+	AddSetting(GUIST_float,					"buffer_zone");
 	AddSetting(GUIST_CStrW,					"caption");
 	AddSetting(GUIST_CStr,					"font");
 	AddSetting(GUIST_bool,					"scrollbar");
-	AddSetting(GUIST_CStr,					"scrollbar-style");
+	AddSetting(GUIST_CStr,					"scrollbar_style");
 	AddSetting(GUIST_CGUISpriteInstance,	"sprite");
-	AddSetting(GUIST_int,					"cell-id");
+	AddSetting(GUIST_int,					"cell_id");
 	AddSetting(GUIST_CColor,				"textcolor");
 	AddSetting(GUIST_CStr,					"tooltip");
-	AddSetting(GUIST_CStr,					"tooltip-style");
+	AddSetting(GUIST_CStr,					"tooltip_style");
 	// TODO Gee: (2004-08-14)
 	//  Add a setting for buffer zone
 	//AddSetting(GUIST_int,			"
@@ -213,7 +213,7 @@ void CInput::HandleMessage(const SGUIMessage &Message)
 		}
 
 		// Update scrollbar
-		if (Message.value == CStr("scrollbar-style"))
+		if (Message.value == CStr("scrollbar_style"))
 		{
 			CStr scrollbar_style;
 			GUI<CStr>::GetSetting(this, Message.value, scrollbar_style);
@@ -346,7 +346,7 @@ void CInput::Draw()
 		CGUISpriteInstance *sprite;
 		int cell_id;
 		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);
-		GUI<int>::GetSetting(this, "cell-id", cell_id);
+		GUI<int>::GetSetting(this, "cell_id", cell_id);
 
 		GetGUI()->DrawSprite(*sprite, cell_id, bz, m_CachedActualSize);
 
diff --git a/source/gui/CProgressBar.cpp b/source/gui/CProgressBar.cpp
index 1fc487e932..9e6febffda 100755
--- a/source/gui/CProgressBar.cpp
+++ b/source/gui/CProgressBar.cpp
@@ -17,11 +17,11 @@ using namespace std;
 //-------------------------------------------------------------------
 CProgressBar::CProgressBar()
 {
-	AddSetting(GUIST_CGUISpriteInstance,	"sprite-background");
-	AddSetting(GUIST_CGUISpriteInstance,	"sprite-bar");
+	AddSetting(GUIST_CGUISpriteInstance,	"sprite_background");
+	AddSetting(GUIST_CGUISpriteInstance,	"sprite_bar");
 	AddSetting(GUIST_float,					"caption"); // aka value from 0 to 100
 	AddSetting(GUIST_CStr,					"tooltip");
-	AddSetting(GUIST_CStr,					"tooltip-style");
+	AddSetting(GUIST_CStr,					"tooltip_style");
 }
 
 CProgressBar::~CProgressBar()
@@ -63,9 +63,9 @@ void CProgressBar::Draw()
 		CGUISpriteInstance *sprite_background, *sprite_bar;
 		int cell_id;
 		float value;
-		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite-background", sprite_background);
-		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite-bar", sprite_bar);
-		GUI<int>::GetSetting(this, "cell-id", cell_id);
+		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_background", sprite_background);
+		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite_bar", sprite_bar);
+		GUI<int>::GetSetting(this, "cell_id", cell_id);
 		GUI<float>::GetSetting(this, "caption", value);
 
 		GetGUI()->DrawSprite(*sprite_background, cell_id, bz, m_CachedActualSize);
diff --git a/source/gui/CText.cpp b/source/gui/CText.cpp
index 0083989d02..f0a783dc3e 100755
--- a/source/gui/CText.cpp
+++ b/source/gui/CText.cpp
@@ -20,18 +20,18 @@ using namespace std;
 //-------------------------------------------------------------------
 CText::CText()
 {
-	AddSetting(GUIST_float,					"buffer-zone");
+	AddSetting(GUIST_float,					"buffer_zone");
 	AddSetting(GUIST_CGUIString,			"caption");
 	AddSetting(GUIST_CStr,					"font");
 	AddSetting(GUIST_bool,					"scrollbar");
-	AddSetting(GUIST_CStr,					"scrollbar-style");
+	AddSetting(GUIST_CStr,					"scrollbar_style");
 	AddSetting(GUIST_CGUISpriteInstance,	"sprite");
-	AddSetting(GUIST_int,					"cell-id");
-	AddSetting(GUIST_EAlign,				"text-align");
-	AddSetting(GUIST_EVAlign,				"text-valign");
+	AddSetting(GUIST_int,					"cell_id");
+	AddSetting(GUIST_EAlign,				"text_align");
+	AddSetting(GUIST_EVAlign,				"text_valign");
 	AddSetting(GUIST_CColor,				"textcolor");
 	AddSetting(GUIST_CStr,					"tooltip");
-	AddSetting(GUIST_CStr,					"tooltip-style");
+	AddSetting(GUIST_CStr,					"tooltip_style");
 
 	//GUI<bool>::SetSetting(this, "ghost", true);
 	GUI<bool>::SetSetting(this, "scrollbar", false);
@@ -75,7 +75,7 @@ void CText::SetupText()
 
 
     float buffer_zone=0.f;
-	GUI<float>::GetSetting(this, "buffer-zone", buffer_zone);
+	GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
 	*m_GeneratedTexts[0] = GetGUI()->GenerateText(caption, font, width, buffer_zone, this);
 
 	if (! scrollbar)
@@ -115,7 +115,7 @@ void CText::HandleMessage(const SGUIMessage &Message)
 		}
 
 		// Update scrollbar
-		if (Message.value == CStr("scrollbar-style"))
+		if (Message.value == CStr("scrollbar_style"))
 		{
 			CStr scrollbar_style;
 			GUI<CStr>::GetSetting(this, Message.value, scrollbar_style);
@@ -166,7 +166,7 @@ void CText::Draw()
 		CGUISpriteInstance *sprite;
 		int cell_id;
 		GUI<CGUISpriteInstance>::GetSettingPointer(this, "sprite", sprite);
-		GUI<int>::GetSetting(this, "cell-id", cell_id);
+		GUI<int>::GetSetting(this, "cell_id", cell_id);
 
 		GetGUI()->DrawSprite(*sprite, cell_id, bz, m_CachedActualSize);
 
diff --git a/source/gui/CTooltip.cpp b/source/gui/CTooltip.cpp
index 5b5ffd9b5e..4115e23fe2 100644
--- a/source/gui/CTooltip.cpp
+++ b/source/gui/CTooltip.cpp
@@ -10,7 +10,7 @@
 CTooltip::CTooltip()
 {
 	// If the tooltip is an object by itself:
-	AddSetting(GUIST_float,					"buffer-zone");
+	AddSetting(GUIST_float,					"buffer_zone");
 	AddSetting(GUIST_CGUIString,			"caption");
 	AddSetting(GUIST_CStr,					"font");
 	AddSetting(GUIST_CGUISpriteInstance,	"sprite");
@@ -21,8 +21,8 @@ CTooltip::CTooltip()
 	AddSetting(GUIST_EVAlign,				"anchor");
 
 	// If the tooltip is just a reference to another object:
-	AddSetting(GUIST_CStr,					"use-object");
-	AddSetting(GUIST_bool,					"hide-object");
+	AddSetting(GUIST_CStr,					"use_object");
+	AddSetting(GUIST_bool,					"hide_object");
 
 	// Private settings:
 	AddSetting(GUIST_CPos,					"_mousepos");
@@ -52,7 +52,7 @@ void CTooltip::SetupText()
 		font = "default";
 
 	float buffer_zone = 0.f;
-	GUI<float>::GetSetting(this, "buffer-zone", buffer_zone);
+	GUI<float>::GetSetting(this, "buffer_zone", buffer_zone);
 
 	CGUIString caption;
 	GUI<CGUIString>::GetSetting(this, "caption", caption);
@@ -124,7 +124,7 @@ void CTooltip::HandleMessage(const SGUIMessage &Message)
 		// Don't update the text when the size changes, because the size is
 		// changed whenever the text is updated ( => infinite recursion)
 		if (/*Message.value == "size" ||*/ Message.value == "caption" ||
-			Message.value == "font" || Message.value == "buffer-zone")
+			Message.value == "font" || Message.value == "buffer_zone")
 		{
 			SetupText();
 		}
diff --git a/source/gui/GUIRenderer.cpp b/source/gui/GUIRenderer.cpp
index 6046cb44ee..18ea097c5d 100644
--- a/source/gui/GUIRenderer.cpp
+++ b/source/gui/GUIRenderer.cpp
@@ -81,7 +81,7 @@ public:
 		// Otherwise, complain.
 		else
 		{
-			LOG(WARNING, "gui", "add-color effect has some components >127 and some <127 - colours will be clamped");
+			LOG(WARNING, "gui", "add_color effect has some components >127 and some <127 - colours will be clamped");
 			m_Color = CColor(c.r+0.5f, c.g+0.5f, c.b+0.5f, c.a+0.5f);
 			m_Method = ADD_SIGNED;
 		}
@@ -160,7 +160,7 @@ public:
 				;
 			else
 				// Oops - trying to multiply by >4
-				LOG(WARNING, "gui", "multiply-color effect has a component >1020 - colours will be clamped");
+				LOG(WARNING, "gui", "multiply_color effect has a component >1020 - colours will be clamped");
 
 			m_Color = CColor(c.r/4.f, c.g/4.f, c.b/4.f, c.a);
 			m_Scale = 4;
@@ -417,12 +417,12 @@ void GUIRenderer::UpdateDrawCallCache(DrawCalls &Calls, CStr &SpriteName, CRect
 			// Get the texture's position/size for the block:
 			CRect BlockTex;
 
-			// "real-texture-placement" overrides everything
+			// "real_texture_placement" overrides everything
 			if (cit->m_TexturePlacementInFile != CRect())
 			{
 				BlockTex = cit->m_TexturePlacementInFile;
 			}
-			// Check whether this sprite has "cell-size" set
+			// Check whether this sprite has "cell_size" set
 			else if (cit->m_CellSize != CSize())
 			{
 				int cols = t_w / (int)cit->m_CellSize.cx;
diff --git a/source/gui/GUITooltip.cpp b/source/gui/GUITooltip.cpp
index 09352ae2ab..3e742487e1 100644
--- a/source/gui/GUITooltip.cpp
+++ b/source/gui/GUITooltip.cpp
@@ -66,8 +66,8 @@ const double CooldownTime = 0.25; // TODO: Don't hard-code this value
 
 static bool GetTooltip(IGUIObject* obj, CStr &style)
 {
-	if (obj && obj->SettingExists("tooltip-style")
-		&& GUI<CStr>::GetSetting(obj, "tooltip-style", style) == PS_OK)
+	if (obj && obj->SettingExists("tooltip_style")
+		&& GUI<CStr>::GetSetting(obj, "tooltip_style", style) == PS_OK)
 	{
 		if (style.Length() == 0)
 		{
@@ -95,7 +95,7 @@ static void ShowTooltip(IGUIObject* obj, CPos pos, CStr& style, CGUI* gui)
 {
 	assert(obj);
 
-	// Get the object referenced by 'tooltip-style'
+	// Get the object referenced by 'tooltip_style'
 	IGUIObject* tooltipobj = gui->FindObjectByName("__tooltip_"+style);
 	if (! tooltipobj)
 	{
@@ -106,7 +106,7 @@ static void ShowTooltip(IGUIObject* obj, CPos pos, CStr& style, CGUI* gui)
 	IGUIObject* usedobj = tooltipobj; // object actually used to display the tooltip in
 
 	CStr usedObjectName;
-	if (GUI<CStr>::GetSetting(tooltipobj, "use-object", usedObjectName) == PS_OK
+	if (GUI<CStr>::GetSetting(tooltipobj, "use_object", usedObjectName) == PS_OK
 		&& usedObjectName.Length())
 	{
 		usedobj = gui->FindObjectByName(usedObjectName);
@@ -116,7 +116,7 @@ static void ShowTooltip(IGUIObject* obj, CPos pos, CStr& style, CGUI* gui)
 			return;
 		}
 
-		// Unhide the object. (If it had use-object and hide-object="true",
+		// Unhide the object. (If it had use_object and hide_object="true",
 		// still unhide it, because the used object might be hidden by default)
 		GUI<bool>::SetSetting(usedobj, "hidden", false);
 	}
@@ -156,7 +156,7 @@ static void HideTooltip(CStr& style, CGUI* gui)
 	}
 
 	CStr usedObjectName;
-	if (GUI<CStr>::GetSetting(tooltipobj, "use-object", usedObjectName) == PS_OK
+	if (GUI<CStr>::GetSetting(tooltipobj, "use_object", usedObjectName) == PS_OK
 		&& usedObjectName.Length())
 	{
 		IGUIObject* usedobj = gui->FindObjectByName(usedObjectName);
@@ -172,9 +172,9 @@ static void HideTooltip(CStr& style, CGUI* gui)
 
 
 		bool hideobject = true;
-		GUI<bool>::GetSetting(tooltipobj, "hide-object", hideobject);
+		GUI<bool>::GetSetting(tooltipobj, "hide_object", hideobject);
 
-		// If hide-object was enabled, hide it
+		// If hide_object was enabled, hide it
 		if (hideobject)
 			GUI<bool>::SetSetting(usedobj, "hidden", true);
 	}
diff --git a/source/gui/IGUIButtonBehavior.cpp b/source/gui/IGUIButtonBehavior.cpp
index 81e4ccf890..ce17cac3d0 100755
--- a/source/gui/IGUIButtonBehavior.cpp
+++ b/source/gui/IGUIButtonBehavior.cpp
@@ -64,9 +64,9 @@ CColor IGUIButtonBehavior::ChooseColor()
 
 	// Yes, the object must possess these settings. They are standard
 	GUI<CColor>::GetSetting(this, "textcolor", color);
-	GUI<CColor>::GetSetting(this, "textcolor-over", color_over);
-	GUI<CColor>::GetSetting(this, "textcolor-pressed", color_pressed);
-	GUI<CColor>::GetSetting(this, "textcolor-disabled", color_disabled);
+	GUI<CColor>::GetSetting(this, "textcolor_over", color_over);
+	GUI<CColor>::GetSetting(this, "textcolor_pressed", color_pressed);
+	GUI<CColor>::GetSetting(this, "textcolor_disabled", color_disabled);
 
 	bool enabled;
 	GUI<bool>::GetSetting(this, "enabled", enabled);
diff --git a/source/gui/IGUITextOwner.cpp b/source/gui/IGUITextOwner.cpp
index 6553c3a334..12ce191f55 100755
--- a/source/gui/IGUITextOwner.cpp
+++ b/source/gui/IGUITextOwner.cpp
@@ -46,7 +46,7 @@ void IGUITextOwner::HandleMessage(const SGUIMessage &Message)
 		if (Message.value == "size" || Message.value == "z" ||
 			Message.value == "absolute" || Message.value == "caption" ||
 			Message.value == "font" || Message.value == "textcolor" ||
-			Message.value == "buffer-zone")
+			Message.value == "buffer_zone")
 		{
 			SetupText();
 		}
@@ -80,8 +80,8 @@ void IGUITextOwner::CalculateTextPosition(CRect &ObjSize, CPos &TextPos, SGUITex
 {
 	EAlign align;
 	EVAlign valign;
-	GUI<EAlign>::GetSetting(this, "text-align", align);
-	GUI<EVAlign>::GetSetting(this, "text-valign", valign);
+	GUI<EAlign>::GetSetting(this, "text_align", align);
+	GUI<EVAlign>::GetSetting(this, "text_valign", valign);
 
 	switch (align)
 	{
diff --git a/source/gui/MiniMap.cpp b/source/gui/MiniMap.cpp
index 5eac76abc2..2d6f99c174 100755
--- a/source/gui/MiniMap.cpp
+++ b/source/gui/MiniMap.cpp
@@ -31,9 +31,9 @@ CMiniMap::CMiniMap()
     : m_Handle(0), m_Data(NULL), m_MapSize(0), m_Terrain(0),
     m_UnitManager(0)
 {
-    AddSetting(GUIST_CColor,	"fov-wedge-color");
+    AddSetting(GUIST_CColor,	"fov_wedge_color");
 	AddSetting(GUIST_CStr,		"tooltip");
-	AddSetting(GUIST_CStr,		"tooltip-style");
+	AddSetting(GUIST_CStr,		"tooltip_style");
 }
 
 CMiniMap::~CMiniMap()
diff --git a/source/gui/scripting/JSInterface_IGUIObject.cpp b/source/gui/scripting/JSInterface_IGUIObject.cpp
index d5b869e0f8..7e56ef9c6e 100755
--- a/source/gui/scripting/JSInterface_IGUIObject.cpp
+++ b/source/gui/scripting/JSInterface_IGUIObject.cpp
@@ -76,12 +76,6 @@ JSBool JSI_IGUIObject::getProperty(JSContext* cx, JSObject* obj, jsval id, jsval
 	// Handle all other properties
 	else
 	{
-		// Allow e.g. "cell_id" as a synonym for "cell-id", because
-		// object.cell_id is nicer than object["cell-id"] (and object.cell-id
-		// is a syntax error)
-		propName.Replace("_", "-");
-
-
 		// Retrieve the setting's type (and make sure it actually exists)
 		EGUISettingType Type;
 		if (e->GetSettingType(propName, Type) != PS_OK)
@@ -254,12 +248,6 @@ JSBool JSI_IGUIObject::setProperty(JSContext* cx, JSObject* obj, jsval id, jsval
 		return JS_TRUE;
 	}
 
-	// Allow e.g. "cell_id" as a synonym for "cell-id", because
-	// object.cell_id is nicer than object["cell-id"] (and object.cell-id
-	// is a syntax error)
-	propName.Replace("_", "-");
-
-
 	// Retrieve the setting's type (and make sure it actually exists)
 	EGUISettingType Type;
 	if (e->GetSettingType(propName, Type) != PS_OK)
diff --git a/source/lib/res/vfs.cpp b/source/lib/res/vfs.cpp
index 96d682b923..11188fd226 100755
--- a/source/lib/res/vfs.cpp
+++ b/source/lib/res/vfs.cpp
@@ -437,11 +437,15 @@ struct TDir
 
 int TDir::add_subdir(const char* dir_name)
 {
-	if(find_file(dir_name))
+// ######################## TODO: Fix this ###########################
+/*
+	if(find_subdir(dir_name))
 	{
 		debug_warn("TDir::add_subdir: file of same name already exists");
 		return -1;
 	}
+*/
+	// The above code fails frequently and makes the game unplayable
 
 	TDirPair pair = std::make_pair(dir_name, TDir());
 	std::pair<TDirIt, bool> ret = subdirs.insert(pair);