diff --git a/ChangeLog b/ChangeLog
index 6eb7bc2e..c4939761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 	- updated Brazilian Portuguese translation (thanks to Valdinei Martins)
 	- updated Chinese translation
 	- updated Dutch translation and news
+	- finished the default team implementation, you're now able to use a default team without using the option to 		store/restore your default team after a match
 
 05/07/2009: v2.3.2
         - added Turkish translation, news and hints (thanks to Cem Uykun)
diff --git a/src/callbacks.c b/src/callbacks.c
index 3b4a3c7e..2719c6c2 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -864,6 +864,43 @@ on_menu_show_job_exchange_activate     (GtkMenuItem     *menuitem,
 	const_int("int_job_update_interval"));
 }
 
+void
+on_default_team1_activate              (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+
+}
+
+
+void
+on_default_team_store_activate         (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_default_team_store_activate\n");
+#endif
+store_default_team(&current_user);
+}
+
+
+void
+on_default_team_restore_activate       (GtkMenuItem     *menuitem,
+                                        gpointer         user_data)
+{
+#ifdef DEBUG
+    printf("on_default_team_restore_activate\n");
+#endif
+    if (current_user.default_team->len==0)
+    {
+	game_gui_print_message(
+	    _("There is no default team stored yet."));
+	return;
+    }
+    restore_default_team(&current_user);
+    // reload the treeview
+    treeview_show_user_player_list();
+}
+
 void
 on_training_camp_activate              (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -1756,5 +1793,3 @@ on_menu_reset_players_activate         (GtkMenuItem     *menuitem,
     
     game_reset_players(idx);
 }
-
-
diff --git a/src/callbacks.h b/src/callbacks.h
index 32286203..507f33d0 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -368,3 +368,23 @@ void
 on_player_menu_edit_name_activate      (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
 #endif
+
+void
+on_default_team1_activate              (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_store1_activate                     (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_restore1_activate                   (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_default_team_store_activate         (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_default_team_restore_activate       (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
diff --git a/src/interface.c b/src/interface.c
index 771a3d8b..16f14898 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -38,7 +38,7 @@ create_main_window (void)
   GtkWidget *menu_new;
   GtkWidget *menu_open;
   GtkWidget *menu_load_last_save;
-  GtkWidget *image2725;
+  GtkWidget *image2977;
   GtkWidget *menu_save;
   GtkWidget *menu_save_as;
   GtkWidget *trennlinie1;
@@ -46,30 +46,30 @@ create_main_window (void)
   GtkWidget *menu_options;
   GtkWidget *menu_options_menu;
   GtkWidget *menu_preferences;
-  GtkWidget *image2726;
+  GtkWidget *image2978;
   GtkWidget *trennlinie7;
   GtkWidget *menu_job_offers;
   GtkWidget *menu_live_game;
   GtkWidget *menu_overwrite;
   GtkWidget *trennlinie14;
   GtkWidget *menu_save_window_geometry;
-  GtkWidget *image2727;
+  GtkWidget *image2979;
   GtkWidget *menu_figures;
   GtkWidget *menu_figures_menu;
   GtkWidget *menu_fixtures_week;
-  GtkWidget *image2728;
+  GtkWidget *image2980;
   GtkWidget *menu_fixtures;
-  GtkWidget *image2729;
+  GtkWidget *image2981;
   GtkWidget *menu_tables;
-  GtkWidget *image2730;
+  GtkWidget *image2982;
   GtkWidget *menu_my_league_results;
-  GtkWidget *image2731;
+  GtkWidget *image2983;
   GtkWidget *menu_season_results;
-  GtkWidget *image2732;
+  GtkWidget *image2984;
   GtkWidget *menu_team;
   GtkWidget *menu_team_menu;
   GtkWidget *menu_playing_style;
-  GtkWidget *image2733;
+  GtkWidget *image2985;
   GtkWidget *menu_playing_style_menu;
   GSList *menu_all_out_defend_group = NULL;
   GtkWidget *menu_all_out_defend;
@@ -78,7 +78,7 @@ create_main_window (void)
   GtkWidget *menu_attack;
   GtkWidget *menu_all_out_attack;
   GtkWidget *menu_scout;
-  GtkWidget *image2734;
+  GtkWidget *image2986;
   GtkWidget *menu_scout_menu;
   GSList *menu_scout_best_group = NULL;
   GtkWidget *menu_scout_best;
@@ -86,7 +86,7 @@ create_main_window (void)
   GtkWidget *menu_scout_average;
   GtkWidget *menu_scout_bad;
   GtkWidget *menu_physio;
-  GtkWidget *image2735;
+  GtkWidget *image2987;
   GtkWidget *menu_physio_menu;
   GSList *menu_physio_best_group = NULL;
   GtkWidget *menu_physio_best;
@@ -94,7 +94,7 @@ create_main_window (void)
   GtkWidget *menu_physio_average;
   GtkWidget *menu_physio_bad;
   GtkWidget *menu_youth_academy;
-  GtkWidget *image2736;
+  GtkWidget *image2988;
   GtkWidget *menu_youth_academy_menu;
   GtkWidget *menu_show_youth_academy;
   GtkWidget *youth_coach1;
@@ -114,68 +114,72 @@ create_main_window (void)
   GtkWidget *menu_recruit4;
   GtkWidget *menu_set_investment;
   GtkWidget *menu_boost;
-  GtkWidget *image2737;
+  GtkWidget *image2989;
   GtkWidget *menu_boost_menu;
   GSList *menu_boost_on_group = NULL;
   GtkWidget *menu_boost_on;
   GtkWidget *menu_boost_off;
   GtkWidget *menu_boost_anti;
+  GtkWidget *default_team1;
+  GtkWidget *default_team1_menu;
+  GtkWidget *store1;
+  GtkWidget *restore1;
   GtkWidget *trennlinie11;
   GtkWidget *menu_training_camp;
   GtkWidget *trennlinie18;
   GtkWidget *menu_reset_players;
-  GtkWidget *image2738;
+  GtkWidget *image2990;
   GtkWidget *menu_custom_structure;
-  GtkWidget *image2739;
+  GtkWidget *image2991;
   GtkWidget *menu_rearrange_team;
-  GtkWidget *image2740;
+  GtkWidget *image2992;
   GtkWidget *trennlinie8;
   GtkWidget *menu_browse_teams;
-  GtkWidget *image2741;
+  GtkWidget *image2993;
   GtkWidget *trennlinie16;
   GtkWidget *menu_show_job_exchange;
   GtkWidget *menu_player;
   GtkWidget *menu_player_menu;
   GtkWidget *menu_show_info;
-  GtkWidget *image2742;
+  GtkWidget *image2994;
   GtkWidget *menu_put_on_transfer_list;
-  GtkWidget *image2743;
+  GtkWidget *image2995;
   GtkWidget *menu_remove_from_transfer_list;
-  GtkWidget *image2744;
+  GtkWidget *image2996;
   GtkWidget *menu_offer_new_contract;
-  GtkWidget *image2745;
+  GtkWidget *image2997;
   GtkWidget *menu_fire;
-  GtkWidget *image2746;
+  GtkWidget *image2998;
   GtkWidget *menu_shoots_penalties;
-  GtkWidget *image2747;
+  GtkWidget *image2999;
   GtkWidget *menu_move_to_youth_academy;
-  GtkWidget *image2748;
+  GtkWidget *image3000;
   GtkWidget *menu_edit_name;
-  GtkWidget *image2749;
+  GtkWidget *image3001;
   GtkWidget *trennlinie10;
   GtkWidget *menu_browse_players;
-  GtkWidget *image2750;
+  GtkWidget *image3002;
   GtkWidget *menu_user;
   GtkWidget *menu_user_menu;
   GtkWidget *menu_user_show_last_match;
-  GtkWidget *image2751;
+  GtkWidget *image3003;
   GtkWidget *menu_user_show_last_stats;
-  GtkWidget *image2752;
+  GtkWidget *image3004;
   GtkWidget *menu_user_show_coming_matches;
-  GtkWidget *image2753;
+  GtkWidget *image3005;
   GtkWidget *trennlinie9;
   GtkWidget *menu_next_user;
-  GtkWidget *image2754;
+  GtkWidget *image3006;
   GtkWidget *menu_previous_user;
-  GtkWidget *image2755;
+  GtkWidget *image3007;
   GtkWidget *menu_manage_users;
-  GtkWidget *image2756;
+  GtkWidget *image3008;
   GtkWidget *menu_finances_stadium;
   GtkWidget *menu_finances_stadium_menu;
   GtkWidget *menu_show_finances;
-  GtkWidget *image2757;
+  GtkWidget *image3009;
   GtkWidget *menu_show_stadium;
-  GtkWidget *image2758;
+  GtkWidget *image3010;
   GtkWidget *automatic_loan_repayment;
   GtkWidget *trennlinie15;
   GtkWidget *menu_betting;
@@ -183,26 +187,26 @@ create_main_window (void)
   GtkWidget *stats1_menu;
   GtkWidget *menu_news;
   GtkWidget *menu_league_stats;
-  GtkWidget *image2759;
+  GtkWidget *image3011;
   GtkWidget *menu_season_history;
-  GtkWidget *image2760;
+  GtkWidget *image3012;
   GtkWidget *menu_user_show_history;
-  GtkWidget *image2761;
+  GtkWidget *image3013;
   GtkWidget *memorable_matches;
-  GtkWidget *image2762;
+  GtkWidget *image3014;
   GtkWidget *memorable_matches_menu;
   GtkWidget *mm_add_last_match;
-  GtkWidget *image2763;
+  GtkWidget *image3015;
   GtkWidget *mm_manage_matches;
-  GtkWidget *image2764;
+  GtkWidget *image3016;
   GtkWidget *menu_help1;
   GtkWidget *menu_help1_menu;
   GtkWidget *menu_about;
-  GtkWidget *image2765;
+  GtkWidget *image3017;
   GtkWidget *menu_contributors;
-  GtkWidget *image2766;
+  GtkWidget *image3018;
   GtkWidget *menu_help;
-  GtkWidget *image2767;
+  GtkWidget *image3019;
   GtkWidget *hbox1;
   GtkWidget *button_load;
   GtkWidget *image11;
@@ -323,9 +327,9 @@ create_main_window (void)
                               GDK_l, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2725 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2725);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image2725);
+  image2977 = gtk_image_new_from_stock ("gtk-revert-to-saved", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2977);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_load_last_save), image2977);
 
   menu_save = gtk_image_menu_item_new_from_stock ("gtk-save", accel_group);
   gtk_widget_show (menu_save);
@@ -358,9 +362,9 @@ create_main_window (void)
                               GDK_p, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2726 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2726);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image2726);
+  image2978 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2978);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_preferences), image2978);
 
   trennlinie7 = gtk_separator_menu_item_new ();
   gtk_widget_show (trennlinie7);
