diff --git a/ChangeLog b/ChangeLog
index 61cf65b2..e8f0b4fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,9 @@
 	reality
 	- added some nice pictures to the progress bar shown when
 	calculating results or loading/saving games
+	- added search popup to the teams list in the startup window (just
+	type a few letters to begin search)
+
 	
 
 09/10/2005: v1.9.1
diff --git a/Makefile.am b/Makefile.am
index f4cdaf63..732b4a28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ EXTRA_DIST = \
 
 SUPPORT_DIRS = support_files support_files/names support_files/pixmaps support_files/pixmaps/history support_files/pixmaps/symbols support_files/pixmaps/live_game support_files/definitions support_files/definitions/argentina support_files/definitions/australia support_files/definitions/aus_victoria support_files/definitions/belgium support_files/definitions/brazil support_files/definitions/bulgaria support_files/definitions/england support_files/definitions/europe support_files/definitions/france support_files/definitions/germany support_files/definitions/ireland support_files/definitions/italy support_files/definitions/misc support_files/definitions/poland support_files/definitions/romania support_files/definitions/scg support_files/definitions/scotland support_files/definitions/short_leagues support_files/definitions/short_leagues_south_america support_files/definitions/spain support_files/definitions/usa support_files/definitions/wales support_files/definitions/wc06 support_files/definitions/netherlands support_files/lg_commentary support_files/strategy support_files/strategy/tmp support_files/mmedia support_files/mmedia/pics 
 
