diff --git a/support_files/definitions/usa/cup_usa_concacaf.xml b/support_files/definitions/usa/cup_usa_concacaf.xml
index 9b2045dd..7e8e8b43 100644
--- a/support_files/definitions/usa/cup_usa_concacaf.xml
+++ b/support_files/definitions/usa/cup_usa_concacaf.xml
@@ -6,6 +6,7 @@
250
1
3
+ 0
12
2
international
@@ -14,7 +15,12 @@
8
-
+
LEAGUE1
1
@@ -27,13 +33,6 @@
1
1
-
-
costa_rica1_short
2
diff --git a/support_files/definitions/usa/cup_usa_first_cup.xml b/support_files/definitions/usa/cup_usa_first_cup.xml
index 6f66676f..15dfcee1 100644
--- a/support_files/definitions/usa/cup_usa_first_cup.xml
+++ b/support_files/definitions/usa/cup_usa_first_cup.xml
@@ -5,7 +5,7 @@
flag_usa.png
usa_first_cup
1000
- 38
+
1
national
highlight1
diff --git a/support_files/definitions/usa/cup_usa_mls_cup.xml b/support_files/definitions/usa/cup_usa_mls_cup.xml
index ae57c05b..e36e45c1 100644
--- a/support_files/definitions/usa/cup_usa_mls_cup.xml
+++ b/support_files/definitions/usa/cup_usa_mls_cup.xml
@@ -7,7 +7,7 @@
1000
- 35
+ 36
1
national
diff --git a/support_files/definitions/usa/cup_usa_open_cup.xml b/support_files/definitions/usa/cup_usa_open_cup.xml
index e6d14f5c..cc0d0e69 100644
--- a/support_files/definitions/usa/cup_usa_open_cup.xml
+++ b/support_files/definitions/usa/cup_usa_open_cup.xml
@@ -5,7 +5,7 @@
flag_usa.png
usa_open_cup
4
- 38
+ 34
national
weak_at_home
diff --git a/support_files/definitions/usa/cup_usa_pdl_cup.xml b/support_files/definitions/usa/cup_usa_pdl_cup.xml
index 97eb5bc2..7928cc79 100644
--- a/support_files/definitions/usa/cup_usa_pdl_cup.xml
+++ b/support_files/definitions/usa/cup_usa_pdl_cup.xml
@@ -5,7 +5,7 @@
flag_usa.png
usa_pdl_cup
1000
- 31
+
1
national
diff --git a/support_files/definitions/usa/cup_usa_pdl_eastern.xml b/support_files/definitions/usa/cup_usa_pdl_eastern.xml
index b92965b8..a32dbed0 100644
--- a/support_files/definitions/usa/cup_usa_pdl_eastern.xml
+++ b/support_files/definitions/usa/cup_usa_pdl_eastern.xml
@@ -5,7 +5,7 @@
flag_usa.png
usa_pdl_eastern
1000
- 29
+
1
national
highlight1
diff --git a/support_files/definitions/usa/cup_usa_pdl_southern.xml b/support_files/definitions/usa/cup_usa_pdl_southern.xml
index bff76770..1de5eaa8 100644
--- a/support_files/definitions/usa/cup_usa_pdl_southern.xml
+++ b/support_files/definitions/usa/cup_usa_pdl_southern.xml
@@ -5,7 +5,7 @@
flag_usa.png
usa_pdl_southern
1000
- 29
+
1
national
highlight1
diff --git a/support_files/definitions/usa/cup_usa_pdl_western.xml b/support_files/definitions/usa/cup_usa_pdl_western.xml
index 723df8e6..3e8f41f2 100644
--- a/support_files/definitions/usa/cup_usa_pdl_western.xml
+++ b/support_files/definitions/usa/cup_usa_pdl_western.xml
@@ -5,7 +5,7 @@
flag_usa.png
usa_pdl_western
1000
- 29
+
1
national
highlight1
diff --git a/support_files/definitions/usa/cup_usa_second_cup.xml b/support_files/definitions/usa/cup_usa_second_cup.xml
index 0f20980f..fc020e02 100644
--- a/support_files/definitions/usa/cup_usa_second_cup.xml
+++ b/support_files/definitions/usa/cup_usa_second_cup.xml
@@ -5,7 +5,7 @@
flag_usa.png
usa_second_cup
1000
- 27
+
1
national
highlight1
diff --git a/support_files/definitions/usa/cup_usa_superliga.xml b/support_files/definitions/usa/cup_usa_superliga.xml
index 450e8299..c405f149 100644
--- a/support_files/definitions/usa/cup_usa_superliga.xml
+++ b/support_files/definitions/usa/cup_usa_superliga.xml
@@ -6,6 +6,7 @@
100
2
3
+ 0
18
1
international
@@ -17,7 +18,6 @@
2
8
-
LEAGUE1
1
diff --git a/support_files/definitions/usa/league_usa_econf.xml b/support_files/definitions/usa/league_usa_econf.xml
index 898aa45e..0cc749c3 100644
--- a/support_files/definitions/usa/league_usa_econf.xml
+++ b/support_files/definitions/usa/league_usa_econf.xml
@@ -4,7 +4,7 @@
Eastern Conference
EC
flag_usa.png
- 3
+ 1
1
8700
1
diff --git a/support_files/definitions/usa/league_usa_first.xml b/support_files/definitions/usa/league_usa_first.xml
index 86a91f69..1921918b 100644
--- a/support_files/definitions/usa/league_usa_first.xml
+++ b/support_files/definitions/usa/league_usa_first.xml
@@ -4,11 +4,19 @@
First Division
1st Div
flag_usa.png
- 2
+ 3
1
7900
2
2
+ 7
+ 8
+ 10
+ 17
+ 20
+ 21
+ 23
+ 24
5
usa
diff --git a/support_files/definitions/usa/league_usa_mls.xml b/support_files/definitions/usa/league_usa_mls.xml
index f7f6a823..daa6e489 100644
--- a/support_files/definitions/usa/league_usa_mls.xml
+++ b/support_files/definitions/usa/league_usa_mls.xml
@@ -9,6 +9,12 @@
8700
1
3
+ 7
+ 8
+ 10
+ 11
+ 25
+ 28
5
usa
diff --git a/support_files/definitions/usa/league_usa_pdl_gl.xml b/support_files/definitions/usa/league_usa_pdl_gl.xml
index fcc2d700..21ba649d 100644
--- a/support_files/definitions/usa/league_usa_pdl_gl.xml
+++ b/support_files/definitions/usa/league_usa_pdl_gl.xml
@@ -4,11 +4,13 @@
Great Lakes Development
G.L.D.L.
flag_usa.png
- 13
+ 7
1
5550
4
2
+ 11
+ 14
5
usa
diff --git a/support_files/definitions/usa/league_usa_pdl_hl.xml b/support_files/definitions/usa/league_usa_pdl_hl.xml
index d74b422b..00c82d47 100644
--- a/support_files/definitions/usa/league_usa_pdl_hl.xml
+++ b/support_files/definitions/usa/league_usa_pdl_hl.xml
@@ -4,11 +4,13 @@
Heartland Development
H.L.D.L.
flag_usa.png
- 13
+ 7
1
5550
4
2
+ 11
+ 14
5
usa
diff --git a/support_files/definitions/usa/league_usa_pdl_ma.xml b/support_files/definitions/usa/league_usa_pdl_ma.xml
index 1e8394a6..6e3e21bc 100644
--- a/support_files/definitions/usa/league_usa_pdl_ma.xml
+++ b/support_files/definitions/usa/league_usa_pdl_ma.xml
@@ -4,11 +4,13 @@
Mid-Atlantic Development
M.A.D.L.
flag_usa.png
- 9
+ 7
1
5550
4
2
+ 5
+ 18
5
usa
diff --git a/support_files/definitions/usa/league_usa_pdl_ms.xml b/support_files/definitions/usa/league_usa_pdl_ms.xml
index 12203a5d..d532271a 100644
--- a/support_files/definitions/usa/league_usa_pdl_ms.xml
+++ b/support_files/definitions/usa/league_usa_pdl_ms.xml
@@ -4,11 +4,13 @@
Mid-South Development
M.S.D.L.
flag_usa.png
- 13
+ 7
1
5550
4
2
+ 11
+ 14
5
usa
diff --git a/support_files/definitions/usa/league_usa_pdl_ne.xml b/support_files/definitions/usa/league_usa_pdl_ne.xml
index e5df7d88..ffe99138 100644
--- a/support_files/definitions/usa/league_usa_pdl_ne.xml
+++ b/support_files/definitions/usa/league_usa_pdl_ne.xml
@@ -4,7 +4,7 @@
New England Development
N.En.D.L.
flag_usa.png
- 10
+ 7
1
5550
4
diff --git a/support_files/definitions/usa/league_usa_pdl_no.xml b/support_files/definitions/usa/league_usa_pdl_no.xml
index a6284a32..b9fd2d10 100644
--- a/support_files/definitions/usa/league_usa_pdl_no.xml
+++ b/support_files/definitions/usa/league_usa_pdl_no.xml
@@ -4,11 +4,13 @@
Northeast Development
N.Ea.D.L.
flag_usa.png
- 13
+ 7
1
5550
4
2
+ 10
+ 14
5
usa
diff --git a/support_files/definitions/usa/league_usa_pdl_nw.xml b/support_files/definitions/usa/league_usa_pdl_nw.xml
index 4b816458..427827df 100644
--- a/support_files/definitions/usa/league_usa_pdl_nw.xml
+++ b/support_files/definitions/usa/league_usa_pdl_nw.xml
@@ -4,11 +4,13 @@
Northwest Development
N.W.D.L.
flag_usa.png
- 13
+ 7
1
5550
4
2
+ 11
+ 14
5
usa
diff --git a/support_files/definitions/usa/league_usa_pdl_sa.xml b/support_files/definitions/usa/league_usa_pdl_sa.xml
index cfd58dbb..7a61fd3a 100644
--- a/support_files/definitions/usa/league_usa_pdl_sa.xml
+++ b/support_files/definitions/usa/league_usa_pdl_sa.xml
@@ -4,7 +4,7 @@
South-Atlantic Development
S.A.D.L.
flag_usa.png
- 10
+ 7
1
5550
4
diff --git a/support_files/definitions/usa/league_usa_pdl_se.xml b/support_files/definitions/usa/league_usa_pdl_se.xml
index a91697ea..fef26dd5 100644
--- a/support_files/definitions/usa/league_usa_pdl_se.xml
+++ b/support_files/definitions/usa/league_usa_pdl_se.xml
@@ -4,11 +4,13 @@
Southeast Development
S.E.D.L.
flag_usa.png
- 13
+ 7
1
5550
4
2
+ 10
+ 14
5
usa
diff --git a/support_files/definitions/usa/league_usa_pdl_sw.xml b/support_files/definitions/usa/league_usa_pdl_sw.xml
index b728046b..26252c7d 100644
--- a/support_files/definitions/usa/league_usa_pdl_sw.xml
+++ b/support_files/definitions/usa/league_usa_pdl_sw.xml
@@ -4,11 +4,13 @@
Southwest Development
N.W.D.L.
flag_usa.png
- 9
+ 7
1
5550
4
2
+ 5
+ 18
5
usa
diff --git a/support_files/definitions/usa/league_usa_second.xml b/support_files/definitions/usa/league_usa_second.xml
index fc60f29d..e47e9894 100644
--- a/support_files/definitions/usa/league_usa_second.xml
+++ b/support_files/definitions/usa/league_usa_second.xml
@@ -4,11 +4,13 @@
Second Division
2nd Div
flag_usa.png
- 7
+ 3
1
6600
3
2
+ 13
+ 18
5
usa
diff --git a/support_files/definitions/usa/league_usa_wconf.xml b/support_files/definitions/usa/league_usa_wconf.xml
index 98bf6b3d..b6b7b0d7 100644
--- a/support_files/definitions/usa/league_usa_wconf.xml
+++ b/support_files/definitions/usa/league_usa_wconf.xml
@@ -9,6 +9,8 @@
8700
1
6
+ 27
+ 30
5
usa