From a62eff597b130717a80a1ce982a973f44ba0694c Mon Sep 17 00:00:00 2001
From: tsigiarocc <tsigiarocc@localhost>
Date: Sun, 28 Dec 2008 08:57:14 +0000
Subject: [PATCH] Added serbia in place of scg and updated its files.

---
 .../definitions/europe/scg/cup_scg.xml        |  11 +-
 .../europe/serbia/country_serbia.xml          |  25 ++++
 .../europe/serbia/cup_serbia_cup.xml          | 124 ++++++++++++++++++
 .../europe/serbia/cup_serbia_prom_games1.xml  |  40 ++++++
 .../europe/serbia/league_serbia1.xml          |  64 +++++++++
 .../europe/serbia/league_serbia2.xml          |  92 +++++++++++++
 .../europe/serbia/league_serbia3a.xml         |  74 +++++++++++
 .../europe/serbia/league_serbia3b.xml         |  74 +++++++++++
 .../europe/serbia/league_serbia3c.xml         |  74 +++++++++++
 .../europe/serbia/league_serbia3d.xml         |  74 +++++++++++
 .../europe/slovakia/cup_slovakia_cup.xml      |  12 +-
 .../europe/slovakia/league_slovakia1.xml      |   9 +-
 .../europe/slovakia/league_slovakia2.xml      |   3 +-
 .../europe/slovakia/league_slovakia3a.xml     |   3 +-
 .../europe/slovakia/league_slovakia3b.xml     |   3 +-
 .../europe/slovenia/cup_slovenia_cup.xml      |  13 +-
 .../europe/slovenia/league_slovenia1.xml      |  14 +-
 .../europe/slovenia/league_slovenia2.xml      |  11 +-
 .../europe/slovenia/league_slovenia3a.xml     |   8 +-
 .../europe/slovenia/league_slovenia3b.xml     |   8 +-
 .../europe/spain/cup_spain_cdr.xml            |  14 +-
 .../europe/spain/league_spain1.xml            |  11 +-
 .../europe/spain/league_spain2.xml            |   6 +-
 .../europe/spain/league_spain3a.xml           |   6 +-
 .../europe/spain/league_spain3b.xml           |   6 +-
 .../europe/spain/league_spain3c.xml           |   6 +-
 .../europe/spain/league_spain3d.xml           |   6 +-
 .../europe/sweden/cup_sweden_cupen.xml        |  24 ++--
 .../switzerland/cup_switzerland_cup.xml       |  11 +-
 .../switzerland/league_switzerland1.xml       |  10 +-
 .../switzerland/league_switzerland2.xml       |   4 +-
 .../switzerland/league_switzerland3a.xml      |   4 +-
 .../switzerland/league_switzerland3b.xml      |   4 +-
 .../switzerland/league_switzerland3c.xml      |   4 +-
 .../europe/turkey/cup_turkey_kupasi.xml       |  10 +-
 .../europe/turkey/league_turkey1.xml          |   9 +-
 .../europe/turkey/league_turkey2.xml          |   7 +-
 .../europe/turkey/league_turkey3a.xml         |   2 +-
 .../europe/turkey/league_turkey3b.xml         |   2 +-
 .../europe/turkey/league_turkey3c.xml         |   2 +-
 .../europe/turkey/league_turkey3d.xml         |   2 +-
 .../europe/turkey/league_turkey3e.xml         |   2 +-
 .../europe/ukraine/cup_ukraine_cup.xml        |  12 +-
 .../europe/ukraine/league_ukraine1.xml        |   7 +-
 .../europe/ukraine/league_ukraine2.xml        |   6 +-
 .../europe/ukraine/league_ukraine3a.xml       |   6 +-
 .../europe/ukraine/league_ukraine3b.xml       |   6 +-
 .../europe/wales/cup_wales_welsh.xml          |   8 +-
 .../europe/wales/league_wales1.xml            |   8 +-
 .../europe/wales/league_wales2a.xml           |   4 +-
 .../europe/wales/league_wales2b.xml           |   4 +-
 51 files changed, 823 insertions(+), 126 deletions(-)
 create mode 100644 support_files/definitions/europe/serbia/country_serbia.xml
 create mode 100644 support_files/definitions/europe/serbia/cup_serbia_cup.xml
 create mode 100644 support_files/definitions/europe/serbia/cup_serbia_prom_games1.xml
 create mode 100644 support_files/definitions/europe/serbia/league_serbia1.xml
 create mode 100755 support_files/definitions/europe/serbia/league_serbia2.xml
 create mode 100755 support_files/definitions/europe/serbia/league_serbia3a.xml
 create mode 100755 support_files/definitions/europe/serbia/league_serbia3b.xml
 create mode 100755 support_files/definitions/europe/serbia/league_serbia3c.xml
 create mode 100755 support_files/definitions/europe/serbia/league_serbia3d.xml

diff --git a/support_files/definitions/europe/scg/cup_scg.xml b/support_files/definitions/europe/scg/cup_scg.xml
index f5e709a8..5f441e75 100644
--- a/support_files/definitions/europe/scg/cup_scg.xml
+++ b/support_files/definitions/europe/scg/cup_scg.xml
@@ -5,7 +5,7 @@
   <symbol>flag_scg.png</symbol>
   <sid>scg</sid>
   <yellow_red>3</yellow_red>
-  <last_week>35</last_week>
+  <last_week>44</last_week>
   <week_gap>5</week_gap>
   <property>national</property>
 
@@ -47,7 +47,7 @@
       </choose_team>
     </choose_teams>
     <byes>0</byes>
-    <delay>-5</delay>
+    <delay>-9</delay>
   </cup_round>
 
   <cup_round>
@@ -99,22 +99,21 @@
       </choose_team>
     </choose_teams>
     <byes>0</byes>
-    <delay>-4</delay>
+    <delay>-11</delay>
   </cup_round>
 
   <cup_round>
     <home_away>0</home_away>
-    <delay>-5</delay>
+    <delay>-9</delay>
   </cup_round>
 
   <cup_round>
     <home_away>0</home_away>
-    <delay>1</delay>
   </cup_round>
 
   <cup_round>
     <home_away>0</home_away>
-    <delay>1</delay>
+    <delay>2</delay>
   </cup_round>
 
   <cup_round>