@@ -391,9 +395,9 @@ create_main_window (void)
   gtk_container_add (GTK_CONTAINER (menu_options_menu), menu_save_window_geometry);
   gtk_tooltips_set_tip (tooltips, menu_save_window_geometry, _("Save window size, position and vertical divider"), NULL);
 
-  image2727 = create_pixmap (main_window, "menu_save_geometry.png");
-  gtk_widget_show (image2727);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_window_geometry), image2727);
+  image2979 = create_pixmap (main_window, "menu_save_geometry.png");
+  gtk_widget_show (image2979);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_save_window_geometry), image2979);
 
   menu_figures = gtk_menu_item_new_with_mnemonic (_("F_igures"));
   gtk_widget_show (menu_figures);
@@ -409,9 +413,9 @@ create_main_window (void)
                               GDK_F3, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2728 = create_pixmap (main_window, "menu_fixtures.png");
-  gtk_widget_show (image2728);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures_week), image2728);
+  image2980 = create_pixmap (main_window, "menu_fixtures.png");
+  gtk_widget_show (image2980);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures_week), image2980);
 
   menu_fixtures = gtk_image_menu_item_new_with_mnemonic (_("Fixtures (competitions)"));
   gtk_widget_show (menu_fixtures);
@@ -420,9 +424,9 @@ create_main_window (void)
                               GDK_F4, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2729 = create_pixmap (main_window, "menu_fixtures_comp.png");
-  gtk_widget_show (image2729);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures), image2729);
+  image2981 = create_pixmap (main_window, "menu_fixtures_comp.png");
+  gtk_widget_show (image2981);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fixtures), image2981);
 
   menu_tables = gtk_image_menu_item_new_with_mnemonic (_("Tables"));
   gtk_widget_show (menu_tables);
@@ -431,9 +435,9 @@ create_main_window (void)
                               GDK_F5, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2730 = create_pixmap (main_window, "menu_table.png");
-  gtk_widget_show (image2730);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_tables), image2730);
+  image2982 = create_pixmap (main_window, "menu_table.png");
+  gtk_widget_show (image2982);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_tables), image2982);
 
   menu_my_league_results = gtk_image_menu_item_new_with_mnemonic (_("My league results"));
   gtk_widget_show (menu_my_league_results);
@@ -442,9 +446,9 @@ create_main_window (void)
                               GDK_F6, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2731 = create_pixmap (main_window, "menu_league_results.png");
