--- a/data/team/gnu/team.xml	1990-01-01 01:00:00.000000000 +0100
+++ b/data/team/gnu/team.xml	2024-02-01 23:21:15.926808422 +0100
@@ -6,16 +6,15 @@
   <surface name="death_flag" file="dead.png" />
   <surface name="big_flag" file="flag64.png" />
   <team>
-    <character name="Connochaetes Taurinus" body="gnu" />
-    <character name="Connochaetes gnu" body="gnu" />
-    <character name="Not UNIX" body="gnu" />
-    <character name="Linux" body="gnu" />
+    <character name="Hyperbola" body="gnu" />
+    <character name="The GNU" body="gnu" />
+    <character name="UNIX" body="gnu" />
+    <character name="Libre" body="gnu" />
     <character name="Hurd" body="gnu" />
-    <character name="Emacs" body="gnu" />
+    <character name="BSD" body="gnu" />
     <character name="Compiler Collection" body="gnu" />
-    <character name="Arch" body="gnu" />
+    <character name="GCC" body="gnu" />
     <character name="Debugger" body="gnu" />
-    <character name="Savannah" body="gnu" />
   </team>
     <color name="teamcolor" r="111" g="85" b="50" a="255" />
 </resources>
--- a/data/team/konqi/team.xml	1990-01-01 01:00:00.000000000 +0100
+++ b/data/team/konqi/team.xml	2024-02-01 23:18:24.532708967 +0100
@@ -6,20 +6,20 @@
   <surface name="death_flag" file="dead.png" />
   <surface name="big_flag" file="flag64.png" />
   <team>
-    <character name="Konqui" body="konqi" />
-    <character name="Kopete" body="konqi" />
-    <character name="KDevelop" body="konqi" />
-    <character name="KMail" body="konqi" />
-    <character name="Kate" body="konqi" />
-    <character name="K3B" body="konqi" />
-    <character name="KFormula" body="konqi" />
-    <character name="KOffice" body="konqi" />
-    <character name="Kontact" body="konqi" />
-    <character name="Krita" body="konqi" />
-    <character name="digiKam" body="konqi" />
-    <character name="Kicker" body="konqi" />
-    <character name="okular" body="konqi" />
-    <character name="KPDF" body="konqi" />
+    <character name="Fafnir" body="konqi" />
+    <character name="Volcanor" body="konqi" />
+    <character name="Pyrrhus" body="konqi" />
+    <character name="Zephyrion" body="konqi" />
+    <character name="Typhon" body="konqi" />
+    <character name="Scorch" body="konqi" />
+    <character name="Seraphel" body="konqi" />
+    <character name="Xaldon" body="konqi" />
+    <character name="Vulcanis" body="konqi" />
+    <character name="Pyroclast" body="konqi" />
+    <character name="Drakonar" body="konqi" />
+    <character name="Aurelia" body="konqi" />
+    <character name="Ignatius" body="konqi" />
+    <character name="Emberheart" body="konqi" />
   </team>
     <color name="teamcolor" r="121" g="164" b="38" a="255" />
 </resources>
--- a/data/team/pidgin/team.xml	1990-01-01 01:00:00.000000000 +0100
+++ b/data/team/pidgin/team.xml	2024-02-01 23:20:30.085998956 +0100
@@ -6,22 +6,18 @@
   <surface name="death_flag" file="dead.png" />
   <surface name="big_flag" file="flag64.png" />
   <team>
-    <character name="AIM" body="pidgin"/>
-    <character name="Bonjour" body="pidgin"/>
-    <character name="Gadu-Gadu" body="pidgin"/>
-    <character name="Google Talk" body="pidgin"/>
-    <character name="Groupwise" body="pidgin"/>
-    <character name="ICQ" body="pidgin"/>
-    <character name="IRC" body="pidgin"/>
-    <character name="MSN" body="pidgin"/>
-    <character name="MySpaceIM" body="pidgin"/>
-    <character name="QQ" body="pidgin"/>
-    <character name="SILC" body="pidgin"/>
-    <character name="SIMPLE" body="pidgin"/>
-    <character name="Sametime" body="pidgin"/>
-    <character name="XMPP" body="pidgin"/>
-    <character name="Yahoo!" body="pidgin"/>
-    <character name="Zephyr" body="pidgin"/>
+    <character name="Paloma" body="pidgin"/>
+    <character name="Jemina" body="pidgin"/>
+    <character name="Callum" body="pidgin"/>
+    <character name="Jonah" body="pidgin"/>
+    <character name="Jonas" body="pidgin"/>
+    <character name="Giona" body="pidgin"/>
+    <character name="Younus" body="pidgin"/>
+    <character name="Yunus" body="pidgin"/>
+    <character name="Chenoa" body="pidgin"/>
+    <character name="Pomba" body="pidgin"/>
+    <character name="Titus" body="pidgin"/>
+    <character name="Tuvi" body="pidgin"/>
   </team>
     <color name="teamcolor" r="131" g="80" b="142" a="255" />
 </resources>
--- a/src/menu/options_menu.cpp	1990-01-01 01:00:00.000000000 +0100
+++ b/src/menu/options_menu.cpp	2024-02-02 00:06:12.861102656 +0100
@@ -242,11 +242,6 @@
   /* Misc options */
   Box * misc_options = new GridBox(3, 3, 0, false);
 
-  opt_updates =
-    new PictureTextCBox(_("Check updates online?"),
-                        "menu/ico_update", option_size);
-  misc_options->AddWidget(opt_updates);
-
 #ifndef HAVE_TOUCHSCREEN
   opt_lefthanded_mouse =
     new PictureTextCBox(_("Left-handed mouse?"),
@@ -377,7 +372,6 @@
 #endif
 
 #if USE_MISC_TAB
-  opt_updates->SetValue(config->GetCheckUpdates());
 # ifndef HAVE_TOUCHSCREEN
   opt_lefthanded_mouse->SetValue(config->GetLeftHandedMouse());
   opt_scroll_on_border->SetValue(config->GetScrollOnBorder());
@@ -436,7 +430,6 @@
 
   // Misc options
 #if USE_MISC_TAB
-  config->SetCheckUpdates(opt_updates->GetValue());
 # ifndef HAVE_TOUCHSCREEN
   config->SetLeftHandedMouse(opt_lefthanded_mouse->GetValue());
   config->SetScrollOnBorder(opt_scroll_on_border->GetValue());
--- a/src/menu/teams_selection_box.h	1990-01-01 01:00:00.000000000 +0100
+++ b/src/menu/teams_selection_box.h	2024-02-02 00:55:50.173676596 +0100
@@ -30,7 +30,7 @@
 class SpinButtonWithPicture;
 class TeamBox;
 
-const uint MAX_NB_TEAMS=8;
+const uint MAX_NB_TEAMS=6;
 
 class TeamScrollBox : public ScrollBox
 {
--- a/src/game/game_mode.cpp	1990-01-01 01:00:00.000000000 +0100
+++ b/src/game/game_mode.cpp	2024-08-04 22:14:13.129868508 +0200
@@ -43,7 +43,7 @@
 {
   rules = "none";
   nb_characters = 6;
-  max_teams = 8;
+  max_teams = 6;
   duration_turn = 60;
   duration_move_player = 3;
   duration_exchange_player = 2;