diff --git a/support_files/definitions/europe/serbia/country_serbia.xml b/support_files/definitions/europe/serbia/country_serbia.xml
new file mode 100644
index 00000000..8cf5c2f6
--- /dev/null
+++ b/support_files/definitions/europe/serbia/country_serbia.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<country>
+  <name>Serbia</name>
+  <rating>7</rating>
+  <symbol>flag_serbia.png</symbol>
+  <sid>serbia</sid>
+
+  <leagues>
+    <league>serbia1</league>
+    <league>serbia2</league>
+    <league>serbia3a</league>
+    <league>serbia3b</league>
+    <league>serbia3c</league>
+    <league>serbia3d</league>
+  </leagues>
+
+  <cups>
+    <cup>serbia_cup</cup>
+    <cup>europe_uefa</cup>
+    <cup>europe_champ_league</cup>
+    <cup>supercup_europe_uefa</cup>
+    <cup>supercup_europe_intercontinental</cup>
+    <cup>serbia_prom_games1</cup>
+  </cups>
+</country>
diff --git a/support_files/definitions/europe/serbia/cup_serbia_cup.xml b/support_files/definitions/europe/serbia/cup_serbia_cup.xml
new file mode 100644
index 00000000..9e8f7814
--- /dev/null
+++ b/support_files/definitions/europe/serbia/cup_serbia_cup.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+  <name>Lav Kup Srbije</name>
+  <short_name>Lav Kup</short_name>
+  <symbol>flag_serbia.png</symbol>
+  <sid>serbia_cup</sid>
+  <yellow_red>3</yellow_red>
+  <last_week>44</last_week>
+  <week_gap>5</week_gap>
+  <property>national</property>
+
+ <cup_rounds>
+  <cup_round>
+    <home_away>0</home_away>
+
+    <choose_teams>
+      <choose_team>
+	<choose_team_sid>serbia3a</choose_team_sid>
+	<number_of_teams>2</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>16</end_idx>
+	  <randomly>1</randomly>
+      </choose_team>
+
+      <choose_team>
+	<choose_team_sid>serbia3b</choose_team_sid>
+	<number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>16</end_idx>
+	  <randomly>1</randomly>
+      </choose_team>
+
+      <choose_team>
+	<choose_team_sid>serbia3c</choose_team_sid>
+	<number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>16</end_idx>
+	  <randomly>1</randomly>
+      </choose_team>
+
+      <choose_team>
+	<choose_team_sid>serbia3d</choose_team_sid>
+	<number_of_teams>2</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>16</end_idx>
+	  <randomly>1</randomly>
+      </choose_team>
+    </choose_teams>
+    <byes>0</byes>
+    <delay>-9</delay>
+  </cup_round>
+
+  <cup_round>
+    <home_away>0</home_away>
+
+    <choose_teams>
+      <choose_team>
+	<choose_team_sid>serbia3a</choose_team_sid>
+	<number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>16</end_idx>
+	  <randomly>1</randomly>
+      </choose_team>
+
+      <choose_team>
+	<choose_team_sid>serbia3b</choose_team_sid>
+	<number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>16</end_idx>
+	  <randomly>1</randomly>
+      </choose_team>
+
+      <choose_team>
+	<choose_team_sid>serbia3c</choose_team_sid>
+	<number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>16</end_idx>
+	  <randomly>1</randomly>
+      </choose_team>
+
+      <choose_team>
+	<choose_team_sid>serbia3d</choose_team_sid>
+	<number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>16</end_idx>
+	  <randomly>1</randomly>
+      </choose_team>
+
+      <choose_team>
+	<choose_team_sid>serbia2</choose_team_sid>
+	  <number_of_teams>13</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>18</end_idx>
+	  <randomly>1</randomly>
+      </choose_team>
+
+      <choose_team>
+	<choose_team_sid>serbia1</choose_team_sid>
+      </choose_team>
+    </choose_teams>
+    <byes>0</byes>
+    <delay>-11</delay>
+  </cup_round>
+
+  <cup_round>
+    <home_away>0</home_away>
+    <delay>-9</delay>
+  </cup_round>
+
+  <cup_round>
+    <home_away>0</home_away>
+  </cup_round>
+
+  <cup_round>
+    <home_away>0</home_away>
+    <delay>2</delay>
+  </cup_round>
+
+  <cup_round>
+    <home_away>0</home_away>
+    <neutral>1</neutral>
+  </cup_round>
+ </cup_rounds>
+</cup>
\ No newline at end of file
diff --git a/support_files/definitions/europe/serbia/cup_serbia_prom_games1.xml b/support_files/definitions/europe/serbia/cup_serbia_prom_games1.xml
new file mode 100644
index 00000000..e06f1a62
--- /dev/null
+++ b/support_files/definitions/europe/serbia/cup_serbia_prom_games1.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+  <name>Srbija Promotion</name>
+  <short_name>S. Prom.</short_name>
+  <symbol>flag_serbia.png</symbol>
+  <sid>serbia_prom_games1</sid>
+  <add_week>1000</add_week>
+  <property>national</property>
+  <property>highlight2</property>
+  <yellow_red>3</yellow_red>
+
+  <cup_rounds>
+
+    <cup_round>
+      <choose_teams>
+	<choose_team>
+	  <choose_team_sid>serbia2</choose_team_sid>
+	  <number_of_teams>4</number_of_teams>
+	  <start_idx>3</start_idx>
+	  <end_idx>6</end_idx>
+	</choose_team>
+      </choose_teams>
+     </cup_round>
+
+    <cup_round>
+    </cup_round>
+
+    <cup_round>
+	<new_teams>1</new_teams>
+      <choose_teams>
+	<choose_team>
+	  <choose_team_sid>serbia1</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>10</start_idx>
+	  <end_idx>10</end_idx>
+	</choose_team>
+      </choose_teams>
+    </cup_round>
+  </cup_rounds>
+</cup>
\ No newline at end of file
diff --git a/support_files/definitions/europe/serbia/league_serbia1.xml b/support_files/definitions/europe/serbia/league_serbia1.xml
new file mode 100644
index 00000000..8cac9156
--- /dev/null
+++ b/support_files/definitions/europe/serbia/league_serbia1.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+  <sid>serbia1</sid>
+  <name>Super Liga Srbije</name>
+  <short_name>Superl.</short_name>
+  <symbol>flag_serbia.png</symbol>
+  <first_week>7</first_week>
+  <week_gap>1</week_gap>
+  <break_in length="1">10</break_in>
+  <break_in length="1">15</break_in>
+  <break_in length="7">25</break_in>
+  <average_talent>7400</average_talent>
+  <round_robins>3</round_robins>
+  <names_file>serbia</names_file>
+  <yellow_red>5</yellow_red>
+
+  <prom_rel>
+    <prom_rel_element>
+      <rank_start>11</rank_start>
+      <rank_end>12</rank_end>
+      <dest_sid>serbia2</dest_sid>
+      <prom_rel_type>relegation</prom_rel_type>
+    </prom_rel_element>
+  </prom_rel>
+
+  <teams>
+    <team>
+      <team_name>B. Zrenjanin</team_name>
+    </team>
+    <team>
+      <team_name>B. Čačak</team_name>
+    </team>
+    <team>
+      <team_name>Č. Belgrade</team_name>
+    </team>
+    <team>
+      <team_name>H. Kula</team_name>
+    </team> 
+   <team>
+      <team_name>J. Ivanjica</team_name>
+    </team>
+    <team>
+      <team_name>Jagodina</team_name>
+    </team>
+    <team>
+      <team_name>N. Kruševac</team_name>
+    </team>
+    <team>
+      <team_name>O. Belgrade</team_name>
+    </team>
+    <team>
+      <team_name>P. Belgrade</team_name>
+    </team>
+    <team>
+      <team_name>R. Belgrade</team_name>
+    </team>
+    <team>
+      <team_name>C. Z. Belgrade</team_name>
+    </team>
+    <team>
+      <team_name>V. Novi Sad</team_name>
+    </team>
+  </teams>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/serbia/league_serbia2.xml b/support_files/definitions/europe/serbia/league_serbia2.xml
new file mode 100755
index 00000000..56a6d136
--- /dev/null
+++ b/support_files/definitions/europe/serbia/league_serbia2.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+  <sid>serbia2</sid>
+  <name>Prva Liga Srbija</name>
+  <short_name>PLS</short_name>
+  <symbol>flag_serbia.png</symbol>
+  <first_week>7</first_week>
+  <week_gap>1</week_gap>
+  <break_in length="8">25</break_in>
+  <average_talent>6700</average_talent>
+  <names_file>serbia</names_file>
+  <yellow_red>5</yellow_red>
+
+  <prom_rel>
+    <prom_rel_element>
+      <rank_start>1</rank_start>
+      <rank_end>2</rank_end>
+      <dest_sid>serbia1</dest_sid>
+      <prom_rel_type>promotion</prom_rel_type>
+    </prom_rel_element>
+
+    <prom_rel_element>
+      <rank_start>15</rank_start>
+      <rank_end>18</rank_end>
+      <dest_sid>serbia3a serbia3b serbia3c serbia3d</dest_sid>
+      <prom_rel_type>relegation</prom_rel_type>
+    </prom_rel_element>
+
+    <prom_games>
+      <prom_games_dest_sid>serbia1</prom_games_dest_sid>
+      <prom_games_cup_sid>serbia_prom_games1</prom_games_cup_sid>
+      <prom_games_loser_sid>serbia2</prom_games_loser_sid>
+    </prom_games>
+  </prom_rel>
+
+  <teams>
+    <team>
+      <team_name>Bežanija</team_name>
+    </team>
+    <team>
+      <team_name>Borča</team_name>
+    </team>
+    <team>
+      <team_name>C. Pivara</team_name>
+    </team>
+    <team>
+      <team_name>D. Vranje</team_name>
+    </team>
+    <team>
+      <team_name>H. Beograd</team_name>
+    </team>
+    <team>
+      <team_name>Inđija</team_name>
+    </team>
+    <team>
+      <team_name>K. Lazarevac</team_name>
+    </team>
+    <team>
+      <team_name>M. G. Milanovac</team_name>
+    </team>
+    <team>
+      <team_name>M. Radnik</team_name>
+    </team>
+    <team>
+      <team_name>M. Apatin</team_name>
+    </team>
+    <team>
+      <team_name>M. Lučani</team_name>
+    </team>
+    <team>
+      <team_name>Novi Pazar</team_name>
+    </team>
+    <team>
+      <team_name>Novi Sad</team_name>
+    </team>
+    <team>
+      <team_name>Sevojno</team_name>
+    </team>
+    <team>
+      <team_name>Smederevo</team_name>
+    </team>
+    <team>
+      <team_name>Srem</team_name>
+    </team>
+    <team>
+      <team_name>Voždovac</team_name>
+    </team> 
+   <team>
+      <team_name>Subotica</team_name>
+    </team>
+  </teams>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/serbia/league_serbia3a.xml b/support_files/definitions/europe/serbia/league_serbia3a.xml
new file mode 100755
index 00000000..c169c82a
--- /dev/null
+++ b/support_files/definitions/europe/serbia/league_serbia3a.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+  <sid>serbia3a</sid>
+  <name>Srpska Liga Istok</name>
+  <short_name>S. L. I.</short_name>
+  <symbol>flag_serbia.png</symbol>
+  <first_week>7</first_week>
+  <week_gap>1</week_gap>
+  <break_in length="8">25</break_in>
+  <average_talent>6100</average_talent>
+  <names_file>serbia</names_file>
+  <yellow_red>5</yellow_red>
+  <layer>3</layer>
+
+  <prom_rel>
+    <prom_rel_element>
+      <rank_start>1</rank_start>
+      <rank_end>1</rank_end>
+      <dest_sid>serbia2</dest_sid>
+      <prom_rel_type>promotion</prom_rel_type>
+    </prom_rel_element>
+  </prom_rel>
+
+  <teams>
+    <team>
+      <team_name>B. Dimitrovgrad</team_name>
+    </team>
+    <team>
+      <team_name>C. Konstantin</team_name>
+    </team>
+    <team>
+      <team_name>D. Leskovac</team_name>
+    </team>
+    <team>
+      <team_name>H. Veljko</team_name>
+    </team>
+    <team>
+      <team_name>J. Paraćin</team_name>
+    </team>
+    <team>
+      <team_name>K. Brus</team_name>
+    </team>
+    <team>
+      <team_name>R. Surdulica</team_name>
+    </team>
+    <team>
+      <team_name>R. Niš</team_name>
+    </team>
+    <team>
+      <team_name>R. Pirot</team_name>
+    </team>
+    <team>
+      <team_name>S. Niš</team_name>
+    </team>
+    <team>
+      <team_name>Svrljig</team_name>
+    </team>
+    <team>
+      <team_name>T. Zaječar</team_name>
+    </team>
+    <team>
+      <team_name>Topličanin</team_name>
+    </team>
+    <team>
+      <team_name>V. Vlasotince</team_name>
+    </team>
+    <team>
+      <team_name>Z. Niš</team_name>
+    </team>
+    <team>
+      <team_name>Z. Aleksandrovac</team_name>
+    </team>
+  </teams>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/serbia/league_serbia3b.xml b/support_files/definitions/europe/serbia/league_serbia3b.xml
new file mode 100755
index 00000000..7d75230f
--- /dev/null
+++ b/support_files/definitions/europe/serbia/league_serbia3b.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+  <sid>serbia3b</sid>
+  <name>Srpska Liga Beograd</name>
+  <short_name>S. L. B.</short_name>
+  <symbol>flag_serbia.png</symbol>
+  <first_week>7</first_week>
+  <week_gap>1</week_gap>
+  <break_in length="8">25</break_in>
+  <average_talent>6100</average_talent>
+  <names_file>serbia</names_file>
+  <yellow_red>5</yellow_red>
+  <layer>3</layer>
+
+  <prom_rel>
+    <prom_rel_element>
+      <rank_start>1</rank_start>
+      <rank_end>1</rank_end>
+      <dest_sid>serbia2</dest_sid>
+      <prom_rel_type>promotion</prom_rel_type>
+    </prom_rel_element>
+  </prom_rel>
+
+  <teams>
+    <team>
+      <team_name>B. Beograd</team_name>
+    </team>
+    <team>
+      <team_name>F. Beograd</team_name>
+    </team>
+    <team>
+      <team_name>Dorćol</team_name>
+    </team>
+    <team>
+      <team_name>Lisović</team_name>
+    </team>
+    <team>
+      <team_name>O. Mladenovac</team_name>
+    </team>
+    <team>
+      <team_name>P. P. Skela</team_name>
+    </team>
+    <team>
+      <team_name>Palilulac</team_name>
+    </team>
+    <team>
+      <team_name>R. Jugopetrol</team_name>
+    </team>
+    <team>
+      <team_name>R. Obrenovac</team_name>
+    </team>
+    <team>
+      <team_name>Si. Beograd</team_name>
+    </team>
+    <team>
+      <team_name>Sopot</team_name>
+    </team>
+    <team>
+      <team_name>Sr. Beograd</team_name>
+    </team>
+    <team>
+      <team_name>Š. Jagnjilo</team_name>
+    </team>
+    <team>
+      <team_name>Teleoptik</team_name>
+    </team>
+    <team>
+      <team_name>Zemun</team_name>
+    </team>
+    <team>
+      <team_name>Ž. Beograd</team_name>
+    </team>
+  </teams>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/serbia/league_serbia3c.xml b/support_files/definitions/europe/serbia/league_serbia3c.xml
new file mode 100755
index 00000000..12b2938d
--- /dev/null
+++ b/support_files/definitions/europe/serbia/league_serbia3c.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+  <sid>serbia3c</sid>
+  <name>Srpska Liga Vojvodina</name>
+  <short_name>S. L. V.</short_name>
+  <symbol>flag_serbia.png</symbol>
+  <first_week>7</first_week>
+  <week_gap>1</week_gap>
+  <break_in length="8">25</break_in>
+  <average_talent>6100</average_talent>
+  <names_file>serbia</names_file>
+  <yellow_red>5</yellow_red>
+  <layer>3</layer>
+
+  <prom_rel>
+    <prom_rel_element>
+      <rank_start>1</rank_start>
+      <rank_end>1</rank_end>
+      <dest_sid>serbia2</dest_sid>
+      <prom_rel_type>promotion</prom_rel_type>
+    </prom_rel_element>
+  </prom_rel>
+
+  <teams>
+    <team>
+      <team_name>Bačka</team_name>
+    </team>
+    <team>
+      <team_name>B. B. Bačinci</team_name>
+    </team>
+    <team>
+      <team_name>Kikinda</team_name>
+    </team>
+    <team>
+      <team_name>M. Futog</team_name>
+    </team>
+    <team>
+      <team_name>M. B. Jarak</team_name>
+    </team>
+    <team>
+      <team_name>Palić</team_name>
+    </team>
+    <team>
+      <team_name>P. Novi Sad</team_name>
+    </team>
+    <team>
+      <team_name>R. Nova Pazova</team_name>
+    </team>
+    <team>
+      <team_name>R. Sombor</team_name>
+    </team>
+    <team>
+      <team_name>R. Šid</team_name>
+    </team>
+    <team>
+      <team_name>Senta</team_name>
+    </team>
+    <team>
+      <team_name>S. Temerin</team_name>
+    </team>
+    <team>
+      <team_name>S. Ruma</team_name>
+    </team>
+    <team>
+      <team_name>S. Debeljača</team_name>
+    </team>
+    <team>
+      <team_name>T. Ites</team_name>
+    </team>
+    <team>
+      <team_name>Vršac</team_name>
+    </team>
+  </teams>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/serbia/league_serbia3d.xml b/support_files/definitions/europe/serbia/league_serbia3d.xml
new file mode 100755
index 00000000..aaa255dc
--- /dev/null
+++ b/support_files/definitions/europe/serbia/league_serbia3d.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+  <sid>serbia3d</sid>
+  <name>Srpska Liga Zapad</name>
+  <short_name>S. L. Z.</short_name>
+  <symbol>flag_serbia.png</symbol>
+  <first_week>7</first_week>
+  <week_gap>1</week_gap>
+  <break_in length="8">25</break_in>
+  <average_talent>6100</average_talent>
+  <names_file>serbia</names_file>
+  <yellow_red>5</yellow_red>
+  <layer>3</layer>
+
+  <prom_rel>
+    <prom_rel_element>
+      <rank_start>1</rank_start>
+      <rank_end>1</rank_end>
+      <dest_sid>serbia2</dest_sid>
+      <prom_rel_type>promotion</prom_rel_type>
+    </prom_rel_element>
+  </prom_rel>
+
+  <teams>
+    <team>
+      <team_name>B. Valjevo</team_name>
+    </team>
+    <team>
+      <team_name>F. Valjevo</team_name>
+    </team>
+    <team>
+      <team_name>J. Ub</team_name>
+    </team>
+    <team>
+      <team_name>Loznica</team_name>
+    </team>
+    <team>
+      <team_name>M. Šabac</team_name>
+    </team>
+    <team>
+      <team_name>M. Kraljevo</team_name>
+    </team>
+    <team>
+      <team_name>Pozarevac</team_name>
+    </team>
+    <team>
+      <team_name>Priboj</team_name>
+    </team>
+    <team>
+      <team_name>R. Klupci</team_name>
+    </team>
+    <team>
+      <team_name>R. Kragujevac</team_name>
+    </team>
+    <team>
+      <team_name>S. Čačak</team_name>
+    </team>
+    <team>
+      <team_name>S. Užice</team_name>
+    </team>
+    <team>
+      <team_name>S. Kraljevo</team_name>
+    </team>
+    <team>
+      <team_name>S. Požega</team_name>
+    </team>
+    <team>
+      <team_name>S. Petrovac na Mlavi</team_name>
+    </team>
+    <team>
+      <team_name>Ž. Lajkovac</team_name>
+    </team>
+  </teams>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/slovakia/cup_slovakia_cup.xml b/support_files/definitions/europe/slovakia/cup_slovakia_cup.xml
index d9ec0210..b983db2d 100644
--- a/support_files/definitions/europe/slovakia/cup_slovakia_cup.xml
+++ b/support_files/definitions/europe/slovakia/cup_slovakia_cup.xml
@@ -4,8 +4,8 @@
   <short_name>Slov. Pohár</short_name>
   <symbol>flag_slovakia.png</symbol>
   <sid>slovakia_cup</sid>