-  gtk_widget_show (image2731);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_my_league_results), image2731);
+  image2983 = create_pixmap (main_window, "menu_league_results.png");
+  gtk_widget_show (image2983);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_my_league_results), image2983);
 
   menu_season_results = gtk_image_menu_item_new_with_mnemonic (_("Season results"));
   gtk_widget_show (menu_season_results);
@@ -453,9 +457,9 @@ create_main_window (void)
                               GDK_s, (GdkModifierType) GDK_SHIFT_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2732 = create_pixmap (main_window, "menu_season_res.png");
-  gtk_widget_show (image2732);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_results), image2732);
+  image2984 = create_pixmap (main_window, "menu_season_res.png");
+  gtk_widget_show (image2984);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_results), image2984);
 
   menu_team = gtk_menu_item_new_with_mnemonic (_("_Team"));
   gtk_widget_show (menu_team);
@@ -468,9 +472,9 @@ create_main_window (void)
   gtk_widget_show (menu_playing_style);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_playing_style);
 
-  image2733 = create_pixmap (main_window, "menu_style.png");
-  gtk_widget_show (image2733);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_playing_style), image2733);
+  image2985 = create_pixmap (main_window, "menu_style.png");
+  gtk_widget_show (image2985);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_playing_style), image2985);
 
   menu_playing_style_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_playing_style), menu_playing_style_menu);
@@ -509,9 +513,9 @@ create_main_window (void)
   gtk_widget_show (menu_scout);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_scout);
 
-  image2734 = create_pixmap (main_window, "menu_scout.png");
-  gtk_widget_show (image2734);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_scout), image2734);
+  image2986 = create_pixmap (main_window, "menu_scout.png");
+  gtk_widget_show (image2986);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_scout), image2986);
 
   menu_scout_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_scout), menu_scout_menu);
@@ -544,9 +548,9 @@ create_main_window (void)
   gtk_widget_show (menu_physio);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_physio);
 
-  image2735 = create_pixmap (main_window, "menu_physio.png");
-  gtk_widget_show (image2735);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_physio), image2735);
+  image2987 = create_pixmap (main_window, "menu_physio.png");
+  gtk_widget_show (image2987);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_physio), image2987);
 
   menu_physio_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_physio), menu_physio_menu);
@@ -579,9 +583,9 @@ create_main_window (void)
   gtk_widget_show (menu_youth_academy);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_youth_academy);
 
-  image2736 = create_pixmap (main_window, "menu_youth_academy.png");
-  gtk_widget_show (image2736);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_youth_academy), image2736);
+  image2988 = create_pixmap (main_window, "menu_youth_academy.png");
+  gtk_widget_show (image2988);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_youth_academy), image2988);
 
   menu_youth_academy_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_youth_academy), menu_youth_academy_menu);
@@ -670,9 +674,9 @@ create_main_window (void)
   gtk_widget_show (menu_boost);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_boost);
 
-  image2737 = create_pixmap (main_window, "menu_boost.png");
-  gtk_widget_show (image2737);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_boost), image2737);
+  image2989 = create_pixmap (main_window, "menu_boost.png");
+  gtk_widget_show (image2989);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_boost), image2989);
 
   menu_boost_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_boost), menu_boost_menu);
@@ -695,6 +699,21 @@ create_main_window (void)
   gtk_container_add (GTK_CONTAINER (menu_boost_menu), menu_boost_anti);
   gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (menu_boost_anti), TRUE);
 
+  default_team1 = gtk_menu_item_new_with_mnemonic (_("Default Team"));
+  gtk_widget_show (default_team1);
+  gtk_container_add (GTK_CONTAINER (menu_team_menu), default_team1);
+
+  default_team1_menu = gtk_menu_new ();
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (default_team1), default_team1_menu);
+
+  store1 = gtk_menu_item_new_with_mnemonic (_("Store"));
+  gtk_widget_show (store1);
+  gtk_container_add (GTK_CONTAINER (default_team1_menu), store1);
+
+  restore1 = gtk_menu_item_new_with_mnemonic (_("Restore"));
+  gtk_widget_show (restore1);
+  gtk_container_add (GTK_CONTAINER (default_team1_menu), restore1);
+
   trennlinie11 = gtk_separator_menu_item_new ();
   gtk_widget_show (trennlinie11);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), trennlinie11);
@@ -713,17 +732,17 @@ create_main_window (void)
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_reset_players);
   gtk_tooltips_set_tip (tooltips, menu_reset_players, _("Reset player list to the formation at the beginning of the live game pause (right click on player list)"), NULL);
 
-  image2738 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2738);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reset_players), image2738);
+  image2990 = gtk_image_new_from_stock ("gtk-undo", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image2990);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_reset_players), image2990);
 
   menu_custom_structure = gtk_image_menu_item_new_with_mnemonic (_("Enter custom structure"));
   gtk_widget_show (menu_custom_structure);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_custom_structure);
 
-  image2739 = create_pixmap (main_window, "menu_structure.png");
-  gtk_widget_show (image2739);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_custom_structure), image2739);
+  image2991 = create_pixmap (main_window, "menu_structure.png");
+  gtk_widget_show (image2991);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_custom_structure), image2991);
 
   menu_rearrange_team = gtk_image_menu_item_new_with_mnemonic (_("Rearrange team"));
   gtk_widget_show (menu_rearrange_team);
@@ -733,9 +752,9 @@ create_main_window (void)
                               GDK_r, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2740 = create_pixmap (main_window, "menu_rearrange.png");
-  gtk_widget_show (image2740);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_rearrange_team), image2740);
+  image2992 = create_pixmap (main_window, "menu_rearrange.png");
+  gtk_widget_show (image2992);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_rearrange_team), image2992);
 
   trennlinie8 = gtk_separator_menu_item_new ();
   gtk_widget_show (trennlinie8);
@@ -746,9 +765,9 @@ create_main_window (void)
   gtk_widget_show (menu_browse_teams);
   gtk_container_add (GTK_CONTAINER (menu_team_menu), menu_browse_teams);
 
-  image2741 = create_pixmap (main_window, "menu_browse_tms.png");
-  gtk_widget_show (image2741);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_teams), image2741);
+  image2993 = create_pixmap (main_window, "menu_browse_tms.png");
+  gtk_widget_show (image2993);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_teams), image2993);
 
   trennlinie16 = gtk_separator_menu_item_new ();
   gtk_widget_show (trennlinie16);
@@ -774,65 +793,65 @@ create_main_window (void)
   gtk_widget_show (menu_show_info);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_show_info);
 
-  image2742 = create_pixmap (main_window, "menu_player_info.png");
-  gtk_widget_show (image2742);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_info), image2742);
+  image2994 = create_pixmap (main_window, "menu_player_info.png");
+  gtk_widget_show (image2994);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_info), image2994);
 
   menu_put_on_transfer_list = gtk_image_menu_item_new_with_mnemonic (_("Put on transfer list"));
   gtk_widget_show (menu_put_on_transfer_list);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_put_on_transfer_list);
 