-SUPPORT_FILES = support_files/names/player_names_brazil.xml support_files/names/player_names_england.xml support_files/names/player_names_belgium.xml support_files/names/player_names_usa.xml support_files/names/player_names_general.xml support_files/names/player_names_germany.xml support_files/names/player_names_romania.xml support_files/names/player_names_scotland.xml support_files/names/player_names_france.xml support_files/names/player_names_scg.xml support_files/names/player_names_italy.xml support_files/names/player_names_australia.xml support_files/names/player_names_poland.xml support_files/names/player_names_bulgaria.xml support_files/names/player_names_netherlands.xml support_files/names/player_names_sweden.xml support_files/names/player_names_hungary.xml support_files/names/player_names_denmark.xml support_files/names/player_names_latinoamerica.xml support_files/bygfoot.conf support_files/pixmaps/history/champion.png support_files/pixmaps/history/start_game.png support_files/pixmaps/history/fire_finance.png support_files/pixmaps/history/fire_failure.png support_files/pixmaps/history/job_offer.png support_files/pixmaps/history/end_season.png support_files/pixmaps/history/promoted.png support_files/pixmaps/history/relegated.png support_files/pixmaps/history/win_final.png support_files/pixmaps/history/lose_final.png support_files/pixmaps/history/reach_cup_round.png support_files/pixmaps/menu_history.png support_files/pixmaps/bygfoot_icon.png support_files/pixmaps/menu_league_stats.png support_files/pixmaps/new_week.png support_files/pixmaps/preview.png support_files/pixmaps/symbols/flag_germany.png support_files/pixmaps/symbols/flag_ch.png support_files/pixmaps/symbols/flag_cz.png support_files/pixmaps/symbols/flag_usa.png support_files/pixmaps/symbols/flag_dk.png support_files/pixmaps/symbols/flag_scg.png support_files/pixmaps/symbols/flag_es.png support_files/pixmaps/symbols/flag_eu.png support_files/pixmaps/symbols/flag_gr.png support_files/pixmaps/symbols/flag_hu.png support_files/pixmaps/symbols/flag_wales.png support_files/pixmaps/symbols/flag_bh.png support_files/pixmaps/symbols/flag_pt.png support_files/pixmaps/symbols/flag_ru.png support_files/pixmaps/symbols/flag_tr.png support_files/pixmaps/symbols/flag_uk.png support_files/pixmaps/symbols/flag_belgium.png support_files/pixmaps/symbols/flag_england.png support_files/pixmaps/symbols/flag_france.png support_files/pixmaps/symbols/flag_romania.png support_files/pixmaps/symbols/flag_brazil.png support_files/pixmaps/symbols/flag_scotland.png support_files/pixmaps/symbols/flag_ecuador.png support_files/pixmaps/symbols/flag_argentina.png support_files/pixmaps/symbols/flag_bolivia.png support_files/pixmaps/symbols/flag_chile.png support_files/pixmaps/symbols/flag_colombia.png support_files/pixmaps/symbols/flag_peru.png support_files/pixmaps/symbols/flag_paraguay.png support_files/pixmaps/symbols/flag_uruguay.png support_files/pixmaps/symbols/flag_venezuela.png support_files/pixmaps/symbols/flag_mexico.png support_files/pixmaps/symbols/flag_italy.png support_files/pixmaps/symbols/flag_ireland.png support_files/pixmaps/symbols/flag_n_ireland.png support_files/pixmaps/symbols/map_ireland.png support_files/pixmaps/symbols/flag_poland.png support_files/pixmaps/symbols/flag_australia.png support_files/pixmaps/symbols/flag_spain.png support_files/pixmaps/symbols/flag_aus_victoria.png support_files/pixmaps/symbols/flag_bulgaria.png support_files/pixmaps/symbols/flag_china.png support_files/pixmaps/symbols/flag_cdi.png support_files/pixmaps/symbols/flag_netherlands.png support_files/pixmaps/symbols/flag_albania.png support_files/pixmaps/symbols/flag_algeria.png support_files/pixmaps/symbols/flag_angola.png support_files/pixmaps/symbols/flag_armenia.png support_files/pixmaps/symbols/flag_austria.png support_files/pixmaps/symbols/flag_azerbaijan.png support_files/pixmaps/symbols/flag_bahrain.png support_files/pixmaps/symbols/flag_belarus.png support_files/pixmaps/symbols/flag_benin.png support_files/pixmaps/symbols/flag_botswana.png support_files/pixmaps/symbols/flag_burkina_faso.png support_files/pixmaps/symbols/flag_cameroon.png support_files/pixmaps/symbols/flag_canada.png support_files/pixmaps/symbols/flag_chtaipei.png support_files/pixmaps/symbols/flag_congodr.png support_files/pixmaps/symbols/flag_congo.png support_files/pixmaps/symbols/flag_costa_rica.png support_files/pixmaps/symbols/flag_cpv.png support_files/pixmaps/symbols/flag_croatia.png support_files/pixmaps/symbols/flag_cyprus.png support_files/pixmaps/symbols/flag_egypt.png support_files/pixmaps/symbols/flag_el_salvador.png support_files/pixmaps/symbols/flag_estonia.png support_files/pixmaps/symbols/flag_fiji.png support_files/pixmaps/symbols/flag_finland.png support_files/pixmaps/symbols/flag_fi.png support_files/pixmaps/symbols/flag_gabon.png support_files/pixmaps/symbols/flag_georgia.png support_files/pixmaps/symbols/flag_ghana.png support_files/pixmaps/symbols/flag_guatemala.png support_files/pixmaps/symbols/flag_guinea.png support_files/pixmaps/symbols/flag_honduras.png support_files/pixmaps/symbols/flag_hongkong.png support_files/pixmaps/symbols/flag_iceland.png support_files/pixmaps/symbols/flag_india.png support_files/pixmaps/symbols/flag_indonesia.png support_files/pixmaps/symbols/flag_iran.png support_files/pixmaps/symbols/flag_iraq.png support_files/pixmaps/symbols/flag_israel.png support_files/pixmaps/symbols/flag_jamaica.png support_files/pixmaps/symbols/flag_japan.png support_files/pixmaps/symbols/flag_jordan.png support_files/pixmaps/symbols/flag_kazakhstan.png support_files/pixmaps/symbols/flag_kenya.png support_files/pixmaps/symbols/flag_kittsnev.png support_files/pixmaps/symbols/flag_korea_dpr.png support_files/pixmaps/symbols/flag_korea.png support_files/pixmaps/symbols/flag_kuwait.png support_files/pixmaps/symbols/flag_kyrgyzstan.png support_files/pixmaps/symbols/flag_laos.png support_files/pixmaps/symbols/flag_latvia.png support_files/pixmaps/symbols/flag_lebanon.png support_files/pixmaps/symbols/flag_liberia.png support_files/pixmaps/symbols/flag_libya.png support_files/pixmaps/symbols/flag_lithuania.png support_files/pixmaps/symbols/flag_lux.png support_files/pixmaps/symbols/flag_macedonia.png support_files/pixmaps/symbols/flag_malawi.png support_files/pixmaps/symbols/flag_malaysia.png support_files/pixmaps/symbols/flag_maldives.png support_files/pixmaps/symbols/flag_mali.png support_files/pixmaps/symbols/flag_malta.png support_files/pixmaps/symbols/flag_moldova.png support_files/pixmaps/symbols/flag_morocco.png support_files/pixmaps/symbols/flag_nigeria.png support_files/pixmaps/symbols/flag_norway.png support_files/pixmaps/symbols/flag_nz.png support_files/pixmaps/symbols/flag_oman.png support_files/pixmaps/symbols/flag_palestine.png support_files/pixmaps/symbols/flag_panama.png support_files/pixmaps/symbols/flag_qatar.png support_files/pixmaps/symbols/flag_rsa.png support_files/pixmaps/symbols/flag_rwanda.png support_files/pixmaps/symbols/flag_saudi_arabia.png support_files/pixmaps/symbols/flag_senegal.png support_files/pixmaps/symbols/flag_singapore.png support_files/pixmaps/symbols/flag_slovakia.png support_files/pixmaps/symbols/flag_slovenia.png support_files/pixmaps/symbols/flag_sm.png support_files/pixmaps/symbols/flag_solomon.png support_files/pixmaps/symbols/flag_sri_lanka.png support_files/pixmaps/symbols/flag_sudan.png support_files/pixmaps/symbols/flag_sweden.png support_files/pixmaps/symbols/flag_syria.png support_files/pixmaps/symbols/flag_tahiti.png support_files/pixmaps/symbols/flag_tajikistan.png support_files/pixmaps/symbols/flag_thailand.png support_files/pixmaps/symbols/flag_togo.png support_files/pixmaps/symbols/flag_tritob.png support_files/pixmaps/symbols/flag_tunisia.png support_files/pixmaps/symbols/flag_turkmenistan.png support_files/pixmaps/symbols/flag_uae.png support_files/pixmaps/symbols/flag_uganda.png support_files/pixmaps/symbols/flag_uzbekistan.png support_files/pixmaps/symbols/flag_vanuatu.png support_files/pixmaps/symbols/flag_vietnam.png support_files/pixmaps/symbols/flag_vingren.png support_files/pixmaps/symbols/flag_wc06.png support_files/pixmaps/symbols/flag_yemen.png support_files/pixmaps/symbols/flag_zambia.png support_files/pixmaps/symbols/flag_zimbabwe.png support_files/pixmaps/symbols/flag_lie.png support_files/pixmaps/symbols/flag_andorra.png support_files/pixmaps/symbols/wc_africa.png support_files/pixmaps/symbols/wc_asia.png support_files/pixmaps/symbols/wc_europe.png support_files/pixmaps/symbols/wc_oceania.png support_files/pixmaps/symbols/wc_namerica.png support_files/pixmaps/symbols/wc_samerica.png support_files/pixmaps/transfers.png support_files/pixmaps/menu_league_results.png support_files/pixmaps/menu_table.png support_files/pixmaps/menu_fixtures_comp.png support_files/pixmaps/menu_fixtures.png support_files/pixmaps/menu_boost.png support_files/pixmaps/menu_browse_tms.png support_files/pixmaps/menu_finances.png support_files/pixmaps/menu_last_match.png support_files/pixmaps/live_game/sub.png support_files/pixmaps/live_game/red.png support_files/pixmaps/live_game/save.png support_files/pixmaps/live_game/goal.png support_files/pixmaps/live_game/yellow.png support_files/pixmaps/live_game/scoring_chance.png support_files/pixmaps/live_game/injury_temp.png support_files/pixmaps/live_game/injury.png support_files/pixmaps/live_game/structure_change.png support_files/pixmaps/live_game/whistle.png support_files/pixmaps/live_game/miss.png support_files/pixmaps/live_game/foul.png support_files/pixmaps/live_game/cross_bar.png support_files/pixmaps/live_game/post.png support_files/pixmaps/live_game/penalty.png support_files/pixmaps/live_game/stadium_brkn.png support_files/pixmaps/live_game/stadium_fire.png support_files/pixmaps/live_game/stadium_riot.png support_files/pixmaps/live_game/header.png support_files/pixmaps/live_game/goal_own.png support_files/pixmaps/live_game/lost_possession.png support_files/pixmaps/menu_match_stats.png support_files/pixmaps/menu_physio.png support_files/pixmaps/boost_anti.png support_files/pixmaps/boost_off.png support_files/pixmaps/boost_on.png support_files/pixmaps/menu_player_browse.png support_files/pixmaps/style_def.png support_files/pixmaps/style_atk.png support_files/pixmaps/style_bal.png support_files/pixmaps/style_all_atk.png support_files/pixmaps/style_all_def.png support_files/pixmaps/menu_player_contract.png support_files/pixmaps/menu_player_fire.png support_files/pixmaps/menu_player_info.png support_files/pixmaps/menu_player_put_transfer.png support_files/pixmaps/menu_player_remove_transfer.png support_files/pixmaps/table_up.png support_files/pixmaps/table_down.png support_files/pixmaps/table_stay.png support_files/pixmaps/menu_player_shoots.png support_files/pixmaps/menu_rearrange.png support_files/pixmaps/menu_scout.png support_files/pixmaps/menu_stadium.png support_files/pixmaps/menu_structure.png support_files/pixmaps/menu_style.png support_files/pixmaps/menu_youth_academy.png support_files/pixmaps/menu_mmatches.png support_files/pixmaps/player_status_injury.png support_files/pixmaps/player_status_hot.png support_files/pixmaps/player_status_ban.png support_files/pixmaps/player_status_yellow.png support_files/pixmaps/player_status_cold.png support_files/pixmaps/menu_player_move_to_ya.png support_files/pixmaps/menu_season_res.png support_files/pixmaps/menu_player_move_to_team.png support_files/pixmaps/menu_save_geometry.png support_files/definitions/argentina/league_argentina1.xml support_files/definitions/australia/league_australia1.xml support_files/definitions/australia/cup_australia_a_league.xml support_files/definitions/australia/country_australia.xml support_files/definitions/australia/cup_australia_playoffs.xml support_files/definitions/aus_victoria/country_aus_victoria.xml support_files/definitions/aus_victoria/cup_aus_vic_league.xml support_files/definitions/aus_victoria/cup_aus_vic_playoff1.xml support_files/definitions/aus_victoria/cup_aus_vic_playoff2.xml support_files/definitions/aus_victoria/league_aus_vic1.xml support_files/definitions/aus_victoria/league_aus_vic2nw.xml support_files/definitions/aus_victoria/league_aus_vic2se.xml support_files/definitions/aus_victoria/league_aus_vic3nw.xml support_files/definitions/aus_victoria/league_aus_vic3se.xml support_files/definitions/aus_victoria/league_aus_vic4nw.xml support_files/definitions/aus_victoria/league_aus_vic4se.xml support_files/definitions/aus_victoria/league_aus_vic5nw.xml support_files/definitions/aus_victoria/league_aus_vic5se.xml support_files/definitions/aus_victoria/league_aus_vic6nw.xml support_files/definitions/aus_victoria/league_aus_vic6se.xml support_files/definitions/aus_victoria/league_aus_vicprem.xml support_files/definitions/belgium/country_belgium.xml support_files/definitions/belgium/cup_belgium.xml support_files/definitions/belgium/cup_belgium_eindronde2.xml support_files/definitions/belgium/league_belgium1.xml support_files/definitions/belgium/league_belgium2.xml support_files/definitions/belgium/league_belgium3a.xml support_files/definitions/belgium/league_belgium3b.xml support_files/definitions/belgium/league_belgium4a.xml support_files/definitions/belgium/league_belgium4b.xml support_files/definitions/belgium/league_belgium4c.xml support_files/definitions/belgium/league_belgium4d.xml support_files/definitions/belgium/cup_belgium_eindronde3.xml support_files/definitions/belgium/cup_belgium_eindronde4.xml support_files/definitions/belgium/cup_belgium_beker.xml support_files/definitions/brazil/country_brazil.xml support_files/definitions/brazil/cup_brazil_copa_do_brasil.xml support_files/definitions/brazil/cup_brazil_prom_games2.xml support_files/definitions/brazil/cup_brazil_prom_games3.xml support_files/definitions/brazil/cup_brazil_prom_games4.xml support_files/definitions/brazil/cup_brazil_prom_games5.xml support_files/definitions/brazil/cup_brazil_prom_games6.xml support_files/definitions/brazil/league_brazil1.xml support_files/definitions/brazil/league_brazil2.xml support_files/definitions/brazil/league_brazil33.xml support_files/definitions/brazil/league_brazil34.xml support_files/definitions/brazil/league_brazil35.xml support_files/definitions/brazil/league_brazil36.xml support_files/definitions/brazil/cup_brazil_sul_am_ar.xml support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml support_files/definitions/brazil/cup_brazil_sul_am_br1.xml support_files/definitions/brazil/cup_brazil_sul_am_br2.xml support_files/definitions/brazil/cup_brazil_sul_am_br3.xml support_files/definitions/brazil/cup_brazil_sul_am_br4.xml support_files/definitions/brazil/cup_brazil_sul_am_ch_pe.xml support_files/definitions/brazil/cup_brazil_sul_am_co_ec.xml support_files/definitions/brazil/cup_brazil_sul_am_knockout.xml support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml support_files/definitions/brazil/cup_brazil_libertadores.xml support_files/definitions/brazil/cup_supercup_brazil_intercontinental.xml support_files/definitions/brazil/league_brazil37.xml support_files/definitions/brazil/league_brazil38.xml support_files/definitions/brazil/league_brazil31.xml support_files/definitions/brazil/league_brazil32.xml support_files/definitions/brazil/league_brazil39.xml support_files/definitions/brazil/league_brazil310.xml support_files/definitions/brazil/league_brazil311.xml support_files/definitions/brazil/league_brazil312.xml support_files/definitions/brazil/league_brazil313.xml support_files/definitions/brazil/league_brazil314.xml support_files/definitions/brazil/league_brazil315.xml support_files/definitions/brazil/league_brazil316.xml support_files/definitions/bulgaria/country_bulgaria.xml support_files/definitions/bulgaria/cup_bulgaria_national.xml support_files/definitions/bulgaria/cup_bulgaria_prom_games2.xml support_files/definitions/bulgaria/cup_supercup_bulgaria.xml support_files/definitions/bulgaria/league_bulgaria1.xml support_files/definitions/bulgaria/league_bulgaria2a.xml support_files/definitions/bulgaria/league_bulgaria2b.xml support_files/definitions/bulgaria/league_bulgaria3a.xml support_files/definitions/bulgaria/league_bulgaria3b.xml support_files/definitions/bulgaria/league_bulgaria3c.xml support_files/definitions/bulgaria/league_bulgaria3d.xml support_files/definitions/england/country_england.xml support_files/definitions/england/cup_england_fa.xml support_files/definitions/england/cup_england_league.xml support_files/definitions/england/cup_england_prom_games2.xml support_files/definitions/england/cup_england_prom_games3.xml support_files/definitions/england/cup_england_prom_games4.xml support_files/definitions/england/league_england1.xml support_files/definitions/england/league_england2.xml support_files/definitions/england/league_england3.xml support_files/definitions/england/league_england4.xml support_files/definitions/england/league_england5.xml support_files/definitions/england/cup_england_prom_games5.xml support_files/definitions/europe/cup_europe_champ_league.xml support_files/definitions/europe/cup_europe_cwc.xml support_files/definitions/europe/cup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_intercontinental.xml support_files/definitions/france/country_france.xml support_files/definitions/france/cup_france_coupe.xml support_files/definitions/france/league_france1.xml support_files/definitions/france/league_france2.xml support_files/definitions/france/league_france3.xml support_files/definitions/france/cup_france_ligue.xml support_files/definitions/france/league_france4a.xml support_files/definitions/france/league_france4b.xml support_files/definitions/france/league_france4c.xml support_files/definitions/france/league_france4d.xml support_files/definitions/germany/cup_germany_dfb.xml support_files/definitions/germany/league_germany1.xml support_files/definitions/germany/league_germany2.xml support_files/definitions/germany/league_germany3a.xml support_files/definitions/germany/league_germany3b.xml support_files/definitions/germany/country_germany.xml support_files/definitions/ireland/country_ireland.xml support_files/definitions/ireland/cup_ireland_league.xml support_files/definitions/ireland/cup_ireland_senior.xml support_files/definitions/ireland/league_ireland1.xml support_files/definitions/ireland/league_n_ireland1.xml support_files/definitions/ireland/league_ireland2.xml support_files/definitions/ireland/cup_ireland_prom_games.xml support_files/definitions/ireland/cup_ireland_setanta.xml support_files/definitions/ireland/cup_ireland_cl.xml support_files/definitions/ireland/cup_ireland_cl_q.xml support_files/definitions/ireland/cup_ireland_uefa.xml support_files/definitions/ireland/cup_ireland_uefa_q.xml support_files/definitions/italy/country_italy.xml support_files/definitions/italy/cup_italy_coppa.xml support_files/definitions/italy/league_italy1.xml support_files/definitions/italy/league_italy2.xml support_files/definitions/italy/league_italy3a.xml support_files/definitions/italy/league_italy3b.xml support_files/definitions/misc/cup_supercup_league_vs_cup.xml support_files/definitions/poland/league_poland1.xml support_files/definitions/poland/league_poland2.xml support_files/definitions/poland/league_poland3a.xml support_files/definitions/poland/league_poland3b.xml support_files/definitions/poland/league_poland3c.xml support_files/definitions/poland/league_poland3d.xml support_files/definitions/poland/country_poland.xml support_files/definitions/poland/cup_poland_prom_games1.xml support_files/definitions/poland/cup_poland_prom_games2.xml support_files/definitions/poland/cup_poland_puchar.xml support_files/definitions/romania/country_romania.xml support_files/definitions/romania/league_romania1.xml support_files/definitions/romania/league_romania2.xml support_files/definitions/romania/league_romania3.xml support_files/definitions/romania/cup_supercup_romania.xml support_files/definitions/romania/cup_romania_cupa.xml support_files/definitions/scg/country_scg.xml support_files/definitions/scg/cup_scg.xml support_files/definitions/scg/league_scg2a.xml support_files/definitions/scg/league_scg2b.xml support_files/definitions/scg/league_scg1.xml support_files/definitions/scotland/league_scotland1.xml support_files/definitions/scotland/country_scotland.xml support_files/definitions/scotland/league_scotland2.xml support_files/definitions/scotland/cup_scotland_league.xml support_files/definitions/scotland/league_scotland3.xml support_files/definitions/scotland/league_scotland4.xml support_files/definitions/scotland/cup_scotland_fa.xml support_files/definitions/short_leagues/league_czech1_short.xml support_files/definitions/short_leagues/league_denmark1_short.xml support_files/definitions/short_leagues/league_greece1_short.xml support_files/definitions/short_leagues/league_portugal1_short.xml support_files/definitions/short_leagues/league_russia1_short.xml support_files/definitions/short_leagues/league_switzerland1_short.xml support_files/definitions/short_leagues/league_turkey1_short.xml support_files/definitions/short_leagues/league_ukraine1_short.xml support_files/definitions/short_leagues_south_america/league_bolivia1_short.xml support_files/definitions/short_leagues_south_america/league_chile1_short.xml support_files/definitions/short_leagues_south_america/league_colombia1_short.xml support_files/definitions/short_leagues_south_america/league_ecuador1_short.xml support_files/definitions/short_leagues_south_america/league_mexico1_short.xml support_files/definitions/short_leagues_south_america/league_paraguay1_short.xml support_files/definitions/short_leagues_south_america/league_peru1_short.xml support_files/definitions/short_leagues_south_america/league_uruguay1_short.xml support_files/definitions/short_leagues_south_america/league_venezuela1_short.xml support_files/definitions/spain/country_spain.xml support_files/definitions/spain/cup_spain_cdr.xml support_files/definitions/spain/cup_spain_prom_games_1.xml support_files/definitions/spain/cup_spain_prom_games_2.xml support_files/definitions/spain/cup_spain_prom_games_3.xml support_files/definitions/spain/cup_spain_prom_games_4.xml support_files/definitions/spain/cup_spain_rfef.xml support_files/definitions/spain/league_spain1.xml support_files/definitions/spain/league_spain2.xml support_files/definitions/spain/league_spain3a.xml support_files/definitions/spain/league_spain3b.xml support_files/definitions/spain/league_spain3c.xml support_files/definitions/spain/league_spain3d.xml support_files/definitions/usa/league_usa_econf.xml support_files/definitions/usa/country_usa.xml support_files/definitions/usa/league_usa_wconf.xml support_files/definitions/usa/cup_usa_eplayoff.xml support_files/definitions/usa/cup_usa_wplayoff.xml support_files/definitions/usa/cup_usa_mls_cup.xml support_files/definitions/wales/league_wales1.xml support_files/definitions/wales/league_wales2a.xml support_files/definitions/wales/league_wales2b.xml support_files/definitions/wales/country_wales.xml support_files/definitions/wales/cup_wales_welsh.xml support_files/definitions/wales/cup_wales_challenge.xml support_files/definitions/wales/cup_wales_premier.xml support_files/definitions/wales/league_wales_english.xml support_files/definitions/wales/cup_wales_uefa_q.xml support_files/definitions/wales/cup_wales_uefa.xml support_files/definitions/wales/cup_wales_cl.xml support_files/definitions/wales/cup_wales_cl_q.xml support_files/definitions/wc06/league_wc06_europe_teams.xml support_files/definitions/wc06/league_wc06_asia_teams.xml support_files/definitions/wc06/country_wc06.xml support_files/definitions/wc06/cup_wc06_africa.xml support_files/definitions/wc06/cup_wc06_europe.xml support_files/definitions/wc06/cup_wc06_europe_playoffs.xml support_files/definitions/wc06/cup_wc06_oceania.xml support_files/definitions/wc06/cup_wc06_ncamerica.xml support_files/definitions/wc06/league_wc06_africa_teams.xml support_files/definitions/wc06/league_wc06_samerica_teams.xml support_files/definitions/wc06/league_wc06_ncamerica_teams.xml support_files/definitions/wc06/cup_wc06_samerica.xml support_files/definitions/wc06/league_wc06_oceania_teams.xml support_files/definitions/wc06/cup_wc06_asia.xml support_files/definitions/wc06/cup_wc06_final.xml support_files/definitions/wc06/cup_wc06_oceania_samerica.xml support_files/definitions/wc06/cup_wc06_asia_ncamerica.xml support_files/definitions/wc06/cup_wc06_asia_playoff.xml support_files/definitions/wc06/0,2548,All-Sep-2005,00.html support_files/definitions/netherlands/country_netherlands.xml support_files/definitions/netherlands/cup_netherlands_amstelcup.xml support_files/definitions/netherlands/cup_netherlands_nacompetitie2.xml support_files/definitions/netherlands/cup_netherlands_nacompetitie3.xml support_files/definitions/netherlands/cup_netherlands_nacompetitie4.xml support_files/definitions/netherlands/league_netherlands1.xml support_files/definitions/netherlands/league_netherlands2.xml support_files/definitions/netherlands/league_netherlands3a.xml support_files/definitions/netherlands/league_netherlands3b.xml support_files/definitions/netherlands/league_netherlands3c.xml support_files/bygfoot_constants support_files/bygfoot_user.conf support_files/lg_commentary/lg_commentary_de.xml support_files/lg_commentary/lg_commentary_en.xml support_files/lg_commentary/lg_commentary_nl.xml support_files/lg_commentary/lg_commentary_pl.xml support_files/lg_commentary/lg_commentary_bg.xml support_files/bygfoot_app support_files/bygfoot_help support_files/strategy/strategy_attack1.xml support_files/strategy/tmp/strategy_attack1.xml support_files/strategy/tmp/strategy_attack2.xml support_files/strategy/tmp/strategy_defend.xml support_files/strategy/tmp/strategy_fit.xml support_files/strategy/tmp/strategy_normal2.xml support_files/strategy/strategy_gy.xml support_files/strategy/strategy_attack2.xml support_files/strategy/strategy_defend.xml support_files/strategy/strategy_fit.xml support_files/strategy/strategy_normal2.xml support_files/strategy/strategy_defence.xml support_files/bygfoot_tokens support_files/mmedia/pics/match1.png support_files/mmedia/pics/match10.png support_files/mmedia/pics/match11.png support_files/mmedia/pics/match12.png support_files/mmedia/pics/match13.png support_files/mmedia/pics/match14.png support_files/mmedia/pics/match15.png support_files/mmedia/pics/match16.png support_files/mmedia/pics/match2.png support_files/mmedia/pics/match3.png support_files/mmedia/pics/match4.png support_files/mmedia/pics/match5.png support_files/mmedia/pics/match6.png support_files/mmedia/pics/match7.png support_files/mmedia/pics/match8.png support_files/mmedia/pics/match9.png 
+SUPPORT_FILES = support_files/names/player_names_brazil.xml support_files/names/player_names_england.xml support_files/names/player_names_belgium.xml support_files/names/player_names_usa.xml support_files/names/player_names_general.xml support_files/names/player_names_germany.xml support_files/names/player_names_romania.xml support_files/names/player_names_scotland.xml support_files/names/player_names_france.xml support_files/names/player_names_scg.xml support_files/names/player_names_italy.xml support_files/names/player_names_australia.xml support_files/names/player_names_poland.xml support_files/names/player_names_bulgaria.xml support_files/names/player_names_netherlands.xml support_files/names/player_names_sweden.xml support_files/names/player_names_hungary.xml support_files/names/player_names_denmark.xml support_files/names/player_names_latinoamerica.xml support_files/bygfoot.conf support_files/pixmaps/history/champion.png support_files/pixmaps/history/start_game.png support_files/pixmaps/history/fire_finance.png support_files/pixmaps/history/fire_failure.png support_files/pixmaps/history/job_offer.png support_files/pixmaps/history/end_season.png support_files/pixmaps/history/promoted.png support_files/pixmaps/history/relegated.png support_files/pixmaps/history/win_final.png support_files/pixmaps/history/lose_final.png support_files/pixmaps/history/reach_cup_round.png support_files/pixmaps/menu_history.png support_files/pixmaps/bygfoot_icon.png support_files/pixmaps/menu_league_stats.png support_files/pixmaps/new_week.png support_files/pixmaps/preview.png support_files/pixmaps/symbols/flag_germany.png support_files/pixmaps/symbols/flag_ch.png support_files/pixmaps/symbols/flag_cz.png support_files/pixmaps/symbols/flag_usa.png support_files/pixmaps/symbols/flag_dk.png support_files/pixmaps/symbols/flag_scg.png support_files/pixmaps/symbols/flag_es.png support_files/pixmaps/symbols/flag_eu.png support_files/pixmaps/symbols/flag_gr.png support_files/pixmaps/symbols/flag_hu.png support_files/pixmaps/symbols/flag_wales.png support_files/pixmaps/symbols/flag_bh.png support_files/pixmaps/symbols/flag_pt.png support_files/pixmaps/symbols/flag_ru.png support_files/pixmaps/symbols/flag_tr.png support_files/pixmaps/symbols/flag_uk.png support_files/pixmaps/symbols/flag_belgium.png support_files/pixmaps/symbols/flag_england.png support_files/pixmaps/symbols/flag_france.png support_files/pixmaps/symbols/flag_romania.png support_files/pixmaps/symbols/flag_brazil.png support_files/pixmaps/symbols/flag_scotland.png support_files/pixmaps/symbols/flag_ecuador.png support_files/pixmaps/symbols/flag_argentina.png support_files/pixmaps/symbols/flag_bolivia.png support_files/pixmaps/symbols/flag_chile.png support_files/pixmaps/symbols/flag_colombia.png support_files/pixmaps/symbols/flag_peru.png support_files/pixmaps/symbols/flag_paraguay.png support_files/pixmaps/symbols/flag_uruguay.png support_files/pixmaps/symbols/flag_venezuela.png support_files/pixmaps/symbols/flag_mexico.png support_files/pixmaps/symbols/flag_italy.png support_files/pixmaps/symbols/flag_ireland.png support_files/pixmaps/symbols/flag_n_ireland.png support_files/pixmaps/symbols/map_ireland.png support_files/pixmaps/symbols/flag_poland.png support_files/pixmaps/symbols/flag_australia.png support_files/pixmaps/symbols/flag_spain.png support_files/pixmaps/symbols/flag_aus_victoria.png support_files/pixmaps/symbols/flag_bulgaria.png support_files/pixmaps/symbols/flag_china.png support_files/pixmaps/symbols/flag_cdi.png support_files/pixmaps/symbols/flag_netherlands.png support_files/pixmaps/symbols/flag_albania.png support_files/pixmaps/symbols/flag_algeria.png support_files/pixmaps/symbols/flag_angola.png support_files/pixmaps/symbols/flag_armenia.png support_files/pixmaps/symbols/flag_austria.png support_files/pixmaps/symbols/flag_azerbaijan.png support_files/pixmaps/symbols/flag_bahrain.png support_files/pixmaps/symbols/flag_belarus.png support_files/pixmaps/symbols/flag_benin.png support_files/pixmaps/symbols/flag_botswana.png support_files/pixmaps/symbols/flag_burkina_faso.png support_files/pixmaps/symbols/flag_cameroon.png support_files/pixmaps/symbols/flag_canada.png support_files/pixmaps/symbols/flag_chtaipei.png support_files/pixmaps/symbols/flag_congodr.png support_files/pixmaps/symbols/flag_congo.png support_files/pixmaps/symbols/flag_costa_rica.png support_files/pixmaps/symbols/flag_cpv.png support_files/pixmaps/symbols/flag_croatia.png support_files/pixmaps/symbols/flag_cyprus.png support_files/pixmaps/symbols/flag_egypt.png support_files/pixmaps/symbols/flag_el_salvador.png support_files/pixmaps/symbols/flag_estonia.png support_files/pixmaps/symbols/flag_fiji.png support_files/pixmaps/symbols/flag_finland.png support_files/pixmaps/symbols/flag_fi.png support_files/pixmaps/symbols/flag_gabon.png support_files/pixmaps/symbols/flag_georgia.png support_files/pixmaps/symbols/flag_ghana.png support_files/pixmaps/symbols/flag_guatemala.png support_files/pixmaps/symbols/flag_guinea.png support_files/pixmaps/symbols/flag_honduras.png support_files/pixmaps/symbols/flag_hongkong.png support_files/pixmaps/symbols/flag_iceland.png support_files/pixmaps/symbols/flag_india.png support_files/pixmaps/symbols/flag_indonesia.png support_files/pixmaps/symbols/flag_iran.png support_files/pixmaps/symbols/flag_iraq.png support_files/pixmaps/symbols/flag_israel.png support_files/pixmaps/symbols/flag_jamaica.png support_files/pixmaps/symbols/flag_japan.png support_files/pixmaps/symbols/flag_jordan.png support_files/pixmaps/symbols/flag_kazakhstan.png support_files/pixmaps/symbols/flag_kenya.png support_files/pixmaps/symbols/flag_kittsnev.png support_files/pixmaps/symbols/flag_korea_dpr.png support_files/pixmaps/symbols/flag_korea.png support_files/pixmaps/symbols/flag_kuwait.png support_files/pixmaps/symbols/flag_kyrgyzstan.png support_files/pixmaps/symbols/flag_laos.png support_files/pixmaps/symbols/flag_latvia.png support_files/pixmaps/symbols/flag_lebanon.png support_files/pixmaps/symbols/flag_liberia.png support_files/pixmaps/symbols/flag_libya.png support_files/pixmaps/symbols/flag_lithuania.png support_files/pixmaps/symbols/flag_lux.png support_files/pixmaps/symbols/flag_macedonia.png support_files/pixmaps/symbols/flag_malawi.png support_files/pixmaps/symbols/flag_malaysia.png support_files/pixmaps/symbols/flag_maldives.png support_files/pixmaps/symbols/flag_mali.png support_files/pixmaps/symbols/flag_malta.png support_files/pixmaps/symbols/flag_moldova.png support_files/pixmaps/symbols/flag_morocco.png support_files/pixmaps/symbols/flag_nigeria.png support_files/pixmaps/symbols/flag_norway.png support_files/pixmaps/symbols/flag_nz.png support_files/pixmaps/symbols/flag_oman.png support_files/pixmaps/symbols/flag_palestine.png support_files/pixmaps/symbols/flag_panama.png support_files/pixmaps/symbols/flag_qatar.png support_files/pixmaps/symbols/flag_rsa.png support_files/pixmaps/symbols/flag_rwanda.png support_files/pixmaps/symbols/flag_saudi_arabia.png support_files/pixmaps/symbols/flag_senegal.png support_files/pixmaps/symbols/flag_singapore.png support_files/pixmaps/symbols/flag_slovakia.png support_files/pixmaps/symbols/flag_slovenia.png support_files/pixmaps/symbols/flag_sm.png support_files/pixmaps/symbols/flag_solomon.png support_files/pixmaps/symbols/flag_sri_lanka.png support_files/pixmaps/symbols/flag_sudan.png support_files/pixmaps/symbols/flag_sweden.png support_files/pixmaps/symbols/flag_syria.png support_files/pixmaps/symbols/flag_tahiti.png support_files/pixmaps/symbols/flag_tajikistan.png support_files/pixmaps/symbols/flag_thailand.png support_files/pixmaps/symbols/flag_togo.png support_files/pixmaps/symbols/flag_tritob.png support_files/pixmaps/symbols/flag_tunisia.png support_files/pixmaps/symbols/flag_turkmenistan.png support_files/pixmaps/symbols/flag_uae.png support_files/pixmaps/symbols/flag_uganda.png support_files/pixmaps/symbols/flag_uzbekistan.png support_files/pixmaps/symbols/flag_vanuatu.png support_files/pixmaps/symbols/flag_vietnam.png support_files/pixmaps/symbols/flag_vingren.png support_files/pixmaps/symbols/flag_wc06.png support_files/pixmaps/symbols/flag_yemen.png support_files/pixmaps/symbols/flag_zambia.png support_files/pixmaps/symbols/flag_zimbabwe.png support_files/pixmaps/symbols/flag_lie.png support_files/pixmaps/symbols/flag_andorra.png support_files/pixmaps/symbols/wc_africa.png support_files/pixmaps/symbols/wc_asia.png support_files/pixmaps/symbols/wc_europe.png support_files/pixmaps/symbols/wc_oceania.png support_files/pixmaps/symbols/wc_namerica.png support_files/pixmaps/symbols/wc_samerica.png support_files/pixmaps/transfers.png support_files/pixmaps/menu_league_results.png support_files/pixmaps/menu_table.png support_files/pixmaps/menu_fixtures_comp.png support_files/pixmaps/menu_fixtures.png support_files/pixmaps/menu_boost.png support_files/pixmaps/menu_browse_tms.png support_files/pixmaps/menu_finances.png support_files/pixmaps/menu_last_match.png support_files/pixmaps/live_game/sub.png support_files/pixmaps/live_game/red.png support_files/pixmaps/live_game/save.png support_files/pixmaps/live_game/goal.png support_files/pixmaps/live_game/yellow.png support_files/pixmaps/live_game/scoring_chance.png support_files/pixmaps/live_game/injury_temp.png support_files/pixmaps/live_game/injury.png support_files/pixmaps/live_game/structure_change.png support_files/pixmaps/live_game/whistle.png support_files/pixmaps/live_game/miss.png support_files/pixmaps/live_game/foul.png support_files/pixmaps/live_game/cross_bar.png support_files/pixmaps/live_game/post.png support_files/pixmaps/live_game/penalty.png support_files/pixmaps/live_game/stadium_brkn.png support_files/pixmaps/live_game/stadium_fire.png support_files/pixmaps/live_game/stadium_riot.png support_files/pixmaps/live_game/header.png support_files/pixmaps/live_game/goal_own.png support_files/pixmaps/live_game/lost_possession.png support_files/pixmaps/menu_match_stats.png support_files/pixmaps/menu_physio.png support_files/pixmaps/boost_anti.png support_files/pixmaps/boost_off.png support_files/pixmaps/boost_on.png support_files/pixmaps/menu_player_browse.png support_files/pixmaps/style_def.png support_files/pixmaps/style_atk.png support_files/pixmaps/style_bal.png support_files/pixmaps/style_all_atk.png support_files/pixmaps/style_all_def.png support_files/pixmaps/menu_player_contract.png support_files/pixmaps/menu_player_fire.png support_files/pixmaps/menu_player_info.png support_files/pixmaps/menu_player_put_transfer.png support_files/pixmaps/menu_player_remove_transfer.png support_files/pixmaps/table_up.png support_files/pixmaps/table_down.png support_files/pixmaps/table_stay.png support_files/pixmaps/menu_player_shoots.png support_files/pixmaps/menu_rearrange.png support_files/pixmaps/menu_scout.png support_files/pixmaps/menu_stadium.png support_files/pixmaps/menu_structure.png support_files/pixmaps/menu_style.png support_files/pixmaps/menu_youth_academy.png support_files/pixmaps/menu_mmatches.png support_files/pixmaps/player_status_injury.png support_files/pixmaps/player_status_hot.png support_files/pixmaps/player_status_ban.png support_files/pixmaps/player_status_yellow.png support_files/pixmaps/player_status_cold.png support_files/pixmaps/menu_player_move_to_ya.png support_files/pixmaps/menu_season_res.png support_files/pixmaps/menu_player_move_to_team.png support_files/pixmaps/menu_save_geometry.png support_files/definitions/argentina/league_argentina1.xml support_files/definitions/australia/league_australia1.xml support_files/definitions/australia/cup_australia_a_league.xml support_files/definitions/australia/country_australia.xml support_files/definitions/australia/cup_australia_playoffs.xml support_files/definitions/aus_victoria/country_aus_victoria.xml support_files/definitions/aus_victoria/cup_aus_vic_league.xml support_files/definitions/aus_victoria/cup_aus_vic_playoff1.xml support_files/definitions/aus_victoria/cup_aus_vic_playoff2.xml support_files/definitions/aus_victoria/league_aus_vic1.xml support_files/definitions/aus_victoria/league_aus_vic2nw.xml support_files/definitions/aus_victoria/league_aus_vic2se.xml support_files/definitions/aus_victoria/league_aus_vic3nw.xml support_files/definitions/aus_victoria/league_aus_vic3se.xml support_files/definitions/aus_victoria/league_aus_vic4nw.xml support_files/definitions/aus_victoria/league_aus_vic4se.xml support_files/definitions/aus_victoria/league_aus_vic5nw.xml support_files/definitions/aus_victoria/league_aus_vic5se.xml support_files/definitions/aus_victoria/league_aus_vic6nw.xml support_files/definitions/aus_victoria/league_aus_vic6se.xml support_files/definitions/aus_victoria/league_aus_vicprem.xml support_files/definitions/belgium/country_belgium.xml support_files/definitions/belgium/cup_belgium.xml support_files/definitions/belgium/cup_belgium_eindronde2.xml support_files/definitions/belgium/league_belgium1.xml support_files/definitions/belgium/league_belgium2.xml support_files/definitions/belgium/league_belgium3a.xml support_files/definitions/belgium/league_belgium3b.xml support_files/definitions/belgium/league_belgium4a.xml support_files/definitions/belgium/league_belgium4b.xml support_files/definitions/belgium/league_belgium4c.xml support_files/definitions/belgium/league_belgium4d.xml support_files/definitions/belgium/cup_belgium_eindronde3.xml support_files/definitions/belgium/cup_belgium_eindronde4.xml support_files/definitions/belgium/cup_belgium_beker.xml support_files/definitions/brazil/country_brazil.xml support_files/definitions/brazil/cup_brazil_copa_do_brasil.xml support_files/definitions/brazil/cup_brazil_prom_games2.xml support_files/definitions/brazil/cup_brazil_prom_games3.xml support_files/definitions/brazil/league_brazil1.xml support_files/definitions/brazil/league_brazil2.xml support_files/definitions/brazil/league_brazil33.xml support_files/definitions/brazil/league_brazil34.xml support_files/definitions/brazil/league_brazil35.xml support_files/definitions/brazil/league_brazil36.xml support_files/definitions/brazil/cup_brazil_sul_am_ar.xml support_files/definitions/brazil/cup_brazil_sul_am_bo_ve.xml support_files/definitions/brazil/cup_brazil_sul_am_br1.xml support_files/definitions/brazil/cup_brazil_sul_am_br2.xml support_files/definitions/brazil/cup_brazil_sul_am_br3.xml support_files/definitions/brazil/cup_brazil_sul_am_br4.xml support_files/definitions/brazil/cup_brazil_sul_am_ch_pe.xml support_files/definitions/brazil/cup_brazil_sul_am_co_ec.xml support_files/definitions/brazil/cup_brazil_sul_am_knockout.xml support_files/definitions/brazil/cup_brazil_sul_am_pa_ur.xml support_files/definitions/brazil/cup_brazil_libertadores.xml support_files/definitions/brazil/cup_supercup_brazil_intercontinental.xml support_files/definitions/brazil/league_brazil37.xml support_files/definitions/brazil/league_brazil38.xml support_files/definitions/brazil/league_brazil31.xml support_files/definitions/brazil/league_brazil32.xml support_files/definitions/brazil/league_brazil39.xml support_files/definitions/brazil/league_brazil310.xml support_files/definitions/brazil/league_brazil311.xml support_files/definitions/brazil/league_brazil312.xml support_files/definitions/brazil/league_brazil313.xml support_files/definitions/brazil/league_brazil314.xml support_files/definitions/brazil/league_brazil315.xml support_files/definitions/brazil/league_brazil316.xml support_files/definitions/bulgaria/country_bulgaria.xml support_files/definitions/bulgaria/cup_bulgaria_national.xml support_files/definitions/bulgaria/cup_bulgaria_prom_games2.xml support_files/definitions/bulgaria/cup_supercup_bulgaria.xml support_files/definitions/bulgaria/league_bulgaria1.xml support_files/definitions/bulgaria/league_bulgaria2a.xml support_files/definitions/bulgaria/league_bulgaria2b.xml support_files/definitions/bulgaria/league_bulgaria3a.xml support_files/definitions/bulgaria/league_bulgaria3b.xml support_files/definitions/bulgaria/league_bulgaria3c.xml support_files/definitions/bulgaria/league_bulgaria3d.xml support_files/definitions/england/country_england.xml support_files/definitions/england/cup_england_fa.xml support_files/definitions/england/cup_england_league.xml support_files/definitions/england/cup_england_prom_games2.xml support_files/definitions/england/cup_england_prom_games3.xml support_files/definitions/england/cup_england_prom_games4.xml support_files/definitions/england/league_england1.xml support_files/definitions/england/league_england2.xml support_files/definitions/england/league_england3.xml support_files/definitions/england/league_england4.xml support_files/definitions/england/league_england5.xml support_files/definitions/england/cup_england_prom_games5.xml support_files/definitions/europe/cup_europe_champ_league.xml support_files/definitions/europe/cup_europe_cwc.xml support_files/definitions/europe/cup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_uefa.xml support_files/definitions/europe/cup_supercup_europe_intercontinental.xml support_files/definitions/france/country_france.xml support_files/definitions/france/cup_france_coupe.xml support_files/definitions/france/league_france1.xml support_files/definitions/france/league_france2.xml support_files/definitions/france/league_france3.xml support_files/definitions/france/cup_france_ligue.xml support_files/definitions/france/league_france4a.xml support_files/definitions/france/league_france4b.xml support_files/definitions/france/league_france4c.xml support_files/definitions/france/league_france4d.xml support_files/definitions/germany/cup_germany_dfb.xml support_files/definitions/germany/league_germany1.xml support_files/definitions/germany/league_germany2.xml support_files/definitions/germany/league_germany3a.xml support_files/definitions/germany/league_germany3b.xml support_files/definitions/germany/country_germany.xml support_files/definitions/ireland/country_ireland.xml support_files/definitions/ireland/cup_ireland_league.xml support_files/definitions/ireland/cup_ireland_senior.xml support_files/definitions/ireland/league_ireland1.xml support_files/definitions/ireland/league_n_ireland1.xml support_files/definitions/ireland/league_ireland2.xml support_files/definitions/ireland/cup_ireland_prom_games.xml support_files/definitions/ireland/cup_ireland_setanta.xml support_files/definitions/ireland/cup_ireland_cl.xml support_files/definitions/ireland/cup_ireland_cl_q.xml support_files/definitions/ireland/cup_ireland_uefa.xml support_files/definitions/ireland/cup_ireland_uefa_q.xml support_files/definitions/italy/country_italy.xml support_files/definitions/italy/cup_italy_coppa.xml support_files/definitions/italy/league_italy1.xml support_files/definitions/italy/league_italy2.xml support_files/definitions/italy/league_italy3a.xml support_files/definitions/italy/league_italy3b.xml support_files/definitions/misc/cup_supercup_league_vs_cup.xml support_files/definitions/poland/league_poland1.xml support_files/definitions/poland/league_poland2.xml support_files/definitions/poland/league_poland3a.xml support_files/definitions/poland/league_poland3b.xml support_files/definitions/poland/league_poland3c.xml support_files/definitions/poland/league_poland3d.xml support_files/definitions/poland/country_poland.xml support_files/definitions/poland/cup_poland_prom_games1.xml support_files/definitions/poland/cup_poland_prom_games2.xml support_files/definitions/poland/cup_poland_puchar.xml support_files/definitions/romania/country_romania.xml support_files/definitions/romania/league_romania1.xml support_files/definitions/romania/league_romania2.xml support_files/definitions/romania/league_romania3.xml support_files/definitions/romania/cup_supercup_romania.xml support_files/definitions/romania/cup_romania_cupa.xml support_files/definitions/scg/country_scg.xml support_files/definitions/scg/cup_scg.xml support_files/definitions/scg/league_scg2a.xml support_files/definitions/scg/league_scg2b.xml support_files/definitions/scg/league_scg1.xml support_files/definitions/scotland/league_scotland1.xml support_files/definitions/scotland/country_scotland.xml support_files/definitions/scotland/league_scotland2.xml support_files/definitions/scotland/cup_scotland_league.xml support_files/definitions/scotland/league_scotland3.xml support_files/definitions/scotland/league_scotland4.xml support_files/definitions/scotland/cup_scotland_fa.xml support_files/definitions/short_leagues/league_czech1_short.xml support_files/definitions/short_leagues/league_denmark1_short.xml support_files/definitions/short_leagues/league_greece1_short.xml support_files/definitions/short_leagues/league_portugal1_short.xml support_files/definitions/short_leagues/league_russia1_short.xml support_files/definitions/short_leagues/league_switzerland1_short.xml support_files/definitions/short_leagues/league_turkey1_short.xml support_files/definitions/short_leagues/league_ukraine1_short.xml support_files/definitions/short_leagues_south_america/league_bolivia1_short.xml support_files/definitions/short_leagues_south_america/league_chile1_short.xml support_files/definitions/short_leagues_south_america/league_colombia1_short.xml support_files/definitions/short_leagues_south_america/league_ecuador1_short.xml support_files/definitions/short_leagues_south_america/league_mexico1_short.xml support_files/definitions/short_leagues_south_america/league_paraguay1_short.xml support_files/definitions/short_leagues_south_america/league_peru1_short.xml support_files/definitions/short_leagues_south_america/league_uruguay1_short.xml support_files/definitions/short_leagues_south_america/league_venezuela1_short.xml support_files/definitions/spain/country_spain.xml support_files/definitions/spain/cup_spain_cdr.xml support_files/definitions/spain/cup_spain_prom_games_1.xml support_files/definitions/spain/cup_spain_prom_games_2.xml support_files/definitions/spain/cup_spain_prom_games_3.xml support_files/definitions/spain/cup_spain_prom_games_4.xml support_files/definitions/spain/cup_spain_rfef.xml support_files/definitions/spain/league_spain1.xml support_files/definitions/spain/league_spain2.xml support_files/definitions/spain/league_spain3a.xml support_files/definitions/spain/league_spain3b.xml support_files/definitions/spain/league_spain3c.xml support_files/definitions/spain/league_spain3d.xml support_files/definitions/usa/league_usa_econf.xml support_files/definitions/usa/country_usa.xml support_files/definitions/usa/league_usa_wconf.xml support_files/definitions/usa/cup_usa_eplayoff.xml support_files/definitions/usa/cup_usa_wplayoff.xml support_files/definitions/usa/cup_usa_mls_cup.xml support_files/definitions/wales/league_wales1.xml support_files/definitions/wales/league_wales2a.xml support_files/definitions/wales/league_wales2b.xml support_files/definitions/wales/country_wales.xml support_files/definitions/wales/cup_wales_welsh.xml support_files/definitions/wales/cup_wales_challenge.xml support_files/definitions/wales/cup_wales_premier.xml support_files/definitions/wales/league_wales_english.xml support_files/definitions/wales/cup_wales_uefa_q.xml support_files/definitions/wales/cup_wales_uefa.xml support_files/definitions/wales/cup_wales_cl.xml support_files/definitions/wales/cup_wales_cl_q.xml support_files/definitions/wc06/league_wc06_europe_teams.xml support_files/definitions/wc06/league_wc06_asia_teams.xml support_files/definitions/wc06/country_wc06.xml support_files/definitions/wc06/cup_wc06_africa.xml support_files/definitions/wc06/cup_wc06_europe.xml support_files/definitions/wc06/cup_wc06_europe_playoffs.xml support_files/definitions/wc06/cup_wc06_oceania.xml support_files/definitions/wc06/cup_wc06_ncamerica.xml support_files/definitions/wc06/league_wc06_africa_teams.xml support_files/definitions/wc06/league_wc06_samerica_teams.xml support_files/definitions/wc06/league_wc06_ncamerica_teams.xml support_files/definitions/wc06/cup_wc06_samerica.xml support_files/definitions/wc06/league_wc06_oceania_teams.xml support_files/definitions/wc06/cup_wc06_asia.xml support_files/definitions/wc06/cup_wc06_final.xml support_files/definitions/wc06/cup_wc06_oceania_samerica.xml support_files/definitions/wc06/cup_wc06_asia_ncamerica.xml support_files/definitions/wc06/cup_wc06_asia_playoff.xml support_files/definitions/wc06/0,2548,All-Sep-2005,00.html support_files/definitions/netherlands/country_netherlands.xml support_files/definitions/netherlands/cup_netherlands_amstelcup.xml support_files/definitions/netherlands/cup_netherlands_nacompetitie2.xml support_files/definitions/netherlands/cup_netherlands_nacompetitie3.xml support_files/definitions/netherlands/cup_netherlands_nacompetitie4.xml support_files/definitions/netherlands/league_netherlands1.xml support_files/definitions/netherlands/league_netherlands2.xml support_files/definitions/netherlands/league_netherlands3a.xml support_files/definitions/netherlands/league_netherlands3b.xml support_files/definitions/netherlands/league_netherlands3c.xml support_files/bygfoot_constants support_files/bygfoot_user.conf support_files/lg_commentary/lg_commentary_de.xml support_files/lg_commentary/lg_commentary_en.xml support_files/lg_commentary/lg_commentary_nl.xml support_files/lg_commentary/lg_commentary_pl.xml support_files/lg_commentary/lg_commentary_bg.xml support_files/bygfoot_app support_files/bygfoot_help support_files/strategy/tmp/strategy_attack1.xml support_files/strategy/tmp/strategy_attack2.xml support_files/strategy/tmp/strategy_defend.xml support_files/strategy/tmp/strategy_fit.xml support_files/strategy/tmp/strategy_normal2.xml support_files/strategy/strategy_gy.xml support_files/strategy/strategy_defence.xml support_files/bygfoot_tokens support_files/mmedia/pics/match10.jpg support_files/mmedia/pics/match11.jpg support_files/mmedia/pics/match12.jpg support_files/mmedia/pics/match13.jpg support_files/mmedia/pics/match14.jpg support_files/mmedia/pics/match15.jpg support_files/mmedia/pics/match16.jpg support_files/mmedia/pics/match1.jpg support_files/mmedia/pics/match2.jpg support_files/mmedia/pics/match3.jpg support_files/mmedia/pics/match4.jpg support_files/mmedia/pics/match5.jpg support_files/mmedia/pics/match6.jpg support_files/mmedia/pics/match7.jpg support_files/mmedia/pics/match8.jpg support_files/mmedia/pics/match9.jpg support_files/mmedia/pics/soccerbabes.jpg 
 
 install-data-local:
 	@$(NORMAL_INSTALL)