-  <last_week>34</last_week>
-  <week_gap>4</week_gap>
+  <last_week>44</last_week>
+  <week_gap>3</week_gap>
   <property>national</property>
 
   <cup_rounds>
@@ -38,7 +38,7 @@
         </choose_team>
       </choose_teams>
       <byes>1</byes>
-     <delay>-13</delay>
+     <delay>-17</delay>
     </cup_round>
 
     <cup_round>
@@ -50,16 +50,16 @@
         </choose_team>
       </choose_teams>
       <byes>1</byes>
-     <delay>-5</delay>
+     <delay>-15</delay>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
-     <delay>-3</delay>
+     <delay>-16</delay>
     </cup_round>
 
     <cup_round>
-     <delay>-5</delay>
+     <delay>-14</delay>
     </cup_round>
 
     <cup_round>
diff --git a/support_files/definitions/europe/slovakia/league_slovakia1.xml b/support_files/definitions/europe/slovakia/league_slovakia1.xml
index 77f62313..56c9cd48 100755
--- a/support_files/definitions/europe/slovakia/league_slovakia1.xml
+++ b/support_files/definitions/europe/slovakia/league_slovakia1.xml
@@ -4,12 +4,17 @@
   <name>Corgoň Liga</name>
   <short_name>C. Liga</short_name>
   <symbol>flag_slovakia.png</symbol>