-  image2743 = create_pixmap (main_window, "menu_player_put_transfer.png");
-  gtk_widget_show (image2743);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_put_on_transfer_list), image2743);
+  image2995 = create_pixmap (main_window, "menu_player_put_transfer.png");
+  gtk_widget_show (image2995);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_put_on_transfer_list), image2995);
 
   menu_remove_from_transfer_list = gtk_image_menu_item_new_with_mnemonic (_("Remove from transfer list"));
   gtk_widget_show (menu_remove_from_transfer_list);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_remove_from_transfer_list);
 
-  image2744 = create_pixmap (main_window, "menu_player_remove_transfer.png");
-  gtk_widget_show (image2744);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_remove_from_transfer_list), image2744);
+  image2996 = create_pixmap (main_window, "menu_player_remove_transfer.png");
+  gtk_widget_show (image2996);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_remove_from_transfer_list), image2996);
 
   menu_offer_new_contract = gtk_image_menu_item_new_with_mnemonic (_("Offer new contract"));
   gtk_widget_show (menu_offer_new_contract);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_offer_new_contract);
 
-  image2745 = create_pixmap (main_window, "menu_player_contract.png");
-  gtk_widget_show (image2745);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_offer_new_contract), image2745);
+  image2997 = create_pixmap (main_window, "menu_player_contract.png");
+  gtk_widget_show (image2997);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_offer_new_contract), image2997);
 
   menu_fire = gtk_image_menu_item_new_with_mnemonic (_("Fire"));
   gtk_widget_show (menu_fire);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_fire);
 
-  image2746 = create_pixmap (main_window, "menu_player_fire.png");
-  gtk_widget_show (image2746);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fire), image2746);
+  image2998 = create_pixmap (main_window, "menu_player_fire.png");
+  gtk_widget_show (image2998);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_fire), image2998);
 
   menu_shoots_penalties = gtk_image_menu_item_new_with_mnemonic (_("Shoots penalties"));
   gtk_widget_show (menu_shoots_penalties);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_shoots_penalties);
 
-  image2747 = create_pixmap (main_window, "menu_player_shoots.png");
-  gtk_widget_show (image2747);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_shoots_penalties), image2747);
+  image2999 = create_pixmap (main_window, "menu_player_shoots.png");
+  gtk_widget_show (image2999);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_shoots_penalties), image2999);
 
   menu_move_to_youth_academy = gtk_image_menu_item_new_with_mnemonic (_("Move to youth academy"));
   gtk_widget_show (menu_move_to_youth_academy);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_move_to_youth_academy);
 
-  image2748 = create_pixmap (main_window, "menu_player_move_to_ya.png");
-  gtk_widget_show (image2748);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_move_to_youth_academy), image2748);
+  image3000 = create_pixmap (main_window, "menu_player_move_to_ya.png");
+  gtk_widget_show (image3000);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_move_to_youth_academy), image3000);
 
   menu_edit_name = gtk_image_menu_item_new_with_mnemonic (_("Edit name"));
   gtk_widget_show (menu_edit_name);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_edit_name);
 
-  image2749 = gtk_image_new_from_stock ("gtk-edit", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2749);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_edit_name), image2749);
+  image3001 = gtk_image_new_from_stock ("gtk-edit", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3001);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_edit_name), image3001);
 
   trennlinie10 = gtk_separator_menu_item_new ();
   gtk_widget_show (trennlinie10);
@@ -843,9 +862,9 @@ create_main_window (void)
   gtk_widget_show (menu_browse_players);
   gtk_container_add (GTK_CONTAINER (menu_player_menu), menu_browse_players);
 
-  image2750 = create_pixmap (main_window, "menu_player_browse.png");
-  gtk_widget_show (image2750);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_players), image2750);
+  image3002 = create_pixmap (main_window, "menu_player_browse.png");
+  gtk_widget_show (image3002);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_browse_players), image3002);
 
   menu_user = gtk_menu_item_new_with_mnemonic (_("_User"));
   gtk_widget_show (menu_user);
@@ -861,9 +880,9 @@ create_main_window (void)
                               GDK_v, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2751 = create_pixmap (main_window, "menu_last_match.png");
-  gtk_widget_show (image2751);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_match), image2751);
+  image3003 = create_pixmap (main_window, "menu_last_match.png");
+  gtk_widget_show (image3003);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_match), image3003);
 
   menu_user_show_last_stats = gtk_image_menu_item_new_with_mnemonic (_("Show last match stats"));
   gtk_widget_show (menu_user_show_last_stats);
@@ -872,9 +891,9 @@ create_main_window (void)
                               GDK_F2, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2752 = create_pixmap (main_window, "menu_match_stats.png");
-  gtk_widget_show (image2752);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_stats), image2752);
+  image3004 = create_pixmap (main_window, "menu_match_stats.png");
+  gtk_widget_show (image3004);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_last_stats), image3004);
 
   menu_user_show_coming_matches = gtk_image_menu_item_new_with_mnemonic (_("Show coming matches"));
   gtk_widget_show (menu_user_show_coming_matches);
@@ -883,9 +902,9 @@ create_main_window (void)
                               GDK_F1, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2753 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2753);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_coming_matches), image2753);
+  image3005 = gtk_image_new_from_stock ("gtk-jump-to", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3005);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_coming_matches), image3005);
 
   trennlinie9 = gtk_separator_menu_item_new ();
   gtk_widget_show (trennlinie9);
@@ -899,9 +918,9 @@ create_main_window (void)
                               GDK_F9, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2754 = gtk_image_new_from_stock ("gtk-media-forward", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2754);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image2754);
+  image3006 = gtk_image_new_from_stock ("gtk-media-forward", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3006);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_next_user), image3006);
 
   menu_previous_user = gtk_image_menu_item_new_with_mnemonic (_("Previous user"));
   gtk_widget_show (menu_previous_user);
@@ -910,9 +929,9 @@ create_main_window (void)
                               GDK_F8, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2755 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2755);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image2755);
+  image3007 = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3007);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_previous_user), image3007);
 
   menu_manage_users = gtk_image_menu_item_new_with_mnemonic (_("Manage users"));
   gtk_widget_show (menu_manage_users);
@@ -921,9 +940,9 @@ create_main_window (void)
                               GDK_F12, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2756 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2756);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image2756);
+  image3008 = gtk_image_new_from_stock ("gtk-justify-fill", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3008);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_manage_users), image3008);
 
   menu_finances_stadium = gtk_menu_item_new_with_mnemonic (_("Fin_Stad"));
   gtk_widget_show (menu_finances_stadium);