diff --git a/configure.in b/configure.in
index ce10e9a4..eccb4750 100644
--- a/configure.in
+++ b/configure.in
@@ -23,6 +23,42 @@ dnl Add the languages which your application supports here.
 ALL_LINGUAS="de nl fr pl ro bg zh es da"
 AM_GLIB_GNU_GETTEXT
 
+dnl gstreamer checking
+
+AC_ARG_ENABLE(gstreamer,
+	AC_HELP_STRING([--enable-gstreamer],[use GStreamer for media]),
+	[case "${enableval}" in
+	yes) ENABLE_GST=yes ;;
+        no)  ENABLE_GST=no ;;
+	*) AC_MSG_ERROR(bad value ${enableval} for --enable-gstreamer) ;;
+	esac],
+	[ENABLE_GST=no]) dnl Default value
+
+
+
+if test x$ENABLE_GST = xyes; then
+	HAVE_GSTREAMER=0
+	dnl start with 0.8
+	GST_MAJORMINOR=0.8
+	GSTREAMER_REQUIRED=0.8
+	PKG_CHECK_MODULES(GST, \
+		gstreamer-$GST_MAJORMINOR >= $GSTREAMER_REQUIRED,
+		HAVE_GSTREAMER=1,HAVE_GSTREAMER=0)
+	
+	if test "x$HAVE_GSTREAMER" = "x0"; then
+		AC_MSG_ERROR(you need gstreamer development packages installed !)
+	fi
+
+	AC_SUBST(GST_CFLAGS)
+	AC_SUBST(GST_LIBS)
+	AC_SUBST(HAVE_GSTREAMER)	
+	AC_DEFINE_UNQUOTED(HAVE_GSTREAMER, $HAVE_GSTREAME,[gstreamer])
+	AC_MSG_RESULT(GStreamer)
+fi
+
+
+
+
 AC_OUTPUT([
 Makefile
 src/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 714f2697..45733804 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,11 +4,12 @@ AM_CFLAGS = -Wall #-fprofile-arcs -ftest-coverage -pg
 INCLUDES = \
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-	@PACKAGE_CFLAGS@
+	@PACKAGE_CFLAGS@ @GST_CFLAGS@
 
 bin_PROGRAMS = bygfoot
 
 bygfoot_SOURCES = \
+	mediaplayer.c mediaplayer.h \
 	bet.c bet.h bet_struct.h \
 	callback_func.c callback_func.h callbacks.h cup.h finance.h fixture.h game_gui.h gui.h league.h live_game.h maths.h misc.h option.h player.h start_end.h team.h transfer.h treeview.h treeview_helper.h user.h window.h \
 	callbacks.c callback_func.h callbacks.h debug.h free.h game_gui.h game.h gui.h league.h load_save.h main.h option.h player.h table.h team.h transfer.h treeview2.h treeview.h treeview_helper.h user.h window.h \
@@ -80,5 +81,5 @@ bygfoot_SOURCES = \
 	xml_team.c file.h free.h main.h misc.h option.h player.h team.h variables.h xml_team.h \
 	youth_academy.c free.h maths.h name.h option.h player.h team.h user.h youth_academy.h 
 
-bygfoot_LDADD = @PACKAGE_LIBS@ $(INTLLIBS)
+bygfoot_LDADD = @PACKAGE_LIBS@ @GST_LIBS@ $(INTLLIBS) 
 
diff --git a/src/bet.c b/src/bet.c
index 4ee67f3f..db6aa9ce 100644
--- a/src/bet.c
+++ b/src/bet.c
@@ -1,4 +1,6 @@
 /*
+   bet.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -213,8 +215,9 @@ bet_is_user(const BetMatch *bet)
     return NULL;
 }
 
-/** Place a new bet. */
-void
+/** Place a new bet. 
+    @return TRUE on success, FALSE otherwise. */
+gboolean
 bet_place(gint fix_id, gint outcome, gint wager)
 {
     gfloat max_wager = finance_wage_unit(current_user.tm) * 
@@ -223,19 +226,19 @@ bet_place(gint fix_id, gint outcome, gint wager)
     gchar buf[SMALL];
 
     if(wager <= 0)
-	return;
+	return TRUE;
 
     if(wager > BUDGET(cur_user))
     {
 	game_gui_show_warning(_("You don't have the money."));
-	return;
+	return FALSE;
     }
 
     if(wager > max_wager)
     {
 	misc_print_grouped_int((gint)rint(max_wager), buf);
 	game_gui_show_warning(_("The betting office doesn't allow you to wager more than %s."), buf);
-	return;
+	return FALSE;
     }
 
     new_bet.fix_id = fix_id;
@@ -246,6 +249,8 @@ bet_place(gint fix_id, gint outcome, gint wager)
 
     if(window.bets != NULL)
 	treeview2_show_bets();
+
+    return TRUE;
 }
 
 /** Remove the bet on the given fixture. */
diff --git a/src/bet.h b/src/bet.h
index 99bb78a6..f163d49d 100644
--- a/src/bet.h
+++ b/src/bet.h
@@ -1,4 +1,6 @@
 /*
+   bet.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -46,7 +48,7 @@ bet_round_odd(gfloat odd);
 BetUser*
 bet_is_user(const BetMatch *bet);
 
-void
+gboolean
 bet_place(gint fix_id, gint outcome, gint wager);
 
 void
diff --git a/src/bet_struct.h b/src/bet_struct.h
index 449270c2..b7d9027f 100644
--- a/src/bet_struct.h
+++ b/src/bet_struct.h
@@ -1,4 +1,6 @@
 /*
+   bet_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/bygfoot.h b/src/bygfoot.h
index 0c3a8b03..1d71f0b3 100644
--- a/src/bygfoot.h
+++ b/src/bygfoot.h
@@ -1,4 +1,6 @@
 /*
+   bygfoot.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/callback_func.c b/src/callback_func.c
index ec785d44..9ad522a0 100644
--- a/src/callback_func.c
+++ b/src/callback_func.c
@@ -1,4 +1,6 @@
 /*
+   callback_func.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -99,6 +101,14 @@ callback_player_clicked(gint idx, GdkEventButton *event)
     if(event->type != GDK_BUTTON_PRESS)
 	return;
 
+    /*d*/
+    gint i;
+    for(i=0;i<lig(1).teams->len;i++)
+	printf("%d %s %d\n", i, g_array_index(lig(1).teams,
+					      Team, i).name,
+	       g_array_index(lig(1).teams,
+			     Team, i).id);
+
     if(event->button == 1)
     {
 	if(selected_row == -1)
diff --git a/src/callback_func.h b/src/callback_func.h
index d8b5eefb..99a9c850 100644
--- a/src/callback_func.h
+++ b/src/callback_func.h
@@ -1,4 +1,6 @@
 /*
+   callback_func.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/callbacks.c b/src/callbacks.c
index 344c5481..28ad6a23 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -1,4 +1,6 @@
 /*
+   callbacks.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/callbacks.h b/src/callbacks.h
index e03e89c0..a5c153ae 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -1,4 +1,6 @@
 /*
+   callbacks.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/cup.c b/src/cup.c
index bd6a7f8c..159365ec 100644
--- a/src/cup.c
+++ b/src/cup.c
@@ -1,4 +1,6 @@
 /*
+   cup.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -230,7 +232,7 @@ cup_get_team_pointers(Cup *cup, gint round)
     GPtrArray *teams = cup_round->team_ptrs;
 
     if(debug > 60)
-	printf("cup_get_team_pointers %s \n", cup->name);
+	printf("cup_get_team_pointers %s round %d\n", cup->name, round);
 
     if(teams->len > 0)
 	g_warning("cup_get_team_pointers: round %d in cup %s has non-empty team pointers array.",
@@ -238,11 +240,13 @@ cup_get_team_pointers(Cup *cup, gint round)
 
     for(i=0;i<cup_round->choose_teams->len;i++)
 	if(g_array_index(cup_round->choose_teams, CupChooseTeam, i).generate)
-	    cup_load_choose_team_generate(cup, cup_round,
-					  &g_array_index(cup_round->choose_teams, CupChooseTeam, i));
+	    cup_load_choose_team_generate(
+		cup, cup_round,
+		&g_array_index(cup_round->choose_teams, CupChooseTeam, i));
 	else
-	    cup_load_choose_team(cup, teams, 
-				 &g_array_index(cup_round->choose_teams, CupChooseTeam, i));
+	    cup_load_choose_team(
+		cup, teams, 
+		&g_array_index(cup_round->choose_teams, CupChooseTeam, i));
 
     if(cup_round->teams->len > 0)
 	while(teams->len + cup_round->teams->len > cup_round->new_teams)
@@ -260,7 +264,10 @@ cup_get_team_pointers(Cup *cup, gint round)
 
     if(debug > 70)
 	for(i=0;i<teams->len;i++)
-	    printf("cup_get_team_pointers: %d %s \n", i, ((Team*)g_ptr_array_index(teams, i))->name);
+	    printf("cup_get_team_pointers: %d %s (%d) %s\n", i,
+		   ((Team*)g_ptr_array_index(teams, i))->name,
+		   ((Team*)g_ptr_array_index(teams, i))->clid,
+		   cup->name);
 }
 
 /** Get the pointers to the teams (already generated, in one of the leagues or cups)
@@ -964,55 +971,33 @@ cup_get_winner(const Cup *cup)
 gboolean
 query_cup_begins(const Cup *cup)
 {
-    gint i;
+    gint i, j;
     const League *league = NULL;
     const Cup *cup_temp = NULL;
-    gboolean proceed = FALSE;
-    const CupRound *cup_round = &g_array_index(cup->rounds, CupRound, 0);
+    const CupRound *cup_round = NULL;
 
-    for(i=0;i<cup_round->choose_teams->len;i++)
-	if(!g_array_index(cup_round->choose_teams,CupChooseTeam, i).generate)
-	{
-	    
-	    cup_get_choose_team_league_cup(
-		&g_array_index(cup_round->choose_teams,
-			       CupChooseTeam, i), &league, &cup_temp);
+    for(j=0;j<cup->rounds->len;j++)
+    {
+	cup_round = &g_array_index(cup->rounds, CupRound, j);
 
-	    if((cup_temp == NULL && 
-		(!league->active || 
-		 (g_array_index(league->fixtures, Fixture,
-				league->fixtures->len - 1).week_number == week &&
-		  g_array_index(league->fixtures, Fixture,
-				league->fixtures->len - 1).week_round_number == week_round))) ||
-	       (league == NULL && 
-		(cup_temp->fixtures->len > 0 &&
-		 g_array_index(cup_temp->fixtures, Fixture,
-			       cup_temp->fixtures->len - 1).week_number == week &&
-		 g_array_index(cup_temp->fixtures, Fixture,
-			       cup_temp->fixtures->len - 1).week_round_number == week_round)))
-		proceed = TRUE;
-	}
-    
-    if(!proceed)
-	return FALSE;
-
-    for(i=0;i<cup_round->choose_teams->len;i++)
-	if(!g_array_index(cup_round->choose_teams,CupChooseTeam, i).generate)
-	{
-	    cup_get_choose_team_league_cup(
-		&g_array_index(cup_round->choose_teams,
-			       CupChooseTeam, i), &league, &cup_temp);
-	    if((cup_temp == NULL &&
-		(league->active &&
-		 g_array_index(league->fixtures, Fixture,
-			       league->fixtures->len - 1).attendance == -1)) ||
-	       (league == NULL &&
-		(cup_temp->fixtures->len == 0 || 
-		 (cup_temp->fixtures->len > 0 && 
-		  g_array_index(cup_temp->fixtures, Fixture,
-				cup_temp->fixtures->len - 1).attendance == -1))))
-		return FALSE;
-	}
+	for(i=0;i<cup_round->choose_teams->len;i++)
+	    if(!g_array_index(cup_round->choose_teams,CupChooseTeam, i).generate)
+	    {		
+		cup_get_choose_team_league_cup(
+		    &g_array_index(cup_round->choose_teams,
+				   CupChooseTeam, i), &league, &cup_temp);
+		
+		if((cup_temp == NULL && 
+		    (!league->active || 
+		     g_array_index(league->fixtures, Fixture,
+				   league->fixtures->len - 1).attendance == -1)) ||
+		   (league == NULL && 
+		    cup_temp->fixtures->len > 0 &&
+		    g_array_index(cup_temp->fixtures, Fixture,
+				  cup_temp->fixtures->len - 1).attendance == -1))
+		    return FALSE;
+	    }
+    }
 
     return TRUE;
 }
diff --git a/src/cup.h b/src/cup.h
index 6af08ee9..73d51f1a 100644
--- a/src/cup.h
+++ b/src/cup.h
@@ -1,4 +1,6 @@
 /*
+   cup.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/cup_struct.h b/src/cup_struct.h
index 8bbd46f0..be247710 100644
--- a/src/cup_struct.h
+++ b/src/cup_struct.h
@@ -1,4 +1,6 @@
 /*
+   cup_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/debug.c b/src/debug.c
index 16595d3f..db9f1558 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,4 +1,6 @@
 /*
+   debug.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -168,3 +170,23 @@ debug_calibrate_betting_odds(gint skilldiffmax, gint matches_per_skilldiff)
 	       (gfloat)res[1] / (gfloat)matches, (gfloat)res[2] / (gfloat)matches);
     }
 }
+
+/** Check whether the 4 forwards, boost on, style all-out-attack
+    easter egg should be activated. */
+gboolean
+debug_egg_forwards_boost_style(void)
+{
+    gint i, fwds = 0;
+    
+    if(current_user.tm->boost != 1 ||
+       current_user.tm->style != 2 ||
+       current_user.tm->players->len < 11)
+	return FALSE;
+
+    for(i=0;i<11;i++)
+	if(g_array_index(current_user.tm->players, Player, i).cpos == 3 &&
+	   g_array_index(current_user.tm->players, Player, i).cskill > 0)
+	    fwds++;
+
+    return (fwds > 3);
+}
diff --git a/src/debug.h b/src/debug.h
index d743a00f..db04d622 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -1,4 +1,6 @@
 /*
+   debug.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -35,5 +37,8 @@ debug_reset_counter(gpointer data);
 void
 debug_calibrate_betting_odds(gint skilldiffmax, gint matches_per_skilldiff);
 
+gboolean
+debug_egg_forwards_boost_style(void);
+
 #endif
 
diff --git a/src/enums.h b/src/enums.h
index 8c8bb61c..cbc9c794 100644
--- a/src/enums.h
+++ b/src/enums.h
@@ -1,4 +1,6 @@
 /*
+   enums.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/file.c b/src/file.c
index 05d1964c..c53f3ea6 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1,4 +1,6 @@
 /*
+   file.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/file.h b/src/file.h
index 66aac953..ef6265e3 100644
--- a/src/file.h
+++ b/src/file.h
@@ -1,4 +1,6 @@
 /*
+   file.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/finance.c b/src/finance.c
index 2eb8607c..f8d98c05 100644
--- a/src/finance.c
+++ b/src/finance.c
@@ -1,4 +1,6 @@
 /*
+   finance.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/finance.h b/src/finance.h
index 50b4a953..60a86bcf 100644
--- a/src/finance.h
+++ b/src/finance.h
@@ -1,4 +1,6 @@
 /*
+   finance.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/fixture.c b/src/fixture.c
index 86e2c4b7..d9dcf089 100644
--- a/src/fixture.c
+++ b/src/fixture.c
@@ -1,4 +1,6 @@
 /*
+   fixture.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -524,6 +526,10 @@ fixture_write_knockout_round(Cup *cup, gint cup_round, GPtrArray *teams)
     gint bye_len = (round->byes == -1) ?
 	math_get_bye_len(len) : round->byes;
 
+    if(debug > 60)
+	printf("fixture_write_knockout_round: %s %d byelen %d\n",
+	       cup->name, cup_round, bye_len);
+
     if(bye_len != 0)
     {
 	cup->bye = g_ptr_array_new();
@@ -556,7 +562,8 @@ fixture_write_knockout_round(Cup *cup, gint cup_round, GPtrArray *teams)
 	    fixture_get_free_round(first_week + cup->week_gap, teams, -1, -1);
 	for(i=0; i<=(teams->len - 2) / 2; i++)
 	    fixture_write(cup->fixtures, (Team*)g_ptr_array_index(teams, 2 * i + 1),
-			  (Team*)g_ptr_array_index(teams, 2 * i), first_week + cup->week_gap,
+			  (Team*)g_ptr_array_index(teams, 2 * i), 
+			  first_week + cup->week_gap,
 			  week_round_number, cup->id, cup_round, 0,
 			  !round->neutral, TRUE, TRUE);
     }
@@ -564,11 +571,14 @@ fixture_write_knockout_round(Cup *cup, gint cup_round, GPtrArray *teams)
     g_array_sort_with_data(cup->fixtures, fixture_compare_func,
 			   GINT_TO_POINTER(FIXTURE_COMPARE_DATE + 100));
 
-    cup->next_fixture_update_week = (cup_round < cup->rounds->len - 1 || round->replay > 0) ?
+    cup->next_fixture_update_week = 
+	(cup_round < cup->rounds->len - 1 || round->replay > 0) ?
 	g_array_index(cup->fixtures, Fixture, cup->fixtures->len - 1).week_number : -1;
-    cup->next_fixture_update_week_round = (cup_round < cup->rounds->len - 1 || round->replay > 0) ?
+    
+    cup->next_fixture_update_week_round = 
+	(cup_round < cup->rounds->len - 1 || round->replay > 0) ?
 	g_array_index(cup->fixtures, Fixture, cup->fixtures->len - 1).week_round_number : -1;
-
+    
     g_ptr_array_free(teams, TRUE);
 }
 
diff --git a/src/fixture.h b/src/fixture.h
index be309a34..636a959a 100644
--- a/src/fixture.h
+++ b/src/fixture.h
@@ -1,4 +1,6 @@
 /*
+   fixture.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/fixture_struct.h b/src/fixture_struct.h
index 10b24796..cc2249f8 100644
--- a/src/fixture_struct.h
+++ b/src/fixture_struct.h
@@ -1,4 +1,6 @@
 /*
+   fixture_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/free.c b/src/free.c
index 7908d0f0..a4d08837 100644
--- a/src/free.c
+++ b/src/free.c
@@ -1,4 +1,6 @@
 /*
+   free.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/free.h b/src/free.h
index f8758d43..b2d3b956 100644
--- a/src/free.h
+++ b/src/free.h
@@ -1,4 +1,6 @@
 /*
+   free.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/game.c b/src/game.c
index 2bc4d10f..50883d24 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,4 +1,6 @@
 /*
+   game.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/game.h b/src/game.h
index ed8fd5aa..eed7869a 100644
--- a/src/game.h
+++ b/src/game.h
@@ -1,4 +1,6 @@
 /*
+   game.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/game_gui.c b/src/game_gui.c
index 5eadb197..e4eb0bbc 100644
--- a/src/game_gui.c
+++ b/src/game_gui.c
@@ -1,4 +1,6 @@
 /*
+   game_gui.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/game_gui.h b/src/game_gui.h
index 831852a2..0a2ec850 100644
--- a/src/game_gui.h
+++ b/src/game_gui.h
@@ -1,4 +1,6 @@
 /*
+   game_gui.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/gettext_macros.h b/src/gettext_macros.h
index f8871783..d31252c7 100644
--- a/src/gettext_macros.h
+++ b/src/gettext_macros.h
@@ -1,4 +1,6 @@
 /*
+   gettext_macros.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/gui.c b/src/gui.c
index c347cc86..15a12708 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -1,4 +1,6 @@
 /*
+   gui.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/gui.h b/src/gui.h
index 5f854631..b2e7bcc7 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -1,4 +1,6 @@
 /*
+   gui.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/language.c b/src/language.c
index 603f6fef..5c5ee9b8 100644
--- a/src/language.c
+++ b/src/language.c
@@ -1,4 +1,6 @@
 /*
+   language.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/language.h b/src/language.h
index 04685df3..654f87db 100644
--- a/src/language.h
+++ b/src/language.h
@@ -1,4 +1,6 @@
 /*
+   language.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/league.c b/src/league.c
index e5568787..0ba987bc 100644
--- a/src/league.c
+++ b/src/league.c
@@ -1,4 +1,6 @@
 /*
+   league.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -349,6 +351,9 @@ league_remove_team_with_id(League *league, gint id)
 {
     gint i;
 
+    /*d*/
+    printf("lrm %s %d\n", league->name, id);
+
     for(i=0;i<league->teams->len;i++)
 	if(g_array_index(league->teams, Team, i).id == id)
 	{
@@ -496,6 +501,9 @@ league_get_team_movements_prom_rel(const League *league, GArray *team_movements)
 	    new_move.dest_idcs = dest_idcs;
 	    new_move.dest_assigned = FALSE;
 	    g_array_append_val(team_movements, new_move);
+
+	    printf("tmov1 %s tm %s %d\n", league->name, new_move.tm.name,
+		   new_move.tm.id);
 	}
 
 	free_gchar_array(&dest_sids);
@@ -544,6 +552,9 @@ league_get_team_movements_prom_games(const League *league, GArray *team_movement
 	new_move.dest_idcs = dest_idcs;
 	new_move.dest_assigned = FALSE;
 	g_array_append_val(team_movements, new_move);
+
+	printf("tmov2 %s tm %s %d\n", league->name, new_move.tm.name,
+	       new_move.tm.id);
     }
 
     free_gchar_array(&dest_sids);
diff --git a/src/league.h b/src/league.h
index 58fe727a..5ce2a3d1 100644
--- a/src/league.h
+++ b/src/league.h
@@ -1,4 +1,6 @@
 /*
+   league.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/league_struct.h b/src/league_struct.h
index e8918a68..36fb58cc 100644
--- a/src/league_struct.h
+++ b/src/league_struct.h
@@ -1,4 +1,6 @@
 /*
+   league_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/lg_commentary.c b/src/lg_commentary.c
index 8825d607..3c9b5c79 100644
--- a/src/lg_commentary.c
+++ b/src/lg_commentary.c
@@ -1,4 +1,6 @@
 /*
+   lg_commentary.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/lg_commentary.h b/src/lg_commentary.h
index c057f8d3..dab7504d 100644
--- a/src/lg_commentary.h
+++ b/src/lg_commentary.h
@@ -1,4 +1,6 @@
 /*
+   lg_commentary.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/lg_commentary_struct.h b/src/lg_commentary_struct.h
index dea6ae6d..317d62d9 100644
--- a/src/lg_commentary_struct.h
+++ b/src/lg_commentary_struct.h
@@ -1,4 +1,6 @@
 /*
+   lg_commentary_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/live_game.c b/src/live_game.c
index 560049da..5a4af5cf 100644
--- a/src/live_game.c
+++ b/src/live_game.c
@@ -1,4 +1,6 @@
 /*
+   live_game.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -60,8 +62,7 @@ gboolean show;
 /** Calculate the result of a fixture using
     the live game variable.
     @param fix The fixture we calculate.
-    @see live_game_create_unit(), live_game_evaluate_unit(),
-    treeview_live_game_show_game_unit() */
+*/
 void
 live_game_calculate_fixture(Fixture *fix)
 {
@@ -81,7 +82,7 @@ live_game_calculate_fixture(Fixture *fix)
 
     do
     {
-	live_game_create_unit();	
+	live_game_create_unit();
 	live_game_evaluate_unit(&last_unit);
     }
     while(last_unit.event.type != LIVE_GAME_EVENT_END_MATCH &&
@@ -728,6 +729,8 @@ live_game_event_general(gboolean create_new)
 	   last_unit.event.type == LIVE_GAME_EVENT_STADIUM_BREAKDOWN ||
 	   last_unit.event.type == LIVE_GAME_EVENT_STADIUM_FIRE ||
 	   last_unit.event.type == LIVE_GAME_EVENT_STADIUM_RIOTS ||
+	   (last_unit.event.type >= LIVE_GAME_EVENT_STRUCTURE_CHANGE &&
+	    last_unit.event.type <= LIVE_GAME_EVENT_BOOST_CHANGE_ON) ||
 	   ((last_unit.event.type == LIVE_GAME_EVENT_POST ||
 	     last_unit.event.type == LIVE_GAME_EVENT_CROSS_BAR) &&
 	    math_rnd(0, 1) < const_float("float_live_game_possession_after_post")))
@@ -780,6 +783,10 @@ live_game_event_general(gboolean create_new)
 
     if(team_is_user(tm1) == -1)
 	strategy_live_game_check(match, 1);
+
+    if(last_unit.event.type >= LIVE_GAME_EVENT_STRUCTURE_CHANGE &&
+       last_unit.event.type <= LIVE_GAME_EVENT_BOOST_CHANGE_ON)
+	live_game_event_general(TRUE);
 }
 
 /** Fill in the players values in a general unit. */
diff --git a/src/live_game.h b/src/live_game.h
index 6df7b2c0..2000579a 100644
--- a/src/live_game.h
+++ b/src/live_game.h
@@ -1,4 +1,6 @@
 /*
+   live_game.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/live_game_struct.h b/src/live_game_struct.h
index bccc03bd..2d514746 100644
--- a/src/live_game_struct.h
+++ b/src/live_game_struct.h
@@ -1,4 +1,6 @@
 /*
+   live_game_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -67,14 +69,14 @@ enum LiveGameEventType
     LIVE_GAME_EVENT_STADIUM_FIRE, /* 27 */
     LIVE_GAME_EVENT_SUBSTITUTION, /* 28 */
     LIVE_GAME_EVENT_STRUCTURE_CHANGE, /* 29 */
-    LIVE_GAME_EVENT_STYLE_CHANGE_ALL_OUT_DEFEND,
-    LIVE_GAME_EVENT_STYLE_CHANGE_DEFEND,
-    LIVE_GAME_EVENT_STYLE_CHANGE_BALANCED,
-    LIVE_GAME_EVENT_STYLE_CHANGE_ATTACK,
-    LIVE_GAME_EVENT_STYLE_CHANGE_ALL_OUT_ATTACK,
-    LIVE_GAME_EVENT_BOOST_CHANGE_ANTI,
-    LIVE_GAME_EVENT_BOOST_CHANGE_OFF,
-    LIVE_GAME_EVENT_BOOST_CHANGE_ON,
+    LIVE_GAME_EVENT_STYLE_CHANGE_ALL_OUT_DEFEND, /* 30 */
+    LIVE_GAME_EVENT_STYLE_CHANGE_DEFEND, /* 31 */
+    LIVE_GAME_EVENT_STYLE_CHANGE_BALANCED, /* 32 */
+    LIVE_GAME_EVENT_STYLE_CHANGE_ATTACK, /* 33 */
+    LIVE_GAME_EVENT_STYLE_CHANGE_ALL_OUT_ATTACK, /* 34 */
+    LIVE_GAME_EVENT_BOOST_CHANGE_ANTI, /* 35 */
+    LIVE_GAME_EVENT_BOOST_CHANGE_OFF, /* 36 */
+    LIVE_GAME_EVENT_BOOST_CHANGE_ON, /* 37 */
     LIVE_GAME_EVENT_END
 };
 
diff --git a/src/load_save.c b/src/load_save.c
index 6809be76..dfa2ee45 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -1,4 +1,6 @@
 /*
+   load_save.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/load_save.h b/src/load_save.h
index 9cf1cc7e..dbd1f5da 100644
--- a/src/load_save.h
+++ b/src/load_save.h
@@ -1,4 +1,6 @@
 /*
+   load_save.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/main.c b/src/main.c
index 945b2e8b..23900f27 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,6 @@
 /*
+   main.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -38,6 +40,7 @@
 #include "live_game.h"
 #include "load_save.h"
 #include "main.h"
+#include "mediaplayer.h"
 #include "misc.h"
 #include "misc_callbacks.h"
 #include "name_struct.h"
@@ -76,7 +79,7 @@ main_parse_cl_arguments(gint *argc, gchar ***argv)
 
 	 { "last-save", 'l', 0, G_OPTION_ARG_NONE, &load_last_save, _("Load last savegame"), NULL },
 
-	 { "testcom", 't', 0, G_OPTION_ARG_NONE, &testcom, _("Test an XML commmentary file"), NULL },
+	 { "testcom", 't', 0, G_OPTION_ARG_NONE, &testcom, _("Test an XML commentary file"), NULL },
 
 	 { "commentary-file", 'c', 0, G_OPTION_ARG_STRING, &testcom_file,
 	   _("Commentary file name (may be in a support dir)"), "FILE" },
@@ -276,9 +279,12 @@ main (gint argc, gchar *argv[])
 
     gtk_set_locale ();
     gtk_init (&argc, &argv);
-  
+    mediaplayer_init(&argc, &argv);
+
     main_init(&argc, &argv);
 
+/*     mediaplayer_play_media("file://receive.ogg"); */
+
     if((load_last_save && !load_game_from_command_line("last_save")) ||
        (!load_last_save && (argc == 1 ||
 			    (argc > 1 && !load_game_from_command_line(argv[1])))))
diff --git a/src/main.h b/src/main.h
index d1c7c8e4..e202aff5 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,4 +1,6 @@
 /*
+   main.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/maths.c b/src/maths.c
index 81a16db6..b1df3344 100644
--- a/src/maths.c
+++ b/src/maths.c
@@ -1,4 +1,6 @@
 /*
+   maths.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/maths.h b/src/maths.h
index edded1cb..131d5424 100644
--- a/src/maths.h
+++ b/src/maths.h
@@ -1,4 +1,6 @@
 /*
+   maths.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/misc.c b/src/misc.c
index 23dc50df..09abfdf8 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1,4 +1,6 @@
 /*
+   misc.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/misc.h b/src/misc.h
index 5006a1f2..66275eb9 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -1,4 +1,6 @@
 /*
+   misc.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/misc2_callback_func.c b/src/misc2_callback_func.c
index f46893cc..ba2bb34c 100644
--- a/src/misc2_callback_func.c
+++ b/src/misc2_callback_func.c
@@ -1,4 +1,6 @@
 /*
+   misc2_callback_func.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/misc2_callback_func.h b/src/misc2_callback_func.h
index 84033ea1..1790bb50 100644
--- a/src/misc2_callback_func.h
+++ b/src/misc2_callback_func.h
@@ -1,4 +1,6 @@
 /*
+   misc2_callback_func.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/misc2_callbacks.c b/src/misc2_callbacks.c
index c62bae2c..cba2bae4 100644
--- a/src/misc2_callbacks.c
+++ b/src/misc2_callbacks.c
@@ -1,4 +1,6 @@
 /*
+   misc2_callbacks.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -148,7 +150,8 @@ on_button_digits_ok_clicked            (GtkButton       *button,
 	    current_user.youth_academy.percentage = values[1];
 	    break;
 	case STATUS_PLACE_BET:
-	    bet_place(stat2, stat3, values[0]);
+	    if(!bet_place(stat2, stat3, values[0]))
+		destroy_window = FALSE;
 	    break;
     }
 
diff --git a/src/misc2_callbacks.h b/src/misc2_callbacks.h
index eab1154d..524d581e 100644
--- a/src/misc2_callbacks.h
+++ b/src/misc2_callbacks.h
@@ -1,4 +1,6 @@
 /*
+   misc2_callbacks.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/misc3_callbacks.c b/src/misc3_callbacks.c
index a68fac88..362268e2 100644
--- a/src/misc3_callbacks.c
+++ b/src/misc3_callbacks.c
@@ -1,4 +1,6 @@
 /*
+   misc3_callbacks.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/misc3_callbacks.h b/src/misc3_callbacks.h
index e5c8dfa0..2c2f8e3a 100644
--- a/src/misc3_callbacks.h
+++ b/src/misc3_callbacks.h
@@ -1,4 +1,6 @@
 /*
+   misc3_callbacks.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/misc_callback_func.c b/src/misc_callback_func.c
index 95cc8293..410d7a7f 100644
--- a/src/misc_callback_func.c
+++ b/src/misc_callback_func.c
@@ -1,4 +1,6 @@
 /*
+   misc_callback_func.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/misc_callback_func.h b/src/misc_callback_func.h
index 94cec03a..e04650b8 100644
--- a/src/misc_callback_func.h
+++ b/src/misc_callback_func.h
@@ -1,4 +1,6 @@
 /*
+   misc_callback_func.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/misc_callbacks.c b/src/misc_callbacks.c
index f7f81f01..767f4a64 100644
--- a/src/misc_callbacks.c
+++ b/src/misc_callbacks.c
@@ -1,4 +1,6 @@
 /*
+   misc_callbacks.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/misc_callbacks.h b/src/misc_callbacks.h
index 9df7ca61..9ce5f5e6 100644
--- a/src/misc_callbacks.h
+++ b/src/misc_callbacks.h
@@ -1,4 +1,6 @@
 /*
+   misc_callbacks.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/name.c b/src/name.c
index fe05c5b2..bd3682af 100644
--- a/src/name.c
+++ b/src/name.c
@@ -1,4 +1,6 @@
 /*
+   name.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/name.h b/src/name.h
index 3a64e1cc..7b51635c 100644
--- a/src/name.h
+++ b/src/name.h
@@ -1,4 +1,6 @@
 /*
+   name.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/name_struct.h b/src/name_struct.h
index 45fe9eee..ba47eb42 100644
--- a/src/name_struct.h
+++ b/src/name_struct.h
@@ -1,4 +1,6 @@
 /*
+   name_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/nonsourcestrings.c b/src/nonsourcestrings.c
index b26e0eb0..439b8c85 100644
--- a/src/nonsourcestrings.c
+++ b/src/nonsourcestrings.c
@@ -1,4 +1,6 @@
 /*
+   nonsourcestrings.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/option.c b/src/option.c
index 1b59cba1..5fa0d817 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1,4 +1,6 @@
 /*
+   option.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/option.h b/src/option.h
index a7bc4edf..cf3f8f39 100644
--- a/src/option.h
+++ b/src/option.h
@@ -1,4 +1,6 @@
 /*
+   option.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/option_gui.c b/src/option_gui.c
index c0afc71a..df8b569d 100644
--- a/src/option_gui.c
+++ b/src/option_gui.c
@@ -1,4 +1,6 @@
 /*
+   option_gui.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/option_gui.h b/src/option_gui.h
index b9685242..ea7008ef 100644
--- a/src/option_gui.h
+++ b/src/option_gui.h
@@ -1,4 +1,6 @@
 /*
+   option_gui.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/option_struct.h b/src/option_struct.h
index 52a04e25..427b5c5f 100644
--- a/src/option_struct.h
+++ b/src/option_struct.h
@@ -1,4 +1,6 @@
 /*
+   option_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/options_callbacks.c b/src/options_callbacks.c
index 789c17bf..85c45086 100644
--- a/src/options_callbacks.c
+++ b/src/options_callbacks.c
@@ -1,4 +1,6 @@
 /*
+   options_callbacks.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/options_callbacks.h b/src/options_callbacks.h
index d21f7b70..7d8a6291 100644
--- a/src/options_callbacks.h
+++ b/src/options_callbacks.h
@@ -1,4 +1,6 @@
 /*
+   options_callbacks.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/player.c b/src/player.c
index e7b30bce..b5780af1 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1,4 +1,6 @@
 /*
+   player.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/player.h b/src/player.h
index df756672..ff620855 100644
--- a/src/player.h
+++ b/src/player.h
@@ -1,4 +1,6 @@
 /*
+   player.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/player_struct.h b/src/player_struct.h
index 512111f4..c6fc2908 100644
--- a/src/player_struct.h
+++ b/src/player_struct.h
@@ -1,4 +1,6 @@
 /*
+   player_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/start_end.c b/src/start_end.c
index 144d22fe..ed0de3d3 100644
--- a/src/start_end.c
+++ b/src/start_end.c
@@ -1,4 +1,6 @@
 /*
+   start_end.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -567,6 +569,12 @@ start_new_season_league_changes(void)
     for(i=0;i<ligs->len;i++)
 	league_size[i] = lig(i).teams->len;
 
+    /*d*/
+    for(i=0;i<lig(1).teams->len;i++)
+	printf("# %d %s %d\n", i, 
+	       g_array_index(lig(1).teams, Team, i).name,
+	       g_array_index(lig(1).teams, Team, i).id);
+
     for(i=0;i<team_movements->len;i++)
 	league_remove_team_with_id(
 	    league_from_clid(g_array_index(team_movements, TeamMove, i).tm.clid),
diff --git a/src/start_end.h b/src/start_end.h
index 67c4f35e..87b879d8 100644
--- a/src/start_end.h
+++ b/src/start_end.h
@@ -1,4 +1,6 @@
 /*
+   start_end.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/stat.c b/src/stat.c
index c7ab21b8..d00d4a7b 100644
--- a/src/stat.c
+++ b/src/stat.c
@@ -1,4 +1,6 @@
 /*
+   stat.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/stat.h b/src/stat.h
index 342f190a..ff56da30 100644
--- a/src/stat.h
+++ b/src/stat.h
@@ -1,4 +1,6 @@
 /*
+   stat.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/stat_struct.h b/src/stat_struct.h
index 04066fe8..427db1ec 100644
--- a/src/stat_struct.h
+++ b/src/stat_struct.h
@@ -1,4 +1,6 @@
 /*
+   stat_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/strategy.c b/src/strategy.c
index 7464eb27..05221e70 100644
--- a/src/strategy.c
+++ b/src/strategy.c
@@ -1,4 +1,6 @@
 /*
+   strategy.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/strategy.h b/src/strategy.h
index c9e96b5e..f023ca99 100644
--- a/src/strategy.h
+++ b/src/strategy.h
@@ -1,4 +1,6 @@
 /*
+   strategy.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/strategy_struct.h b/src/strategy_struct.h
index 40f54562..d1e03014 100644
--- a/src/strategy_struct.h
+++ b/src/strategy_struct.h
@@ -1,4 +1,6 @@
 /*
+   strategy_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/support.c b/src/support.c
index 18efe91f..c108b9da 100644
--- a/src/support.c
+++ b/src/support.c
@@ -1,4 +1,6 @@
 /*
+   support.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/support.h b/src/support.h
index e761d438..e545646e 100644
--- a/src/support.h
+++ b/src/support.h
@@ -1,4 +1,6 @@
 /*
+   support.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/table.c b/src/table.c
index 6b2fc794..ae5c14a9 100644
--- a/src/table.c
+++ b/src/table.c
@@ -1,4 +1,6 @@
 /*
+   table.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/table.h b/src/table.h
index 1222d4cc..f89c62a2 100644
--- a/src/table.h
+++ b/src/table.h
@@ -1,4 +1,6 @@
 /*
+   table.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/table_struct.h b/src/table_struct.h
index 82d32e5c..b6ca2bea 100644
--- a/src/table_struct.h
+++ b/src/table_struct.h
@@ -1,4 +1,6 @@
 /*
+   table_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/team.c b/src/team.c
index d403175c..8d3f607f 100644
--- a/src/team.c
+++ b/src/team.c
@@ -1,4 +1,6 @@
 /*
+   team.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -668,8 +670,10 @@ team_compare_func(gconstpointer a, gconstpointer b, gpointer data)
 					    league_from_clid(tm1->clid)->layer);
     }
     else if(type == TEAM_COMPARE_LEAGUE_LAYER)
-	return_value = misc_int_compare(league_from_clid(tm2->clid)->layer,
-					league_from_clid(tm1->clid)->layer);
+	return_value = 
+	    (tm1->clid >= ID_CUP_START || tm2->clid >= ID_CUP_START) ?
+	    0 : misc_int_compare(league_from_clid(tm2->clid)->layer,
+				 league_from_clid(tm1->clid)->layer);
     else if(type == TEAM_COMPARE_OFFENSIVE)
     {
 	gint gf1 = team_get_table_value(tm1, TABLE_GF),
diff --git a/src/team.h b/src/team.h
index 3896d634..e6efc2ab 100644
--- a/src/team.h
+++ b/src/team.h
@@ -1,4 +1,6 @@
 /*
+   team.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/team_struct.h b/src/team_struct.h
index b26ca495..27720abf 100644
--- a/src/team_struct.h
+++ b/src/team_struct.h
@@ -1,4 +1,6 @@
 /*
+   team_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/transfer.c b/src/transfer.c
index 138997ab..bc3387bc 100644
--- a/src/transfer.c
+++ b/src/transfer.c
@@ -1,4 +1,6 @@
 /*
+   transfer.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/transfer.h b/src/transfer.h
index e39e6312..36f9f76f 100644
--- a/src/transfer.h
+++ b/src/transfer.h
@@ -1,4 +1,6 @@
 /*
+   transfer.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/transfer_struct.h b/src/transfer_struct.h
index 99f74624..a530e348 100644
--- a/src/transfer_struct.h
+++ b/src/transfer_struct.h
@@ -1,4 +1,6 @@
 /*
+   transfer_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/treeview.c b/src/treeview.c
index d2553224..901708c3 100644
--- a/src/treeview.c
+++ b/src/treeview.c
@@ -1,4 +1,6 @@
 /*
+   treeview.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -123,6 +125,11 @@ treeview_set_up_team_selection_treeview(GtkTreeView *treeview)
     gtk_tree_view_set_headers_visible(treeview, TRUE);    
     gtk_tree_view_set_rules_hint(treeview, TRUE);
 
+    gtk_tree_view_set_search_column(treeview, 2);
+    gtk_tree_view_set_search_equal_func(treeview,
+					treeview_helper_search_equal,
+					NULL, NULL);
+
     /* Numbering the teams */
     col = gtk_tree_view_column_new();
     gtk_tree_view_append_column(treeview, col);
diff --git a/src/treeview.h b/src/treeview.h
index 025d1442..88324933 100644
--- a/src/treeview.h
+++ b/src/treeview.h
@@ -1,4 +1,6 @@
 /*
+   treeview.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/treeview2.c b/src/treeview2.c
index f4db6336..39e67971 100644
--- a/src/treeview2.c
+++ b/src/treeview2.c
@@ -1,4 +1,6 @@
 /*
+   treeview2.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/treeview2.h b/src/treeview2.h
index 46a3dde7..e47b2508 100644
--- a/src/treeview2.h
+++ b/src/treeview2.h
@@ -1,4 +1,6 @@
 /*
+   treeview2.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/treeview_helper.c b/src/treeview_helper.c
index 8cef11f3..1b065ebf 100644
--- a/src/treeview_helper.c
+++ b/src/treeview_helper.c
@@ -1,4 +1,6 @@
 /*
+   treeview_helper.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -1638,3 +1640,23 @@ treeview_helper_bet_odds(GtkTreeViewColumn *col,
 
     g_object_set(renderer, "text", buf, NULL);
 }
+
+gboolean
+treeview_helper_search_equal(GtkTreeModel *model,
+			     gint column,
+			     const gchar *key,
+			     GtkTreeIter *iter,
+			     gpointer search_data)
+{
+    const Team *tm = NULL;
+    gchar *name_lower = NULL;
+    gboolean return_value = TRUE;
+
+    gtk_tree_model_get(model, iter, column, &tm, -1);
+    
+    name_lower = g_utf8_strdown(tm->name, -1);
+
+    return_value = (g_strrstr(name_lower, key) == NULL);
+
+    return return_value;
+}
diff --git a/src/treeview_helper.h b/src/treeview_helper.h
index 6cd5bf31..110c0523 100644
--- a/src/treeview_helper.h
+++ b/src/treeview_helper.h
@@ -1,4 +1,6 @@
 /*
+   treeview_helper.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -211,4 +213,11 @@ treeview_helper_bet_odds(GtkTreeViewColumn *col,
 			 GtkTreeIter       *iter,
 			 gpointer           user_data);
 
+gboolean
+treeview_helper_search_equal(GtkTreeModel *model,
+			     gint column,
+			     const gchar *key,
+			     GtkTreeIter *iter,
+			     gpointer search_data);
+
 #endif
diff --git a/src/user.c b/src/user.c
index 91c69d1e..7c1070fb 100644
--- a/src/user.c
+++ b/src/user.c
@@ -1,4 +1,6 @@
 /*
+   user.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/user.h b/src/user.h
index 00c21eb2..6ce109de 100644
--- a/src/user.h
+++ b/src/user.h
@@ -1,4 +1,6 @@
 /*
+   user.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/user_struct.h b/src/user_struct.h
index 0d523563..1482a834 100644
--- a/src/user_struct.h
+++ b/src/user_struct.h
@@ -1,4 +1,6 @@
 /*
+   user_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/variables.h b/src/variables.h
index 164c6587..ecd777ab 100644
--- a/src/variables.h
+++ b/src/variables.h
@@ -1,4 +1,6 @@
 /*
+   variables.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/window.c b/src/window.c
index 322a3ea7..6df57ad5 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1,4 +1,6 @@
 /*
+   window.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
@@ -22,6 +24,7 @@
 */
 
 #include "callbacks.h"
+#include "debug.h"
 #include "file.h"
 #include "finance.h"
 #include "free.h"
@@ -74,6 +77,7 @@ window_show_progress(gint pictype)
     GPtrArray *pics = NULL;
     const gchar *picdir = NULL;
     gchar buf[SMALL];
+    gchar *buf2 = NULL;
     GtkImage *image = NULL;
 
     window_create(WINDOW_PROGRESS);
@@ -100,21 +104,33 @@ window_show_progress(gint pictype)
 				     GTK_ICON_SIZE_DIALOG);
 	    break;
 	case PIC_TYPE_MATCHPIC:
-	    picdir = file_get_first_support_dir_suffix("pics");
-
-	    if(picdir == NULL)
-		return;
-
-	    pics = file_dir_get_contents(picdir, "match", "");
-
-	    if(pics->len != 0)
-	    {	
-		sprintf(buf, "%s%s%s", picdir, G_DIR_SEPARATOR_S,
-			(gchar*)g_ptr_array_index(pics, math_rndi(0, pics->len - 1)));
-		gtk_image_set_from_file(image, buf);
+	    if(debug_egg_forwards_boost_style())
+	    {
+		buf2 = file_find_support_file("soccerbabes.jpg", FALSE);
+		if(buf2 != NULL)
+		{
+		    gtk_image_set_from_file(image, buf2);
+		    g_free(buf2);
+		}
 	    }
 
-	    free_gchar_array(&pics);
+	    if(buf2 == NULL)
+	    {
+		picdir = file_get_first_support_dir_suffix("pics");
+		if(picdir == NULL)
+		    return;
+		
+		pics = file_dir_get_contents(picdir, "match", "");
+		
+		if(pics->len != 0)
+		{	
+		    sprintf(buf, "%s%s%s", picdir, G_DIR_SEPARATOR_S,
+			    (gchar*)g_ptr_array_index(pics, math_rndi(0, pics->len - 1)));
+		    gtk_image_set_from_file(image, buf);
+		}
+		
+		free_gchar_array(&pics);
+	    }
 	    break;
     }
 }
diff --git a/src/window.h b/src/window.h
index c8aa9b54..01f3b89b 100644
--- a/src/window.h
+++ b/src/window.h
@@ -1,4 +1,6 @@
 /*
+   window.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml.c b/src/xml.c
index b39aff9b..9512786a 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -1,4 +1,6 @@
 /*
+   xml.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml.h b/src/xml.h
index d212a2a8..ac4352a1 100644
--- a/src/xml.h
+++ b/src/xml.h
@@ -1,4 +1,6 @@
 /*
+   xml.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_country.c b/src/xml_country.c
index 6ffc1160..8c57d78e 100644
--- a/src/xml_country.c
+++ b/src/xml_country.c
@@ -1,4 +1,6 @@
 /*
+   xml_country.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_country.h b/src/xml_country.h
index 4670eaf8..a0740219 100644
--- a/src/xml_country.h
+++ b/src/xml_country.h
@@ -1,4 +1,6 @@
 /*
+   xml_country.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_cup.c b/src/xml_cup.c
index ea847456..3fb2308a 100644
--- a/src/xml_cup.c
+++ b/src/xml_cup.c
@@ -1,4 +1,6 @@
 /*
+   xml_cup.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_cup.h b/src/xml_cup.h
index eae2a984..2210f62a 100644
--- a/src/xml_cup.h
+++ b/src/xml_cup.h
@@ -1,4 +1,6 @@
 /*
+   xml_cup.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_league.c b/src/xml_league.c
index df39d178..5f41f578 100644
--- a/src/xml_league.c
+++ b/src/xml_league.c
@@ -1,4 +1,6 @@
 /*
+   xml_league.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_league.h b/src/xml_league.h
index 23685948..7d8dff1a 100644
--- a/src/xml_league.h
+++ b/src/xml_league.h
@@ -1,4 +1,6 @@
 /*
+   xml_league.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_lg_commentary.c b/src/xml_lg_commentary.c
index d7f12a72..9e1d60ba 100644
--- a/src/xml_lg_commentary.c
+++ b/src/xml_lg_commentary.c
@@ -1,4 +1,6 @@
 /*
+   xml_lg_commentary.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_lg_commentary.h b/src/xml_lg_commentary.h
index 38644880..9c0830ff 100644
--- a/src/xml_lg_commentary.h
+++ b/src/xml_lg_commentary.h
@@ -1,4 +1,6 @@
 /*
+   xml_lg_commentary.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_cup.c b/src/xml_loadsave_cup.c
index 6ea29888..af439957 100644
--- a/src/xml_loadsave_cup.c
+++ b/src/xml_loadsave_cup.c
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_cup.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_cup.h b/src/xml_loadsave_cup.h
index c506fdf8..e2f617b7 100644
--- a/src/xml_loadsave_cup.h
+++ b/src/xml_loadsave_cup.h
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_cup.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_fixtures.c b/src/xml_loadsave_fixtures.c
index 550b1d04..b1e68719 100644
--- a/src/xml_loadsave_fixtures.c
+++ b/src/xml_loadsave_fixtures.c
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_fixtures.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_fixtures.h b/src/xml_loadsave_fixtures.h
index 465b48b4..eaff54e3 100644
--- a/src/xml_loadsave_fixtures.h
+++ b/src/xml_loadsave_fixtures.h
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_fixtures.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_league.c b/src/xml_loadsave_league.c
index 940bd48b..7c4e740f 100644
--- a/src/xml_loadsave_league.c
+++ b/src/xml_loadsave_league.c
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_league.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_league.h b/src/xml_loadsave_league.h
index e80ad2f6..a949bd20 100644
--- a/src/xml_loadsave_league.h
+++ b/src/xml_loadsave_league.h
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_league.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_league_stat.c b/src/xml_loadsave_league_stat.c
index 26490b6e..f55e0d9e 100644
--- a/src/xml_loadsave_league_stat.c
+++ b/src/xml_loadsave_league_stat.c
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_league_stat.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_league_stat.h b/src/xml_loadsave_league_stat.h
index 8064552e..8a55d3e3 100644
--- a/src/xml_loadsave_league_stat.h
+++ b/src/xml_loadsave_league_stat.h
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_league_stat.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_leagues_cups.c b/src/xml_loadsave_leagues_cups.c
index a8189a1f..b5d5358d 100644
--- a/src/xml_loadsave_leagues_cups.c
+++ b/src/xml_loadsave_leagues_cups.c
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_leagues_cups.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_leagues_cups.h b/src/xml_loadsave_leagues_cups.h
index 65fcb1cb..9d5da89c 100644
--- a/src/xml_loadsave_leagues_cups.h
+++ b/src/xml_loadsave_leagues_cups.h
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_leagues_cups.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_live_game.c b/src/xml_loadsave_live_game.c
index 71f6f537..6aaeb127 100644
--- a/src/xml_loadsave_live_game.c
+++ b/src/xml_loadsave_live_game.c
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_live_game.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_live_game.h b/src/xml_loadsave_live_game.h
index dfa79d0f..d9be7e31 100644
--- a/src/xml_loadsave_live_game.h
+++ b/src/xml_loadsave_live_game.h
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_live_game.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_misc.c b/src/xml_loadsave_misc.c
index 9aebf7ef..320adf97 100644
--- a/src/xml_loadsave_misc.c
+++ b/src/xml_loadsave_misc.c
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_misc.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_misc.h b/src/xml_loadsave_misc.h
index 3225d5d7..fe1de6d0 100644
--- a/src/xml_loadsave_misc.h
+++ b/src/xml_loadsave_misc.h
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_misc.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_players.c b/src/xml_loadsave_players.c
index a8dd1daf..0b741e38 100644
--- a/src/xml_loadsave_players.c
+++ b/src/xml_loadsave_players.c
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_players.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_players.h b/src/xml_loadsave_players.h
index 536491df..b004f0c9 100644
--- a/src/xml_loadsave_players.h
+++ b/src/xml_loadsave_players.h
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_players.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_season_stats.c b/src/xml_loadsave_season_stats.c
index 9984d898..81acfad1 100644
--- a/src/xml_loadsave_season_stats.c
+++ b/src/xml_loadsave_season_stats.c
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_season_stats.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_season_stats.h b/src/xml_loadsave_season_stats.h
index 0d6b863b..27082d34 100644
--- a/src/xml_loadsave_season_stats.h
+++ b/src/xml_loadsave_season_stats.h
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_season_stats.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_table.c b/src/xml_loadsave_table.c
index ee1dba06..5deb6769 100644
--- a/src/xml_loadsave_table.c
+++ b/src/xml_loadsave_table.c
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_table.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_table.h b/src/xml_loadsave_table.h
index fa75dc30..a9ad246b 100644
--- a/src/xml_loadsave_table.h
+++ b/src/xml_loadsave_table.h
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_table.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_teams.c b/src/xml_loadsave_teams.c
index e42a9b11..b3fca506 100644
--- a/src/xml_loadsave_teams.c
+++ b/src/xml_loadsave_teams.c
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_teams.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_teams.h b/src/xml_loadsave_teams.h
index 2ef6d954..98cd4134 100644
--- a/src/xml_loadsave_teams.h
+++ b/src/xml_loadsave_teams.h
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_teams.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_transfers.c b/src/xml_loadsave_transfers.c
index 5eb3d768..6611dac6 100644
--- a/src/xml_loadsave_transfers.c
+++ b/src/xml_loadsave_transfers.c
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_transfers.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_transfers.h b/src/xml_loadsave_transfers.h
index 09d30765..15f7f53f 100644
--- a/src/xml_loadsave_transfers.h
+++ b/src/xml_loadsave_transfers.h
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_transfers.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_users.c b/src/xml_loadsave_users.c
index d1151f65..da62cfb3 100644
--- a/src/xml_loadsave_users.c
+++ b/src/xml_loadsave_users.c
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_users.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_loadsave_users.h b/src/xml_loadsave_users.h
index a2fd524a..ad28b567 100644
--- a/src/xml_loadsave_users.h
+++ b/src/xml_loadsave_users.h
@@ -1,4 +1,6 @@
 /*
+   xml_loadsave_users.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_mmatches.c b/src/xml_mmatches.c
index 41f829ef..6b1c2ecb 100644
--- a/src/xml_mmatches.c
+++ b/src/xml_mmatches.c
@@ -1,4 +1,6 @@
 /*
+   xml_mmatches.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_mmatches.h b/src/xml_mmatches.h
index cc38e27e..9a2bcc15 100644
--- a/src/xml_mmatches.h
+++ b/src/xml_mmatches.h
@@ -1,4 +1,6 @@
 /*
+   xml_mmatches.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_name.c b/src/xml_name.c
index 784d402c..9caca118 100644
--- a/src/xml_name.c
+++ b/src/xml_name.c
@@ -1,4 +1,6 @@
 /*
+   xml_name.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_name.h b/src/xml_name.h
index 1f2f5db3..cd932535 100644
--- a/src/xml_name.h
+++ b/src/xml_name.h
@@ -1,4 +1,6 @@
 /*
+   xml_name.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_strategy.c b/src/xml_strategy.c
index 1c88ce33..7ecefd16 100644
--- a/src/xml_strategy.c
+++ b/src/xml_strategy.c
@@ -1,4 +1,6 @@
 /*
+   xml_strategy.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_strategy.h b/src/xml_strategy.h
index 3b78ca0b..95060cbe 100644
--- a/src/xml_strategy.h
+++ b/src/xml_strategy.h
@@ -1,4 +1,6 @@
 /*
+   xml_strategy.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_team.c b/src/xml_team.c
index 5a984c1c..d37ac07c 100644
--- a/src/xml_team.c
+++ b/src/xml_team.c
@@ -1,4 +1,6 @@
 /*
+   xml_team.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/xml_team.h b/src/xml_team.h
index 753fb5bc..9e91fee8 100644
--- a/src/xml_team.h
+++ b/src/xml_team.h
@@ -1,4 +1,6 @@
 /*
+   xml_team.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/youth_academy.c b/src/youth_academy.c
index 2601dba2..12ffd55a 100644
--- a/src/youth_academy.c
+++ b/src/youth_academy.c
@@ -1,4 +1,6 @@
 /*
+   youth_academy.c
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/youth_academy.h b/src/youth_academy.h
index 5eb80bf1..e0cb3ade 100644
--- a/src/youth_academy.h
+++ b/src/youth_academy.h
@@ -1,4 +1,6 @@
 /*
+   youth_academy.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.
 
diff --git a/src/youth_academy_struct.h b/src/youth_academy_struct.h
index d28a3427..88f26f74 100644
--- a/src/youth_academy_struct.h
+++ b/src/youth_academy_struct.h
@@ -1,4 +1,6 @@
 /*
+   youth_academy_struct.h
+
    Bygfoot Football Manager -- a small and simple GTK2-based
    football management game.