-  <first_week>1</first_week>
+  <first_week>3</first_week>
   <week_gap>1</week_gap>
+  <break_in length="1">10</break_in>
+  <break_in length="1">15</break_in>
+  <break_in length="12">23</break_in>
   <average_talent>7000</average_talent>
   <names_file>czech</names_file>
   <round_robins>3</round_robins>
   <yellow_red>5</yellow_red>
+  <two_match_week_start>29</two_match_week_start>
+  <two_match_week_end>30</two_match_week_end>
 
   <prom_rel>
     <prom_rel_element>
@@ -58,4 +63,4 @@
       <team_name>Žilina</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/slovakia/league_slovakia2.xml b/support_files/definitions/europe/slovakia/league_slovakia2.xml
index 0e64140d..9dbb4c72 100755
--- a/support_files/definitions/europe/slovakia/league_slovakia2.xml
+++ b/support_files/definitions/europe/slovakia/league_slovakia2.xml
@@ -4,8 +4,9 @@
   <name>Slovak First League</name>
   <short_name>1. L.</short_name>
   <symbol>flag_slovakia.png</symbol>
-  <first_week>1</first_week>
+  <first_week>3</first_week>
   <week_gap>1</week_gap>
+  <break_in length="12">23</break_in>
   <average_talent>6300</average_talent>
   <names_file>czech</names_file>
   <round_robins>3</round_robins>
diff --git a/support_files/definitions/europe/slovakia/league_slovakia3a.xml b/support_files/definitions/europe/slovakia/league_slovakia3a.xml
index 233d0066..86cc1667 100644
--- a/support_files/definitions/europe/slovakia/league_slovakia3a.xml
+++ b/support_files/definitions/europe/slovakia/league_slovakia3a.xml
@@ -4,8 +4,9 @@
   <name>Slovak Second League West</name>
   <short_name>2. L. W</short_name>
   <symbol>flag_slovakia.png</symbol>
-  <first_week>1</first_week>
+  <first_week>3</first_week>
   <week_gap>1</week_gap>
+  <break_in length="12">23</break_in>
   <average_talent>5800</average_talent>
   <names_file>czech</names_file>
   <yellow_red>5</yellow_red>
diff --git a/support_files/definitions/europe/slovakia/league_slovakia3b.xml b/support_files/definitions/europe/slovakia/league_slovakia3b.xml
index 5ead4ac1..6e4b5cd7 100644
--- a/support_files/definitions/europe/slovakia/league_slovakia3b.xml
+++ b/support_files/definitions/europe/slovakia/league_slovakia3b.xml
@@ -4,8 +4,9 @@
   <name>Slovak Second League East</name>
   <short_name>2. L. E</short_name>
   <symbol>flag_slovakia.png</symbol>
-  <first_week>1</first_week>
+  <first_week>3</first_week>
   <week_gap>1</week_gap>
+  <break_in length="12">23</break_in>
   <average_talent>5800</average_talent>
   <names_file>czech</names_file>
   <yellow_red>5</yellow_red>
diff --git a/support_files/definitions/europe/slovenia/cup_slovenia_cup.xml b/support_files/definitions/europe/slovenia/cup_slovenia_cup.xml
index b33d8081..fb02965f 100644
--- a/support_files/definitions/europe/slovenia/cup_slovenia_cup.xml
+++ b/support_files/definitions/europe/slovenia/cup_slovenia_cup.xml
@@ -4,8 +4,8 @@
   <short_name>Pokal H.</short_name>
   <symbol>flag_slovenia.png</symbol>
   <sid>slovenia_cup</sid>
-  <last_week>38</last_week>
-  <week_gap>4</week_gap>
+  <last_week>48</last_week>
+  <week_gap>3</week_gap>
   <property>national</property>
 
   <cup_rounds>
@@ -38,13 +38,13 @@
         </choose_team>
       </choose_teams>
       <byes>1</byes>
-      <delay>-54</delay>
+      <delay>-22</delay>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
       <byes>1</byes>
-      <delay>-26</delay>
+      <delay>-23</delay>
     </cup_round>
 
     <cup_round>
@@ -56,15 +56,16 @@
         </choose_team>
       </choose_teams>
       <byes>0</byes>
-      <delay>-14</delay>
+      <delay>-24</delay>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
-      <delay>-14</delay>
+      <delay>-22</delay>
     </cup_round>
 
     <cup_round>
+      <delay>-1</delay>
     </cup_round>
 
     <cup_round>
diff --git a/support_files/definitions/europe/slovenia/league_slovenia1.xml b/support_files/definitions/europe/slovenia/league_slovenia1.xml
index 7c690f75..5d13bbc2 100755
--- a/support_files/definitions/europe/slovenia/league_slovenia1.xml
+++ b/support_files/definitions/europe/slovenia/league_slovenia1.xml
@@ -4,12 +4,20 @@
   <name>Prva Liga</name>
   <short_name>1. SNL</short_name>
   <symbol>flag_slovenia.png</symbol>
-  <first_week>1</first_week>
+  <first_week>4</first_week>
   <week_gap>1</week_gap>