@@ -939,9 +958,9 @@ create_main_window (void)
                               GDK_f, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2757 = create_pixmap (main_window, "menu_finances.png");
-  gtk_widget_show (image2757);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_finances), image2757);
+  image3009 = create_pixmap (main_window, "menu_finances.png");
+  gtk_widget_show (image3009);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_finances), image3009);
 
   menu_show_stadium = gtk_image_menu_item_new_with_mnemonic (_("Show stadium"));
   gtk_widget_show (menu_show_stadium);
@@ -950,9 +969,9 @@ create_main_window (void)
                               GDK_f, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2758 = create_pixmap (main_window, "menu_stadium.png");
-  gtk_widget_show (image2758);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_stadium), image2758);
+  image3010 = create_pixmap (main_window, "menu_stadium.png");
+  gtk_widget_show (image3010);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_show_stadium), image3010);
 
   automatic_loan_repayment = gtk_menu_item_new_with_mnemonic (_("Automatic loan repayment"));
   gtk_widget_show (automatic_loan_repayment);
@@ -995,9 +1014,9 @@ create_main_window (void)
                               GDK_s, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2759 = create_pixmap (main_window, "menu_league_stats.png");
-  gtk_widget_show (image2759);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_league_stats), image2759);
+  image3011 = create_pixmap (main_window, "menu_league_stats.png");
+  gtk_widget_show (image3011);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_league_stats), image3011);
 
   menu_season_history = gtk_image_menu_item_new_with_mnemonic (_("Season history"));
   gtk_widget_show (menu_season_history);
@@ -1006,9 +1025,9 @@ create_main_window (void)
                               GDK_h, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image2760 = create_pixmap (main_window, "menu_history.png");
-  gtk_widget_show (image2760);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_history), image2760);
+  image3012 = create_pixmap (main_window, "menu_history.png");
+  gtk_widget_show (image3012);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_season_history), image3012);
 
   menu_user_show_history = gtk_image_menu_item_new_with_mnemonic (_("User history"));
   gtk_widget_show (menu_user_show_history);
@@ -1017,17 +1036,17 @@ create_main_window (void)
                               GDK_h, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2761 = create_pixmap (main_window, "menu_history.png");
-  gtk_widget_show (image2761);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_history), image2761);
+  image3013 = create_pixmap (main_window, "menu_history.png");
+  gtk_widget_show (image3013);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_user_show_history), image3013);
 
   memorable_matches = gtk_image_menu_item_new_with_mnemonic (_("Memorable matches"));
   gtk_widget_show (memorable_matches);
   gtk_container_add (GTK_CONTAINER (stats1_menu), memorable_matches);
 
-  image2762 = create_pixmap (main_window, "menu_mmatches.png");
-  gtk_widget_show (image2762);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (memorable_matches), image2762);
+  image3014 = create_pixmap (main_window, "menu_mmatches.png");
+  gtk_widget_show (image3014);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (memorable_matches), image3014);
 
   memorable_matches_menu = gtk_menu_new ();
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (memorable_matches), memorable_matches_menu);
@@ -1040,9 +1059,9 @@ create_main_window (void)
                               GDK_a, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2763 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2763);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_add_last_match), image2763);
+  image3015 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3015);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_add_last_match), image3015);
 
   mm_manage_matches = gtk_image_menu_item_new_with_mnemonic (_("Manage matches"));
   gtk_widget_show (mm_manage_matches);
@@ -1052,9 +1071,9 @@ create_main_window (void)
                               GDK_m, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image2764 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2764);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_manage_matches), image2764);
+  image3016 = gtk_image_new_from_stock ("gtk-preferences", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3016);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mm_manage_matches), image3016);
 
   menu_help1 = gtk_menu_item_new_with_mnemonic (_("_Help"));
   gtk_widget_show (menu_help1);
@@ -1067,25 +1086,25 @@ create_main_window (void)
   gtk_widget_show (menu_about);
   gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_about);
 
-  image2765 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2765);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_about), image2765);
+  image3017 = gtk_image_new_from_stock ("gtk-dialog-info", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3017);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_about), image3017);
 
   menu_contributors = gtk_image_menu_item_new_with_mnemonic (_("Contributors"));
   gtk_widget_show (menu_contributors);
   gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_contributors);
 
-  image2766 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2766);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image2766);
+  image3018 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3018);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_contributors), image3018);
 
   menu_help = gtk_image_menu_item_new_with_mnemonic (_("Help"));
   gtk_widget_show (menu_help);
   gtk_container_add (GTK_CONTAINER (menu_help1_menu), menu_help);
 
-  image2767 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
-  gtk_widget_show (image2767);
-  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image2767);
+  image3019 = gtk_image_new_from_stock ("gtk-help", GTK_ICON_SIZE_MENU);
+  gtk_widget_show (image3019);
+  gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_help), image3019);
 
   hbox1 = gtk_hbox_new (FALSE, 0);
   gtk_widget_show (hbox1);
@@ -1584,6 +1603,15 @@ create_main_window (void)
   g_signal_connect ((gpointer) menu_boost_anti, "button_release_event",
                     G_CALLBACK (on_menu_team_button_release_event),
                     NULL);
+  g_signal_connect ((gpointer) default_team1, "activate",
+                    G_CALLBACK (on_default_team1_activate),
+                    NULL);
+  g_signal_connect ((gpointer) store1, "activate",
+                    G_CALLBACK (on_default_team_store_activate),
+                    NULL);
+  g_signal_connect ((gpointer) restore1, "activate",
+                    G_CALLBACK (on_default_team_restore_activate),
+                    NULL);
   g_signal_connect ((gpointer) menu_training_camp, "activate",
                     G_CALLBACK (on_training_camp_activate),
                     NULL);
@@ -1753,7 +1781,7 @@ create_main_window (void)
   GLADE_HOOKUP_OBJECT (main_window, menu_new, "menu_new");
   GLADE_HOOKUP_OBJECT (main_window, menu_open, "menu_open");
   GLADE_HOOKUP_OBJECT (main_window, menu_load_last_save, "menu_load_last_save");
-  GLADE_HOOKUP_OBJECT (main_window, image2725, "image2725");
+  GLADE_HOOKUP_OBJECT (main_window, image2977, "image2977");
   GLADE_HOOKUP_OBJECT (main_window, menu_save, "menu_save");
   GLADE_HOOKUP_OBJECT (main_window, menu_save_as, "menu_save_as");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie1, "trennlinie1");