+  <break_in length="1">10</break_in>
+  <break_in length="10">24</break_in>
   <average_talent>7000</average_talent>
   <round_robins>4</round_robins>
-  <names_file>scg</names_file>
+  <names_file>serbia</names_file>
   <yellow_red>5</yellow_red>
+  <two_match_week_start>26</two_match_week_start>
+  <two_match_week_end>27</two_match_week_end>
+  <two_match_week_start>32</two_match_week_start>
+  <two_match_week_end>33</two_match_week_end>
+  <two_match_week_start>35</two_match_week_start>
+  <two_match_week_end>36</two_match_week_end>
 
   <prom_rel>
     <prom_rel_element>
@@ -52,4 +60,4 @@
       <team_name>R. Velenje</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/slovenia/league_slovenia2.xml b/support_files/definitions/europe/slovenia/league_slovenia2.xml
index 8b04c16e..072b5d69 100644
--- a/support_files/definitions/europe/slovenia/league_slovenia2.xml
+++ b/support_files/definitions/europe/slovenia/league_slovenia2.xml
@@ -4,12 +4,17 @@
   <name>Druga Liga</name>
   <short_name>2. SNL</short_name>
   <symbol>flag_slovenia.png</symbol>
-  <first_week>1</first_week>
+  <first_week>4</first_week>
   <week_gap>1</week_gap>
+  <break_in length="10">24</break_in>
   <average_talent>6400</average_talent>
   <round_robins>4</round_robins>
-  <names_file>scg</names_file>
+  <names_file>serbia</names_file>
   <yellow_red>5</yellow_red>
+  <two_match_week_start>28</two_match_week_start>
+  <two_match_week_end>29</two_match_week_end>
+  <two_match_week_start>33</two_match_week_start>
+  <two_match_week_end>34</two_match_week_end>
 
   <prom_rel>
     <prom_rel_element>
@@ -65,4 +70,4 @@
       <team_name>Zagorje</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/slovenia/league_slovenia3a.xml b/support_files/definitions/europe/slovenia/league_slovenia3a.xml
index d68995d9..5af8b531 100644
--- a/support_files/definitions/europe/slovenia/league_slovenia3a.xml
+++ b/support_files/definitions/europe/slovenia/league_slovenia3a.xml
@@ -4,11 +4,11 @@
   <name>Treća Liga Istok</name>
   <short_name>3. SNL I</short_name>
   <symbol>flag_slovenia.png</symbol>
-  <first_week>1</first_week>
+  <first_week>4</first_week>
   <week_gap>1</week_gap>
-  <break>10</break>
+  <break_in length="11">23</break_in>
   <average_talent>5800</average_talent>
-  <names_file>scg</names_file>
+  <names_file>serbia</names_file>
   <yellow_red>5</yellow_red>
   <layer>3</layer>
 
@@ -65,4 +65,4 @@
       <team_name>S. Verzej</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/slovenia/league_slovenia3b.xml b/support_files/definitions/europe/slovenia/league_slovenia3b.xml
index 4d8de855..be0c4cf9 100644
--- a/support_files/definitions/europe/slovenia/league_slovenia3b.xml
+++ b/support_files/definitions/europe/slovenia/league_slovenia3b.xml
@@ -4,11 +4,11 @@
   <name>Treća Liga Zapad</name>
   <short_name>3. SNL Z</short_name>
   <symbol>flag_slovenia.png</symbol>
-  <first_week>1</first_week>
+  <first_week>4</first_week>
   <week_gap>1</week_gap>
-  <break>10</break>
+  <break_in length="11">23</break_in>
   <average_talent>5800</average_talent>
-  <names_file>scg</names_file>
+  <names_file>serbia</names_file>
   <yellow_red>5</yellow_red>
   <layer>3</layer>
 
@@ -65,4 +65,4 @@
       <team_name>T. Sežana</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/spain/cup_spain_cdr.xml b/support_files/definitions/europe/spain/cup_spain_cdr.xml
index 3258dc2c..90d23c77 100644
--- a/support_files/definitions/europe/spain/cup_spain_cdr.xml
+++ b/support_files/definitions/europe/spain/cup_spain_cdr.xml
@@ -4,8 +4,8 @@
   <short_name>Copa del Rey</short_name>
   <symbol>flag_spain.png</symbol>
   <sid>spain_cdr</sid>
-  <last_week>38</last_week>
-  <week_gap>3</week_gap>
+  <last_week>45</last_week>
+  <week_gap>2</week_gap>
   <property>national</property>
 
   <cup_rounds>
@@ -46,6 +46,7 @@
         </choose_team>
       </choose_teams>
       <byes>4</byes>
+    <delay>-14</delay>
     </cup_round>
 
     <cup_round>
@@ -61,11 +62,13 @@
         </choose_team>
       </choose_teams>
       <byes>3</byes>
+    <delay>-14</delay>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
       <byes>1</byes>
+    <delay>-12</delay>
     </cup_round>
 
     <cup_round>
@@ -74,18 +77,19 @@
           <choose_team_sid>spain1</choose_team_sid>
         </choose_team>
       </choose_teams>
+    <delay>-11</delay>
     </cup_round>
 
     <cup_round>
-    <delay>1</delay>
+    <delay>-6</delay>
     </cup_round>
 
     <cup_round>
-    <delay>1</delay>
+    <delay>-7</delay>
     </cup_round>
 
     <cup_round>
-    <delay>-1</delay>
+    <delay>-7</delay>
     </cup_round>
 
     <cup_round>
diff --git a/support_files/definitions/europe/spain/league_spain1.xml b/support_files/definitions/europe/spain/league_spain1.xml
index c8319108..32b65cfb 100644
--- a/support_files/definitions/europe/spain/league_spain1.xml
+++ b/support_files/definitions/europe/spain/league_spain1.xml
@@ -4,13 +4,16 @@
   <name>Primera División</name>
   <short_name>La Liga</short_name>
   <symbol>flag_spain.png</symbol>
-  <first_week>1</first_week>
+  <first_week>9</first_week>
   <week_gap>1</week_gap>
-  <break>2</break>
+  <break_in length="1">10</break_in>
+  <break_in length="1">15</break_in>
+  <break_in length="1">26</break_in>
   <average_talent>8500</average_talent>
   <names_file>spain</names_file>
   <yellow_red>5</yellow_red>
-  <layer>1</layer>
+  <two_match_week_start>4</two_match_week_start>
+  <two_match_week_end>5</two_match_week_end>
 
   <prom_rel>
     <prom_rel_element>
@@ -83,4 +86,4 @@
       <team_name>Valladolid</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/spain/league_spain2.xml b/support_files/definitions/europe/spain/league_spain2.xml
index 19871989..9f74ce5d 100644
--- a/support_files/definitions/europe/spain/league_spain2.xml
+++ b/support_files/definitions/europe/spain/league_spain2.xml
@@ -4,9 +4,9 @@
   <name>Segunda División</name>
   <short_name>Segunda</short_name>
   <symbol>flag_spain.png</symbol>
-  <first_week>1</first_week>
+  <first_week>9</first_week>
   <week_gap>1</week_gap>
-  <break>2</break>
+  <break_in length="1">26</break_in>
   <average_talent>7600</average_talent>
   <names_file>spain</names_file>
   <yellow_red>5</yellow_red>
@@ -96,4 +96,4 @@
       <team_name>Xerez</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/spain/league_spain3a.xml b/support_files/definitions/europe/spain/league_spain3a.xml
index b5897972..b38f57ed 100644
--- a/support_files/definitions/europe/spain/league_spain3a.xml
+++ b/support_files/definitions/europe/spain/league_spain3a.xml
@@ -4,9 +4,9 @@
   <name>Segunda División B G1</name>
   <short_name>2ª Div. B G1</short_name>
   <symbol>flag_spain.png</symbol>
-  <first_week>1</first_week>
+  <first_week>9</first_week>
   <week_gap>1</week_gap>
-  <break>2</break>
+  <break_in length="1">26</break_in>
   <average_talent>6800</average_talent>
   <names_file>spain</names_file>
   <yellow_red>5</yellow_red>
@@ -81,4 +81,4 @@
       <team_name>Zamora</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/spain/league_spain3b.xml b/support_files/definitions/europe/spain/league_spain3b.xml
index 886e8f76..179c2dfb 100644
--- a/support_files/definitions/europe/spain/league_spain3b.xml
+++ b/support_files/definitions/europe/spain/league_spain3b.xml
@@ -4,9 +4,9 @@
   <name>Segunda División B G2</name>
   <short_name>2ª Div. B G2</short_name>
   <symbol>flag_spain.png</symbol>
-  <first_week>1</first_week>
+  <first_week>9</first_week>
   <week_gap>1</week_gap>
-  <break>2</break>
+  <break_in length="1">26</break_in>
   <average_talent>6800</average_talent>
   <names_file>spain</names_file>
   <yellow_red>5</yellow_red>
@@ -81,4 +81,4 @@
       <team_name>V.S. Brígida</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/spain/league_spain3c.xml b/support_files/definitions/europe/spain/league_spain3c.xml
index 7462e031..13dce045 100644
--- a/support_files/definitions/europe/spain/league_spain3c.xml
+++ b/support_files/definitions/europe/spain/league_spain3c.xml
@@ -4,9 +4,9 @@
   <name>Segunda División B G3</name>
   <short_name>2ª Div. B G3</short_name>
   <symbol>flag_spain.png</symbol>
-  <first_week>1</first_week>
+  <first_week>9</first_week>
   <week_gap>1</week_gap>
-  <break>2</break>
+  <break_in length="1">26</break_in>
   <average_talent>6800</average_talent>
   <names_file>spain</names_file>
   <yellow_red>5</yellow_red>
@@ -81,4 +81,4 @@
       <team_name>Villarreal B</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/spain/league_spain3d.xml b/support_files/definitions/europe/spain/league_spain3d.xml
index 86d8b1d9..09e49d67 100644
--- a/support_files/definitions/europe/spain/league_spain3d.xml
+++ b/support_files/definitions/europe/spain/league_spain3d.xml
@@ -4,9 +4,9 @@
   <name>Segunda División B G4</name>
   <short_name>2ª Div. B G4</short_name>
   <symbol>flag_spain.png</symbol>
-  <first_week>1</first_week>
+  <first_week>9</first_week>
   <week_gap>1</week_gap>
-  <break>2</break>
+  <break_in length="1">26</break_in>
   <average_talent>6800</average_talent>
   <names_file>spain</names_file>
   <yellow_red>5</yellow_red>
@@ -81,4 +81,4 @@
       <team_name>B. Sevilla B</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/sweden/cup_sweden_cupen.xml b/support_files/definitions/europe/sweden/cup_sweden_cupen.xml
index 34365985..aaaba4f7 100644
--- a/support_files/definitions/europe/sweden/cup_sweden_cupen.xml
+++ b/support_files/definitions/europe/sweden/cup_sweden_cupen.xml
@@ -154,7 +154,7 @@
 	</choose_team>
       </choose_teams>
       <byes>0</byes>
-      <delay>-29</delay>
+      <delay>-4</delay>
     </cup_round>
 
     <cup_round>
@@ -174,25 +174,25 @@
 	</choose_team>
        </choose_teams>
        <byes>0</byes>
-      <delay>-14</delay>
-    </cup_round>
-
-    <cup_round>
-      <home_away>0</home_away>
-       <byes>0</byes>
-      <delay>-9</delay>
-    </cup_round>
-
-    <cup_round>
-      <home_away>0</home_away>
       <delay>-3</delay>
     </cup_round>
 
+    <cup_round>
+      <home_away>0</home_away>
+       <byes>0</byes>
+      <delay>-4</delay>
+    </cup_round>
+
     <cup_round>
       <home_away>0</home_away>
       <delay>-2</delay>
     </cup_round>
 
+    <cup_round>
+      <home_away>0</home_away>
+      <delay>-3</delay>
+    </cup_round>
+
     <cup_round>
       <home_away>0</home_away>
       <delay>-1</delay>
diff --git a/support_files/definitions/europe/switzerland/cup_switzerland_cup.xml b/support_files/definitions/europe/switzerland/cup_switzerland_cup.xml
index 37b398ad..ef211334 100644
--- a/support_files/definitions/europe/switzerland/cup_switzerland_cup.xml
+++ b/support_files/definitions/europe/switzerland/cup_switzerland_cup.xml
@@ -4,7 +4,7 @@
   <short_name>S. Cup </short_name>
   <symbol>flag_switzerland.png</symbol>
   <sid>switzerland_cup</sid>
-  <last_week>38</last_week>
+  <last_week>48</last_week>
   <week_gap>4</week_gap>
   <property>national</property>
 
@@ -50,26 +50,27 @@
         </choose_team>
       </choose_teams>
       <byes>0</byes>
-      <delay>-26</delay>
+      <delay>-16</delay>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
-      <delay>-13</delay>
+      <delay>-16</delay>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
-      <delay>-11</delay>
+      <delay>-15</delay>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
-      <delay>-2</delay>
+      <delay>-4</delay>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
+      <delay>-1</delay>
     </cup_round>
 
     <cup_round>
diff --git a/support_files/definitions/europe/switzerland/league_switzerland1.xml b/support_files/definitions/europe/switzerland/league_switzerland1.xml
index fcff2ea7..30d7b385 100755
--- a/support_files/definitions/europe/switzerland/league_switzerland1.xml
+++ b/support_files/definitions/europe/switzerland/league_switzerland1.xml
@@ -4,12 +4,20 @@
   <name>Superliga</name>
   <short_name>SL</short_name>
   <symbol>flag_switzerland.png</symbol>
-  <first_week>1</first_week>
+  <first_week>3</first_week>
   <week_gap>1</week_gap>
+  <break_in length="1">10</break_in>
+  <break_in length="1">12</break_in>
+  <break_in length="1">15</break_in>
+  <break_in length="9">25</break_in>
   <average_talent>7300</average_talent>
   <round_robins>4</round_robins>
   <names_file>germany</names_file>
   <yellow_red>5</yellow_red>
+  <two_match_week_start>2</two_match_week_start>
+  <two_match_week_end>3</two_match_week_end>
+  <two_match_week_start>28</two_match_week_start>
+  <two_match_week_end>29</two_match_week_end>
 
   <prom_rel>
     <prom_rel_element>
diff --git a/support_files/definitions/europe/switzerland/league_switzerland2.xml b/support_files/definitions/europe/switzerland/league_switzerland2.xml
index 4dff885a..55fb7092 100755
--- a/support_files/definitions/europe/switzerland/league_switzerland2.xml
+++ b/support_files/definitions/europe/switzerland/league_switzerland2.xml
@@ -4,8 +4,10 @@
   <name>Challenge League</name>
   <short_name>Chal. L.</short_name>
   <symbol>flag_switzerland.png</symbol>
-  <first_week>1</first_week>
+  <first_week>3</first_week>
   <week_gap>1</week_gap>
+  <break_in length="1">12</break_in>
+  <break_in length="10">25</break_in>
   <average_talent>6500</average_talent>
   <names_file>germany</names_file>
   <yellow_red>5</yellow_red>
diff --git a/support_files/definitions/europe/switzerland/league_switzerland3a.xml b/support_files/definitions/europe/switzerland/league_switzerland3a.xml
index 31fe4674..fb3a4ca8 100644
--- a/support_files/definitions/europe/switzerland/league_switzerland3a.xml
+++ b/support_files/definitions/europe/switzerland/league_switzerland3a.xml
@@ -4,8 +4,10 @@
   <name>1. Liga Gruppe 1</name>
   <short_name>1. L. G1</short_name>
   <symbol>flag_switzerland.png</symbol>
-  <first_week>1</first_week>
+  <first_week>3</first_week>
   <week_gap>1</week_gap>
+  <break_in length="1">12</break_in>
+  <break_in length="10">25</break_in>
   <average_talent>6000</average_talent>
   <names_file>germany</names_file>
   <yellow_red>5</yellow_red>
diff --git a/support_files/definitions/europe/switzerland/league_switzerland3b.xml b/support_files/definitions/europe/switzerland/league_switzerland3b.xml
index aedff74d..061293d5 100644
--- a/support_files/definitions/europe/switzerland/league_switzerland3b.xml
+++ b/support_files/definitions/europe/switzerland/league_switzerland3b.xml
@@ -4,8 +4,10 @@
   <name>1. Liga Gruppe 2</name>
   <short_name>1. L. G2</short_name>
   <symbol>flag_switzerland.png</symbol>
-  <first_week>1</first_week>
+  <first_week>3</first_week>
   <week_gap>1</week_gap>