@@ -1761,30 +1789,30 @@ create_main_window (void)
   GLADE_HOOKUP_OBJECT (main_window, menu_options, "menu_options");
   GLADE_HOOKUP_OBJECT (main_window, menu_options_menu, "menu_options_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_preferences, "menu_preferences");
-  GLADE_HOOKUP_OBJECT (main_window, image2726, "image2726");
+  GLADE_HOOKUP_OBJECT (main_window, image2978, "image2978");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie7, "trennlinie7");
   GLADE_HOOKUP_OBJECT (main_window, menu_job_offers, "menu_job_offers");
   GLADE_HOOKUP_OBJECT (main_window, menu_live_game, "menu_live_game");
   GLADE_HOOKUP_OBJECT (main_window, menu_overwrite, "menu_overwrite");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie14, "trennlinie14");
   GLADE_HOOKUP_OBJECT (main_window, menu_save_window_geometry, "menu_save_window_geometry");
-  GLADE_HOOKUP_OBJECT (main_window, image2727, "image2727");
+  GLADE_HOOKUP_OBJECT (main_window, image2979, "image2979");
   GLADE_HOOKUP_OBJECT (main_window, menu_figures, "menu_figures");
   GLADE_HOOKUP_OBJECT (main_window, menu_figures_menu, "menu_figures_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_fixtures_week, "menu_fixtures_week");
-  GLADE_HOOKUP_OBJECT (main_window, image2728, "image2728");
+  GLADE_HOOKUP_OBJECT (main_window, image2980, "image2980");
   GLADE_HOOKUP_OBJECT (main_window, menu_fixtures, "menu_fixtures");
-  GLADE_HOOKUP_OBJECT (main_window, image2729, "image2729");
+  GLADE_HOOKUP_OBJECT (main_window, image2981, "image2981");
   GLADE_HOOKUP_OBJECT (main_window, menu_tables, "menu_tables");
-  GLADE_HOOKUP_OBJECT (main_window, image2730, "image2730");
+  GLADE_HOOKUP_OBJECT (main_window, image2982, "image2982");
   GLADE_HOOKUP_OBJECT (main_window, menu_my_league_results, "menu_my_league_results");
-  GLADE_HOOKUP_OBJECT (main_window, image2731, "image2731");
+  GLADE_HOOKUP_OBJECT (main_window, image2983, "image2983");
   GLADE_HOOKUP_OBJECT (main_window, menu_season_results, "menu_season_results");
-  GLADE_HOOKUP_OBJECT (main_window, image2732, "image2732");
+  GLADE_HOOKUP_OBJECT (main_window, image2984, "image2984");
   GLADE_HOOKUP_OBJECT (main_window, menu_team, "menu_team");
   GLADE_HOOKUP_OBJECT (main_window, menu_team_menu, "menu_team_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_playing_style, "menu_playing_style");
-  GLADE_HOOKUP_OBJECT (main_window, image2733, "image2733");
+  GLADE_HOOKUP_OBJECT (main_window, image2985, "image2985");
   GLADE_HOOKUP_OBJECT (main_window, menu_playing_style_menu, "menu_playing_style_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_all_out_defend, "menu_all_out_defend");
   GLADE_HOOKUP_OBJECT (main_window, menu_defend, "menu_defend");
@@ -1792,21 +1820,21 @@ create_main_window (void)
   GLADE_HOOKUP_OBJECT (main_window, menu_attack, "menu_attack");
   GLADE_HOOKUP_OBJECT (main_window, menu_all_out_attack, "menu_all_out_attack");
   GLADE_HOOKUP_OBJECT (main_window, menu_scout, "menu_scout");
-  GLADE_HOOKUP_OBJECT (main_window, image2734, "image2734");
+  GLADE_HOOKUP_OBJECT (main_window, image2986, "image2986");
   GLADE_HOOKUP_OBJECT (main_window, menu_scout_menu, "menu_scout_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_scout_best, "menu_scout_best");
   GLADE_HOOKUP_OBJECT (main_window, menu_scout_good, "menu_scout_good");
   GLADE_HOOKUP_OBJECT (main_window, menu_scout_average, "menu_scout_average");
   GLADE_HOOKUP_OBJECT (main_window, menu_scout_bad, "menu_scout_bad");
   GLADE_HOOKUP_OBJECT (main_window, menu_physio, "menu_physio");
-  GLADE_HOOKUP_OBJECT (main_window, image2735, "image2735");
+  GLADE_HOOKUP_OBJECT (main_window, image2987, "image2987");
   GLADE_HOOKUP_OBJECT (main_window, menu_physio_menu, "menu_physio_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_physio_best, "menu_physio_best");
   GLADE_HOOKUP_OBJECT (main_window, menu_physio_good, "menu_physio_good");
   GLADE_HOOKUP_OBJECT (main_window, menu_physio_average, "menu_physio_average");
   GLADE_HOOKUP_OBJECT (main_window, menu_physio_bad, "menu_physio_bad");
   GLADE_HOOKUP_OBJECT (main_window, menu_youth_academy, "menu_youth_academy");
-  GLADE_HOOKUP_OBJECT (main_window, image2736, "image2736");
+  GLADE_HOOKUP_OBJECT (main_window, image2988, "image2988");
   GLADE_HOOKUP_OBJECT (main_window, menu_youth_academy_menu, "menu_youth_academy_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_show_youth_academy, "menu_show_youth_academy");
   GLADE_HOOKUP_OBJECT (main_window, youth_coach1, "youth_coach1");
@@ -1824,67 +1852,71 @@ create_main_window (void)
   GLADE_HOOKUP_OBJECT (main_window, menu_recruit4, "menu_recruit4");
   GLADE_HOOKUP_OBJECT (main_window, menu_set_investment, "menu_set_investment");
   GLADE_HOOKUP_OBJECT (main_window, menu_boost, "menu_boost");
-  GLADE_HOOKUP_OBJECT (main_window, image2737, "image2737");
+  GLADE_HOOKUP_OBJECT (main_window, image2989, "image2989");
   GLADE_HOOKUP_OBJECT (main_window, menu_boost_menu, "menu_boost_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_boost_on, "menu_boost_on");
   GLADE_HOOKUP_OBJECT (main_window, menu_boost_off, "menu_boost_off");
   GLADE_HOOKUP_OBJECT (main_window, menu_boost_anti, "menu_boost_anti");
+  GLADE_HOOKUP_OBJECT (main_window, default_team1, "default_team1");
+  GLADE_HOOKUP_OBJECT (main_window, default_team1_menu, "default_team1_menu");
+  GLADE_HOOKUP_OBJECT (main_window, store1, "store1");
+  GLADE_HOOKUP_OBJECT (main_window, restore1, "restore1");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie11, "trennlinie11");
   GLADE_HOOKUP_OBJECT (main_window, menu_training_camp, "menu_training_camp");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie18, "trennlinie18");
   GLADE_HOOKUP_OBJECT (main_window, menu_reset_players, "menu_reset_players");
-  GLADE_HOOKUP_OBJECT (main_window, image2738, "image2738");
+  GLADE_HOOKUP_OBJECT (main_window, image2990, "image2990");
   GLADE_HOOKUP_OBJECT (main_window, menu_custom_structure, "menu_custom_structure");
-  GLADE_HOOKUP_OBJECT (main_window, image2739, "image2739");
+  GLADE_HOOKUP_OBJECT (main_window, image2991, "image2991");
   GLADE_HOOKUP_OBJECT (main_window, menu_rearrange_team, "menu_rearrange_team");
-  GLADE_HOOKUP_OBJECT (main_window, image2740, "image2740");
+  GLADE_HOOKUP_OBJECT (main_window, image2992, "image2992");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie8, "trennlinie8");
   GLADE_HOOKUP_OBJECT (main_window, menu_browse_teams, "menu_browse_teams");
-  GLADE_HOOKUP_OBJECT (main_window, image2741, "image2741");
+  GLADE_HOOKUP_OBJECT (main_window, image2993, "image2993");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie16, "trennlinie16");
   GLADE_HOOKUP_OBJECT (main_window, menu_show_job_exchange, "menu_show_job_exchange");
   GLADE_HOOKUP_OBJECT (main_window, menu_player, "menu_player");
   GLADE_HOOKUP_OBJECT (main_window, menu_player_menu, "menu_player_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_show_info, "menu_show_info");
-  GLADE_HOOKUP_OBJECT (main_window, image2742, "image2742");
+  GLADE_HOOKUP_OBJECT (main_window, image2994, "image2994");
   GLADE_HOOKUP_OBJECT (main_window, menu_put_on_transfer_list, "menu_put_on_transfer_list");
-  GLADE_HOOKUP_OBJECT (main_window, image2743, "image2743");
+  GLADE_HOOKUP_OBJECT (main_window, image2995, "image2995");
   GLADE_HOOKUP_OBJECT (main_window, menu_remove_from_transfer_list, "menu_remove_from_transfer_list");
-  GLADE_HOOKUP_OBJECT (main_window, image2744, "image2744");
+  GLADE_HOOKUP_OBJECT (main_window, image2996, "image2996");
   GLADE_HOOKUP_OBJECT (main_window, menu_offer_new_contract, "menu_offer_new_contract");
-  GLADE_HOOKUP_OBJECT (main_window, image2745, "image2745");
+  GLADE_HOOKUP_OBJECT (main_window, image2997, "image2997");
   GLADE_HOOKUP_OBJECT (main_window, menu_fire, "menu_fire");
-  GLADE_HOOKUP_OBJECT (main_window, image2746, "image2746");
+  GLADE_HOOKUP_OBJECT (main_window, image2998, "image2998");
   GLADE_HOOKUP_OBJECT (main_window, menu_shoots_penalties, "menu_shoots_penalties");
-  GLADE_HOOKUP_OBJECT (main_window, image2747, "image2747");
+  GLADE_HOOKUP_OBJECT (main_window, image2999, "image2999");
   GLADE_HOOKUP_OBJECT (main_window, menu_move_to_youth_academy, "menu_move_to_youth_academy");
-  GLADE_HOOKUP_OBJECT (main_window, image2748, "image2748");
+  GLADE_HOOKUP_OBJECT (main_window, image3000, "image3000");
   GLADE_HOOKUP_OBJECT (main_window, menu_edit_name, "menu_edit_name");
-  GLADE_HOOKUP_OBJECT (main_window, image2749, "image2749");
+  GLADE_HOOKUP_OBJECT (main_window, image3001, "image3001");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie10, "trennlinie10");
   GLADE_HOOKUP_OBJECT (main_window, menu_browse_players, "menu_browse_players");
-  GLADE_HOOKUP_OBJECT (main_window, image2750, "image2750");
+  GLADE_HOOKUP_OBJECT (main_window, image3002, "image3002");
   GLADE_HOOKUP_OBJECT (main_window, menu_user, "menu_user");
   GLADE_HOOKUP_OBJECT (main_window, menu_user_menu, "menu_user_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_user_show_last_match, "menu_user_show_last_match");
-  GLADE_HOOKUP_OBJECT (main_window, image2751, "image2751");
+  GLADE_HOOKUP_OBJECT (main_window, image3003, "image3003");
   GLADE_HOOKUP_OBJECT (main_window, menu_user_show_last_stats, "menu_user_show_last_stats");
-  GLADE_HOOKUP_OBJECT (main_window, image2752, "image2752");
+  GLADE_HOOKUP_OBJECT (main_window, image3004, "image3004");
   GLADE_HOOKUP_OBJECT (main_window, menu_user_show_coming_matches, "menu_user_show_coming_matches");
-  GLADE_HOOKUP_OBJECT (main_window, image2753, "image2753");
+  GLADE_HOOKUP_OBJECT (main_window, image3005, "image3005");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie9, "trennlinie9");
   GLADE_HOOKUP_OBJECT (main_window, menu_next_user, "menu_next_user");
-  GLADE_HOOKUP_OBJECT (main_window, image2754, "image2754");
+  GLADE_HOOKUP_OBJECT (main_window, image3006, "image3006");
   GLADE_HOOKUP_OBJECT (main_window, menu_previous_user, "menu_previous_user");
-  GLADE_HOOKUP_OBJECT (main_window, image2755, "image2755");
+  GLADE_HOOKUP_OBJECT (main_window, image3007, "image3007");
   GLADE_HOOKUP_OBJECT (main_window, menu_manage_users, "menu_manage_users");
-  GLADE_HOOKUP_OBJECT (main_window, image2756, "image2756");
+  GLADE_HOOKUP_OBJECT (main_window, image3008, "image3008");
   GLADE_HOOKUP_OBJECT (main_window, menu_finances_stadium, "menu_finances_stadium");
   GLADE_HOOKUP_OBJECT (main_window, menu_finances_stadium_menu, "menu_finances_stadium_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_show_finances, "menu_show_finances");
-  GLADE_HOOKUP_OBJECT (main_window, image2757, "image2757");
+  GLADE_HOOKUP_OBJECT (main_window, image3009, "image3009");
   GLADE_HOOKUP_OBJECT (main_window, menu_show_stadium, "menu_show_stadium");
-  GLADE_HOOKUP_OBJECT (main_window, image2758, "image2758");
+  GLADE_HOOKUP_OBJECT (main_window, image3010, "image3010");
   GLADE_HOOKUP_OBJECT (main_window, automatic_loan_repayment, "automatic_loan_repayment");
   GLADE_HOOKUP_OBJECT (main_window, trennlinie15, "trennlinie15");
   GLADE_HOOKUP_OBJECT (main_window, menu_betting, "menu_betting");
@@ -1892,26 +1924,26 @@ create_main_window (void)
   GLADE_HOOKUP_OBJECT (main_window, stats1_menu, "stats1_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_news, "menu_news");
   GLADE_HOOKUP_OBJECT (main_window, menu_league_stats, "menu_league_stats");
-  GLADE_HOOKUP_OBJECT (main_window, image2759, "image2759");
+  GLADE_HOOKUP_OBJECT (main_window, image3011, "image3011");
   GLADE_HOOKUP_OBJECT (main_window, menu_season_history, "menu_season_history");
-  GLADE_HOOKUP_OBJECT (main_window, image2760, "image2760");
+  GLADE_HOOKUP_OBJECT (main_window, image3012, "image3012");
   GLADE_HOOKUP_OBJECT (main_window, menu_user_show_history, "menu_user_show_history");
-  GLADE_HOOKUP_OBJECT (main_window, image2761, "image2761");
+  GLADE_HOOKUP_OBJECT (main_window, image3013, "image3013");
   GLADE_HOOKUP_OBJECT (main_window, memorable_matches, "memorable_matches");
-  GLADE_HOOKUP_OBJECT (main_window, image2762, "image2762");
+  GLADE_HOOKUP_OBJECT (main_window, image3014, "image3014");
   GLADE_HOOKUP_OBJECT (main_window, memorable_matches_menu, "memorable_matches_menu");
   GLADE_HOOKUP_OBJECT (main_window, mm_add_last_match, "mm_add_last_match");
-  GLADE_HOOKUP_OBJECT (main_window, image2763, "image2763");
+  GLADE_HOOKUP_OBJECT (main_window, image3015, "image3015");
   GLADE_HOOKUP_OBJECT (main_window, mm_manage_matches, "mm_manage_matches");
-  GLADE_HOOKUP_OBJECT (main_window, image2764, "image2764");
+  GLADE_HOOKUP_OBJECT (main_window, image3016, "image3016");
   GLADE_HOOKUP_OBJECT (main_window, menu_help1, "menu_help1");
   GLADE_HOOKUP_OBJECT (main_window, menu_help1_menu, "menu_help1_menu");
   GLADE_HOOKUP_OBJECT (main_window, menu_about, "menu_about");
-  GLADE_HOOKUP_OBJECT (main_window, image2765, "image2765");
+  GLADE_HOOKUP_OBJECT (main_window, image3017, "image3017");
   GLADE_HOOKUP_OBJECT (main_window, menu_contributors, "menu_contributors");
-  GLADE_HOOKUP_OBJECT (main_window, image2766, "image2766");
+  GLADE_HOOKUP_OBJECT (main_window, image3018, "image3018");
   GLADE_HOOKUP_OBJECT (main_window, menu_help, "menu_help");
-  GLADE_HOOKUP_OBJECT (main_window, image2767, "image2767");
+  GLADE_HOOKUP_OBJECT (main_window, image3019, "image3019");
   GLADE_HOOKUP_OBJECT (main_window, hbox1, "hbox1");
   GLADE_HOOKUP_OBJECT (main_window, button_load, "button_load");
   GLADE_HOOKUP_OBJECT (main_window, image11, "image11");
diff --git a/src/support.c b/src/support.c
index b0e73693..00aff298 100644
--- a/src/support.c
+++ b/src/support.c
@@ -2,15 +2,9 @@
  * DO NOT EDIT THIS FILE - it is generated by Glade.
  */
 
-#define MAC_BUILD
-
-#ifndef MAC_BUILD
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
-#else
-#  include "config.h"
-#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/user.c b/src/user.c
index 4bd5d9f5..5d93b891 100644
--- a/src/user.c
+++ b/src/user.c
@@ -1349,7 +1349,4 @@ restore_default_team(User *user)
         }
     }
     team_change_structure(user->tm, user->default_structure);
-    user->default_structure=-1;
-    g_array_free(user->default_team, TRUE);
-    user->default_team = g_array_new(FALSE, FALSE, sizeof(gint));
 }
diff --git a/src/xml_loadsave_users.c b/src/xml_loadsave_users.c
index 90523318..5e4c4423 100644
--- a/src/xml_loadsave_users.c
+++ b/src/xml_loadsave_users.c
@@ -76,11 +76,13 @@ enum
     TAG_USER_BET_OUTCOME,
     TAG_USER_BET_FIX_ID,
     TAG_USER_YA_PREFERENCE,
+    TAG_USER_DEFAULT_TEAM,
+    TAG_USER_DEFAULT_STRUCTURE,
     TAG_END
 };
 
 gint state, idx_mon_in, idx_mon_out, idx,
-    idx_bet, idx_cnt;
+    idx_bet, idx_cnt, new_default_team_player, new_default_structure;
 User new_user;
 UserHistory new_history;
 Event new_event;
@@ -195,7 +197,9 @@ xml_loadsave_users_end_element    (GMarkupParseContext *context,
 	    tag == TAG_USER_YA_PREFERENCE ||
 	    tag == TAG_USER_YA_COUNTER ||
 	    tag == TAG_USER_BET0 ||
-	    tag == TAG_USER_BET1)
+	    tag == TAG_USER_BET1 ||
+            tag == TAG_USER_DEFAULT_TEAM ||
+            tag == TAG_USER_DEFAULT_STRUCTURE) 
     {
 	state = TAG_USER;
 	if(tag == TAG_USER_COUNTER)
@@ -347,6 +351,10 @@ xml_loadsave_users_text         (GMarkupParseContext *context,
 	new_bet.outcome = int_value;
     else if(state == TAG_USER_BET_FIX_ID)
 	new_bet.fix_id = int_value;
+    else if(state == TAG_USER_DEFAULT_TEAM)
+        g_array_append_val(new_user.default_team, int_value);
+    else if(state == TAG_USER_DEFAULT_STRUCTURE)
+        new_user.default_structure = int_value;
     else if(state >= TAG_START_PLAYERS && state <= TAG_END_PLAYERS)
 	xml_loadsave_players_text(buf);
 }
@@ -466,6 +474,10 @@ xml_loadsave_users_write(const gchar *prefix)
 			TAG_USER_YA_AV_PERCENTAGE, I1);
 	xml_write_float(fil, usr(i).youth_academy.counter_youth, TAG_USER_YA_COUNTER, I1);
         xml_write_int(fil, usr(i).youth_academy.pos_pref, TAG_USER_YA_PREFERENCE, I1); 
+        for (j=0; j < usr(i).default_team->len; j++){
+            xml_write_int(fil, g_array_index(usr(i).default_team, gint, j), TAG_USER_DEFAULT_TEAM, I1);
+        }
+        xml_write_int(fil, usr(i).default_structure, TAG_USER_DEFAULT_STRUCTURE, I1);
 	xml_loadsave_players_write(fil, usr(i).youth_academy.players);