+  <break_in length="1">12</break_in>
+  <break_in length="10">25</break_in>
   <average_talent>6000</average_talent>
   <names_file>germany</names_file>
   <yellow_red>5</yellow_red>
diff --git a/support_files/definitions/europe/switzerland/league_switzerland3c.xml b/support_files/definitions/europe/switzerland/league_switzerland3c.xml
index e46c864c..db4dc824 100644
--- a/support_files/definitions/europe/switzerland/league_switzerland3c.xml
+++ b/support_files/definitions/europe/switzerland/league_switzerland3c.xml
@@ -4,8 +4,10 @@
   <name>1. Liga Gruppe 3</name>
   <short_name>1. L. G3</short_name>
   <symbol>flag_switzerland.png</symbol>
-  <first_week>1</first_week>
+  <first_week>3</first_week>
   <week_gap>1</week_gap>
+  <break_in length="1">12</break_in>
+  <break_in length="10">25</break_in>
   <average_talent>6000</average_talent>
   <names_file>germany</names_file>
   <yellow_red>5</yellow_red>
diff --git a/support_files/definitions/europe/turkey/cup_turkey_kupasi.xml b/support_files/definitions/europe/turkey/cup_turkey_kupasi.xml
index aef1180b..7bbb1de7 100644
--- a/support_files/definitions/europe/turkey/cup_turkey_kupasi.xml
+++ b/support_files/definitions/europe/turkey/cup_turkey_kupasi.xml
@@ -4,7 +4,7 @@
   <short_name>Kupa</short_name>
   <symbol>flag_turkey.png</symbol>
   <sid>turkey_kupasi</sid>
-  <last_week>41</last_week>
+  <last_week>45</last_week>
   <week_gap>2</week_gap>
   <property>national</property>
 
@@ -58,7 +58,7 @@
 	</choose_team>
       </choose_teams>
       <byes>0</byes>
-      <delay>-28</delay>
+      <delay>-13</delay>
     </cup_round>
 
     <cup_round>
@@ -74,7 +74,7 @@
 	</choose_team>
       </choose_teams>
       <byes>0</byes>
-      <delay>-14</delay>
+      <delay>-12</delay>
     </cup_round>
 
     <cup_round>
@@ -92,11 +92,11 @@
 	  <randomly>1</randomly>
 	</choose_team>
       </choose_teams>
-      <delay>-10</delay>
+      <delay>-8</delay>
     </cup_round>
 
     <cup_round>
-     <delay>-2</delay>
+     <delay>-1</delay>
     </cup_round>
 
     <cup_round>
diff --git a/support_files/definitions/europe/turkey/league_turkey1.xml b/support_files/definitions/europe/turkey/league_turkey1.xml
index 7532b449..94747d02 100644
--- a/support_files/definitions/europe/turkey/league_turkey1.xml
+++ b/support_files/definitions/europe/turkey/league_turkey1.xml
@@ -3,9 +3,12 @@
   <sid>turkey1</sid>
   <name>Super Lig</name>
   <symbol>flag_turkey.png</symbol>
-  <first_week>1</first_week>
+  <first_week>8</first_week>
   <week_gap>1</week_gap>
-  <break>5</break>
+  <break_in length="1">10</break_in>
+  <break_in length="1">15</break_in>
+  <break_in length="4">26</break_in>
+  <break_in length="1">39</break_in>
   <average_talent>7700</average_talent>
   <names_file>turkey</names_file>
   <yellow_red>5</yellow_red>
@@ -75,4 +78,4 @@
       <team_name>H. Ankara</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/turkey/league_turkey2.xml b/support_files/definitions/europe/turkey/league_turkey2.xml
index 551c8dd2..94f065a7 100644
--- a/support_files/definitions/europe/turkey/league_turkey2.xml
+++ b/support_files/definitions/europe/turkey/league_turkey2.xml
@@ -4,9 +4,10 @@
   <name>TFF First League</name>
   <short_name>1. Lig.</short_name>
   <symbol>flag_turkey.png</symbol>
-  <first_week>1</first_week>
+  <first_week>8</first_week>
   <week_gap>1</week_gap>
-  <break>5</break>
+  <break_in length="4">26</break_in>
+  <break_in length="1">39</break_in>
   <average_talent>6900</average_talent>
   <names_file>turkey</names_file>
   <yellow_red>5</yellow_red>
@@ -82,4 +83,4 @@
       <team_name>Samsun</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/turkey/league_turkey3a.xml b/support_files/definitions/europe/turkey/league_turkey3a.xml
index 7df149cd..209cd6c3 100644
--- a/support_files/definitions/europe/turkey/league_turkey3a.xml
+++ b/support_files/definitions/europe/turkey/league_turkey3a.xml
@@ -4,7 +4,7 @@
   <name>TFF Second League Group 1</name>
   <short_name>2. Lig. G1</short_name>
   <symbol>flag_turkey.png</symbol>
-  <first_week>1</first_week>
+  <first_week>8</first_week>
   <week_gap>1</week_gap>
   <average_talent>6200</average_talent>
   <names_file>turkey</names_file>
diff --git a/support_files/definitions/europe/turkey/league_turkey3b.xml b/support_files/definitions/europe/turkey/league_turkey3b.xml
index e30e7b16..74db5008 100644
--- a/support_files/definitions/europe/turkey/league_turkey3b.xml
+++ b/support_files/definitions/europe/turkey/league_turkey3b.xml
@@ -4,7 +4,7 @@
   <name>TFF Second League Group 2</name>
   <short_name>2. Lig. G2</short_name>
   <symbol>flag_turkey.png</symbol>
-  <first_week>1</first_week>
+  <first_week>8</first_week>
   <week_gap>1</week_gap>
   <average_talent>6200</average_talent>
   <names_file>turkey</names_file>
diff --git a/support_files/definitions/europe/turkey/league_turkey3c.xml b/support_files/definitions/europe/turkey/league_turkey3c.xml
index 2e64a3c4..75e86e51 100644
--- a/support_files/definitions/europe/turkey/league_turkey3c.xml
+++ b/support_files/definitions/europe/turkey/league_turkey3c.xml
@@ -4,7 +4,7 @@
   <name>TFF Second League Group 3</name>
   <short_name>2. Lig. G3</short_name>
   <symbol>flag_turkey.png</symbol>
-  <first_week>1</first_week>
+  <first_week>8</first_week>
   <week_gap>1</week_gap>
   <average_talent>6200</average_talent>
   <names_file>turkey</names_file>
diff --git a/support_files/definitions/europe/turkey/league_turkey3d.xml b/support_files/definitions/europe/turkey/league_turkey3d.xml
index 0539a561..b81a558f 100644
--- a/support_files/definitions/europe/turkey/league_turkey3d.xml
+++ b/support_files/definitions/europe/turkey/league_turkey3d.xml
@@ -4,7 +4,7 @@
   <name>TFF Second League Group 4</name>
   <short_name>2. Lig. G4</short_name>
   <symbol>flag_turkey.png</symbol>
-  <first_week>1</first_week>
+  <first_week>8</first_week>
   <week_gap>1</week_gap>
   <average_talent>6200</average_talent>
   <names_file>turkey</names_file>
diff --git a/support_files/definitions/europe/turkey/league_turkey3e.xml b/support_files/definitions/europe/turkey/league_turkey3e.xml
index f340527e..fefae800 100644
--- a/support_files/definitions/europe/turkey/league_turkey3e.xml
+++ b/support_files/definitions/europe/turkey/league_turkey3e.xml
@@ -4,7 +4,7 @@
   <name>TFF Second League Group 5</name>
   <short_name>2. Lig. G5</short_name>
   <symbol>flag_turkey.png</symbol>
-  <first_week>1</first_week>
+  <first_week>8</first_week>
   <week_gap>1</week_gap>
   <average_talent>6200</average_talent>
   <names_file>turkey</names_file>
diff --git a/support_files/definitions/europe/ukraine/cup_ukraine_cup.xml b/support_files/definitions/europe/ukraine/cup_ukraine_cup.xml
index 90e41974..027dc9cb 100644
--- a/support_files/definitions/europe/ukraine/cup_ukraine_cup.xml
+++ b/support_files/definitions/europe/ukraine/cup_ukraine_cup.xml
@@ -4,7 +4,7 @@
   <short_name>YK</short_name>
   <symbol>flag_ukraine.png</symbol>
   <sid>ukraine_cup</sid>
-  <last_week>46</last_week>
+  <last_week>44</last_week>
   <week_gap>4</week_gap>
   <property>national</property>
 
@@ -30,7 +30,7 @@
         </choose_team>
       </choose_teams>
       <byes>2</byes>
-      <delay>-155</delay>
+      <delay>-17</delay>
     </cup_round>
 
     <cup_round>
@@ -42,7 +42,7 @@
         </choose_team>
       </choose_teams>
       <byes>1</byes>
-      <delay>-79</delay>
+      <delay>-18</delay>
     </cup_round>
 
     <cup_round>
@@ -54,18 +54,18 @@
         </choose_team>
       </choose_teams>
       <byes>0</byes>
-      <delay>-40</delay>
+      <delay>-17</delay>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
-      <delay>-19</delay>
+      <delay>-14</delay>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
       <replay>1</replay>
-      <delay>-19</delay>
+      <delay>-16</delay>
     </cup_round>
 
     <cup_round>
diff --git a/support_files/definitions/europe/ukraine/league_ukraine1.xml b/support_files/definitions/europe/ukraine/league_ukraine1.xml
index ac1e4ce5..6ddc0fa4 100644
--- a/support_files/definitions/europe/ukraine/league_ukraine1.xml
+++ b/support_files/definitions/europe/ukraine/league_ukraine1.xml
@@ -4,9 +4,12 @@
   <name>Premier League</name>
   <short_name>Pr. L.</short_name>
   <symbol>flag_ukraine.png</symbol>
-  <first_week>1</first_week>
+  <first_week>3</first_week>
   <week_gap>1</week_gap>
-  <break>14</break>
+  <break_in length="2">10</break_in>
+  <break_in length="1">15</break_in>
+  <break_in length="12">23</break_in>
+  <break_in length="1">39</break_in>
   <average_talent>7500</average_talent>
   <names_file>ukraine</names_file>
   <yellow_red>5</yellow_red>
diff --git a/support_files/definitions/europe/ukraine/league_ukraine2.xml b/support_files/definitions/europe/ukraine/league_ukraine2.xml
index 36f28a43..2d0dc10f 100644
--- a/support_files/definitions/europe/ukraine/league_ukraine2.xml
+++ b/support_files/definitions/europe/ukraine/league_ukraine2.xml
@@ -4,9 +4,9 @@
   <name>Persha Liha</name>
   <short_name>Persha L.</short_name>
   <symbol>flag_ukraine.png</symbol>
-  <first_week>1</first_week>
+  <first_week>3</first_week>
   <week_gap>1</week_gap>
-  <break>13</break>
+  <break_in length="12">23</break_in>
   <average_talent>6700</average_talent>
   <names_file>ukraine</names_file>
   <yellow_red>5</yellow_red>
@@ -80,4 +80,4 @@
       <team_name>Sevastopol</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/ukraine/league_ukraine3a.xml b/support_files/definitions/europe/ukraine/league_ukraine3a.xml
index 663d180c..7fd1310e 100644
--- a/support_files/definitions/europe/ukraine/league_ukraine3a.xml
+++ b/support_files/definitions/europe/ukraine/league_ukraine3a.xml
@@ -4,9 +4,9 @@
   <name>Druha Liha A</name>
   <short_name>DL A</short_name>
   <symbol>flag_ukraine.png</symbol>
-  <first_week>1</first_week>
+  <first_week>3</first_week>
   <week_gap>1</week_gap>
-  <break>13</break>
+  <break_in length="12">23</break_in>
   <average_talent>6000</average_talent>
   <names_file>ukraine</names_file>
   <yellow_red>5</yellow_red>
@@ -74,4 +74,4 @@
       <team_name>Y. Plysky</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/ukraine/league_ukraine3b.xml b/support_files/definitions/europe/ukraine/league_ukraine3b.xml
index 77a83e86..4626068c 100644
--- a/support_files/definitions/europe/ukraine/league_ukraine3b.xml
+++ b/support_files/definitions/europe/ukraine/league_ukraine3b.xml
@@ -4,9 +4,9 @@
   <name>Druha Liha B</name>
   <short_name>DL B</short_name>
   <symbol>flag_ukraine.png</symbol>
-  <first_week>1</first_week>
+  <first_week>3</first_week>
   <week_gap>1</week_gap>
-  <break>12</break>
+  <break_in length="12">23</break_in>
   <average_talent>6000</average_talent>
   <names_file>ukraine</names_file>
   <yellow_red>5</yellow_red>
@@ -77,4 +77,4 @@
       <team_name>Z. Kirovohrad</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/wales/cup_wales_welsh.xml b/support_files/definitions/europe/wales/cup_wales_welsh.xml
index 7d0d7808..c74bc593 100644
--- a/support_files/definitions/europe/wales/cup_wales_welsh.xml
+++ b/support_files/definitions/europe/wales/cup_wales_welsh.xml
@@ -4,7 +4,7 @@
   <short_name>Welsh Cup</short_name>
   <symbol>flag_wales.png</symbol>
   <sid>wales_welsh</sid>
-  <last_week>34</last_week>
+  <last_week>44</last_week>
   <week_gap>4</week_gap>
   <property>national</property>
 
@@ -26,18 +26,19 @@
         </choose_team>
       </choose_teams>
       <byes>11</byes>
-      <delay>-5</delay>
+      <delay>-9</delay>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
       <byes>0</byes>
-      <delay>-4</delay>
+      <delay>-9</delay>
     </cup_round>
 
     <cup_round>
       <home_away>0</home_away>
       <byes>0</byes>
+      <delay>-1</delay>
     </cup_round>
 
     <cup_round>
@@ -47,6 +48,7 @@
     <cup_round>
       <home_away>0</home_away>
       <neutral>1</neutral>
+      <delay>-1</delay>
     </cup_round>
 
     <cup_round>
diff --git a/support_files/definitions/europe/wales/league_wales1.xml b/support_files/definitions/europe/wales/league_wales1.xml
index 8d7675e8..443a604c 100644
--- a/support_files/definitions/europe/wales/league_wales1.xml
+++ b/support_files/definitions/europe/wales/league_wales1.xml
@@ -4,12 +4,14 @@
   <name>Welsh Premier League</name>
   <short_name>WPL</short_name>
   <symbol>flag_wales.png</symbol>
-  <first_week>1</first_week>
+  <first_week>7</first_week>
   <week_gap>1</week_gap>
+  <break_in length="1">10</break_in>
+  <break_in length="1">15</break_in>
+  <break_in length="1">39</break_in>
   <average_talent>6000</average_talent>
   <names_file>england</names_file>
   <yellow_red>5</yellow_red>
-  <layer>1</layer>
 
   <prom_rel>
     <prom_rel_element>
@@ -76,4 +78,4 @@
       <team_name>Welshpool</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/wales/league_wales2a.xml b/support_files/definitions/europe/wales/league_wales2a.xml
index 158f9927..4eb2244a 100644
--- a/support_files/definitions/europe/wales/league_wales2a.xml
+++ b/support_files/definitions/europe/wales/league_wales2a.xml
@@ -4,7 +4,7 @@
   <name>Welsh League Div. 1</name>
   <short_name>Welsh D1</short_name>
   <symbol>flag_wales.png</symbol>
-  <first_week>1</first_week>
+  <first_week>7</first_week>
   <week_gap>1</week_gap>
   <average_talent>5500</average_talent>
   <names_file>england</names_file>
@@ -76,4 +76,4 @@
       <team_name>Ton Pentre</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file
diff --git a/support_files/definitions/europe/wales/league_wales2b.xml b/support_files/definitions/europe/wales/league_wales2b.xml
index 52ca845f..f37720b1 100644
--- a/support_files/definitions/europe/wales/league_wales2b.xml
+++ b/support_files/definitions/europe/wales/league_wales2b.xml
@@ -4,7 +4,7 @@
   <name>Cymru Alliance</name>
   <short_name>C. All.</short_name>
   <symbol>flag_wales.png</symbol>
-  <first_week>1</first_week>
+  <first_week>7</first_week>
   <week_gap>1</week_gap>
   <average_talent>5500</average_talent>
   <names_file>england</names_file>
@@ -73,4 +73,4 @@
       <team_name>Ruthin</team_name>
     </team>
   </teams>
-</league>
+</league>
\ No newline at end of file