diff --git a/resources/campaigns/operation_allied_sword.yaml b/resources/campaigns/operation_allied_sword.yaml
index ae78eea7..2d32f7ba 100644
--- a/resources/campaigns/operation_allied_sword.yaml
+++ b/resources/campaigns/operation_allied_sword.yaml
@@ -2,8 +2,171 @@
 name: Syria - Operation Allied Sword
 theater: Syria
 authors: Fuzzle
-recommended_player_faction: Israel-USN 2005 (Allied Sword)
-recommended_enemy_faction: Syria-Lebanon 2005 (Allied Sword)
+recommended_player_faction:
+  country: Combined Joint Task Forces Blue
+  name: Israel-USN 2005
+  authors: Fuzzle
+  description:
+    <p>A joint US Navy/Israeli modern faction for use with the Operation Allied
+    Sword scenario.</p>
+  locales:
+    - en_US
+  aircrafts:
+    - F-4E Phantom II
+    - F-15C Eagle
+    - F-15E Strike Eagle
+    - F-15E Strike Eagle (Suite 4+)
+    - F-16CM Fighting Falcon (Block 50)
+    - F-14B Tomcat
+    - F/A-18C Hornet (Lot 20)
+    - AV-8B Harrier II Night Attack
+    - AH-1W SuperCobra
+    - AH-64D Apache Longbow
+    - AH-64D Apache Longbow (AI)
+    - S-3B Viking
+    - SH-60B Seahawk
+    - UH-1H Iroquois
+    - UH-60L
+  awacs:
+    - E-2C Hawkeye
+  tankers:
+    - KC-130
+    - S-3B Tanker
+  frontline_units:
+    - M113
+    - M1043 HMMWV (M2 HMG)
+    - M1045 HMMWV (BGM-71 TOW)
+    - Merkava Mk IV
+    - M163 Vulcan Air Defense System
+  artillery_units:
+    - M109A6 Paladin
+    - M270 Multiple Launch Rocket System
+  logistics_units:
+    - Truck M818 6x6
+  infantry_units:
+    - Infantry M4
+    - Infantry M249
+    - MANPADS Stinger
+  preset_groups:
+    - Hawk
+    - Patriot
+  naval_units:
+    - FFG Oliver Hazard Perry
+    - DDG Arleigh Burke IIa
+    - CG Ticonderoga
+    - LHA-1 Tarawa
+    - CVN-74 John C. Stennis
+  missiles: []
+  air_defense_units:
+    - SAM Hawk SR (AN/MPQ-50)
+    - M163 Vulcan Air Defense System
+    - M48 Chaparral
+  requirements: {}
+  carrier_names:
+    - CVN-71 Theodore Roosevelt
+    - CVN-72 Abraham Lincoln
+    - CVN-73 George Washington
+    - CVN-74 John C. Stennis
+    - CVN-75 Harry S. Truman
+  helicopter_carrier_names:
+    - LHA-1 Tarawa
+    - LHA-2 Saipan
+    - LHA-3 Belleau Wood
+    - LHA-4 Nassau
+    - LHA-5 Peleliu
+  has_jtac: true
+  jtac_unit: MQ-9 Reaper
+  doctrine: modern
+  liveries_overrides:
+    F-14B Tomcat:
+      - VF-142 Ghostriders
+    F/A-18C Hornet (Lot 20):
+      - VMFA-251 high visibility
+    AV-8B Harrier II Night Attack:
+      - VMAT-542
+    AH-1W SuperCobra:
+      - Marines
+    UH-1H Iroquois:
+      - US NAVY
+    UH-60L:
+      - Israeli Air Force
+  unrestricted_satnav: true
+recommended_enemy_faction:
+  country: Combined Joint Task Forces Red
+  name: Syria-Lebanon 2005 (Allied Sword)
+  authors: Fuzzle
+  description:
+    <p>Syria-Lebanon alliance in a modern setting with several imported Russian
+    assets. Designed for use with the Allied Sword scenario.</p>
+  aircrafts:
+    - MiG-23ML Flogger-G
+    - MiG-29A Fulcrum-A
+    - Su-17M4 Fitter-K
+    - Su-24M Fencer-D
+    - Su-30 Flanker-C
+    - Su-34 Fullback
+    - L-39ZA Albatros
+    - Tu-22M3 Backfire-C
+    - Mi-24V Hind-E
+    - Mi-8MTV2 Hip
+    - SA 342L Gazelle
+    - IL-76MD
+  awacs:
+    - A-50
+  tankers:
+    - IL-78M
+  frontline_units:
+    - BMP-1
+    - BMP-2
+    - BTR-80
+    - BRDM-2
+    - MT-LB
+    - T-55A
+    - T-72B with Kontakt-1 ERA
+    - T-90A
+    - ZSU-57-2 'Sparka'
+  artillery_units:
+    - BM-21 Grad
+    - 2S1 Gvozdika
+  logistics_units:
+    - Truck Ural-375
+    - LUV UAZ-469 Jeep
+  infantry_units:
+    - Paratrooper AKS
+    - Infantry AK-74 Rus
+    - Paratrooper RPG-16
+    - MANPADS SA-18 Igla-S "Grouse"
+  preset_groups:
+    - SA-2/S-75
+    - SA-3/S-125
+    - SA-6
+    - SA-11
+    - SA-10/S-300PS
+    - Silkworm
+    - Cold-War-Flak
+    - Russian Navy
+  naval_units:
+    - Corvette 1124.4 Grish
+    - Corvette 1241.1 Molniya
+    - FAC La Combattante IIa
+    - Frigate 1135M Rezky
+  air_defense_units:
+    - SAM P19 "Flat Face" SR (SA-2/3)
+    - EWR 1L13
+    - EWR 55G6
+    - SAM SA-8 Osa "Gecko" TEL
+    - SA-9 Strela
+    - SA-13 Gopher (9K35 Strela-10M3)
+    - SA-19 Grison (2K22 Tunguska)
+    - ZSU-57-2 'Sparka'
+    - AAA ZU-23 Closed Emplacement
+    - ZU-23 on Ural-375
+    - ZSU-23-4 Shilka
+  missiles:
+    - SSM SS-1C Scud-B
+  helicopter_carrier_names: []
+  requirements: {}
+  carrier_names: []
 description:
   <p>In this fictional scenario, a US/Israeli coalition must push north from the
   Israeli border, through Syria and Lebanon to
@@ -13,7 +176,6 @@ description:
   counterattack. The US Navy will handle the Beirut region's coastal arena,
   while the IAF will push through Damascus and the inland mountain ranges.</p>
 version: "10.7"
-advanced_iads: true
 miz: operation_allied_sword.miz
 performance: 2
 recommended_start_date: 2004-07-17
@@ -89,7 +251,7 @@ squadrons:
     - primary: CAS
       secondary: air-to-ground
       aircraft:
-        - AH-64D Apache Longbow
+        - 113th Squadron
   #Ramat David
   30:
     - primary: BARCAP
@@ -108,12 +270,12 @@ squadrons:
       secondary: any
       aircraft:
         - 69th Squadron
-      size: 8
+      size: 12
     - primary: BAI
       secondary: any
       aircraft:
         - 110th Squadron
-      size: 8
+      size: 16
   # Damascus
   7:
     - primary: TARCAP
@@ -151,14 +313,14 @@ squadrons:
     - primary: CAS
       secondary: air-to-ground
       aircraft:
-        - SA 342M Gazelle
+        - SA 342L Gazelle
       size: 6
   # OPFOR Second inland FOB
   FOB Homs:
     - primary: CAS
       secondary: air-to-ground
       aircraft:
-        - SA 342M Gazelle
+        - SA 342L Gazelle
       size: 6
   # Palmyra
   28:
@@ -201,7 +363,7 @@ squadrons:
     - primary: CAS
       secondary: air-to-ground
       aircraft:
-        - SA 342M Gazelle
+        - SA 342L Gazelle
   # OPFOR Second inland FOB
   FOB Ithriyah:
     - primary: CAS
diff --git a/resources/factions/Israel-USN_2005_Allied_Sword.json b/resources/factions/Israel-USN_2005_Allied_Sword.json
deleted file mode 100644
index 0a3b5378..00000000
--- a/resources/factions/Israel-USN_2005_Allied_Sword.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-  "country": "Combined Joint Task Forces Blue",
-  "name": "Israel-USN 2005 (Allied Sword)",
-  "authors": "Fuzzle",
-  "description": "<p>A joint US Navy/Israeli modern faction for use with the Operation Allied Sword scenario.</p>",
-  "locales": [
-    "en_US"
-  ],
-  "aircrafts": [
-    "F-4E Phantom II",
-    "F-15C Eagle",
-    "F-15D Baz",
-    "F-15E Strike Eagle (AI)",
-    "F-15E Strike Eagle (Suite 4+)",
-    "F-16CM Fighting Falcon (Block 50)",
-    "F-16D Barak (Block 30)",
-    "F-16D Barak (Block 40)",
-    "F-16I Sufa",
-    "F-14B Tomcat",
-    "F/A-18C Hornet (Lot 20)",
-	"F/A-18E Super Hornet",
-	"F/A-18F Super Hornet",
-	"EA-18G Growler",
-    "AV-8B Harrier II Night Attack",
-    "AH-1W SuperCobra",
-    "AH-64D Apache Longbow",
-    "AH-64D Apache Longbow (AI)",
-    "S-3B Viking",
-    "SH-60B Seahawk",
-    "UH-1H Iroquois",
-    "UH-60L"
-  ],
-  "awacs": [
-    "E-2C Hawkeye"
-  ],
-  "tankers": [
-    "KC-130",
-    "S-3B Tanker"
-  ],
-  "frontline_units": [
-    "M113",
-    "M1043 HMMWV (M2 HMG)",
-    "M1045 HMMWV (BGM-71 TOW)",
-    "Merkava Mk IV",
-    "M163 Vulcan Air Defense System"
-  ],
-  "artillery_units": [
-    "M109A6 Paladin",
-    "M270 Multiple Launch Rocket System"
-  ],
-  "logistics_units": [
-    "Truck M818 6x6"
-  ],
-  "infantry_units": [
-    "Infantry M4",
-    "Infantry M249",
-    "MANPADS Stinger"
-  ],
-  "preset_groups": [
-    "Hawk",
-    "Patriot"
-  ],
-  "naval_units": [
-    "FFG Oliver Hazard Perry",
-    "DDG Arleigh Burke IIa",
-    "CG Ticonderoga",
-    "LHA-1 Tarawa",
-    "CVN-74 John C. Stennis"
-  ],
-  "missiles": [],
-  "air_defense_units": [
-    "SAM Hawk SR (AN/MPQ-50)",
-    "M163 Vulcan Air Defense System",
-    "M48 Chaparral"
-  ],
-  "requirements": {},
-  "carrier_names": [
-    "CVN-71 Theodore Roosevelt",
-    "CVN-72 Abraham Lincoln",
-    "CVN-73 George Washington",
-    "CVN-74 John C. Stennis",
-    "CVN-75 Harry S. Truman"
-  ],
-  "helicopter_carrier_names": [
-    "LHA-1 Tarawa",
-    "LHA-2 Saipan",
-    "LHA-3 Belleau Wood",
-    "LHA-4 Nassau",
-    "LHA-5 Peleliu"
-  ],
-  "has_jtac": true,
-  "jtac_unit": "MQ-9 Reaper",
-  "doctrine": "modern",
-  "liveries_overrides": {
-    "F-14B Tomcat": [
-      "VF-142 Ghostriders"
-    ],
-    "F/A-18C Hornet (Lot 20)": [
-      "VMFA-251 high visibility"
-    ],
-    "AV-8B Harrier II Night Attack": [
-      "VMAT-542"
-    ],
-    "AH-1W SuperCobra": [
-      "Marines"
-    ],
-    "UH-1H Iroquois": [
-      "US NAVY"
-    ],
-    "UH-60L": [
-      "Israeli Air Force"
-    ]	
-  },
-  "unrestricted_satnav": true
-}
\ No newline at end of file
diff --git a/resources/factions/NATO_Desert_Storm.json b/resources/factions/NATO_Desert_Storm.json
index 171835a2..942cf542 100644
--- a/resources/factions/NATO_Desert_Storm.json
+++ b/resources/factions/NATO_Desert_Storm.json
@@ -20,10 +20,10 @@
     "F-15E Strike Eagle (Suite 4+)",
     "F-16A MLU",
     "F-16CM Fighting Falcon (Block 50)",
-	"F-16D Fighting Falcon (Block 52+)",
-	"F-16D Fighting Falcon (Block 52)",
-	"F-16D Fighting Falcon (Block 50+)",
-	"F-16D Fighting Falcon (Block 50)",
+    "F-16D Fighting Falcon (Block 52+)",
+    "F-16D Fighting Falcon (Block 52)",
+    "F-16D Fighting Falcon (Block 50+)",
+    "F-16D Fighting Falcon (Block 50)",
     "F-4E Phantom II",
     "F/A-18C Hornet (Lot 20)",
     "Mirage 2000C",
@@ -42,6 +42,7 @@
   "tankers": [
     "KC-130",
     "KC-135 Stratotanker",
+    "KC-135 Stratotanker MPRS",
     "S-3B Tanker"
   ],
   "frontline_units": [
diff --git a/resources/factions/NATO_OIF.json b/resources/factions/NATO_OIF.json
index 0498472f..3a44d35a 100644
--- a/resources/factions/NATO_OIF.json
+++ b/resources/factions/NATO_OIF.json
@@ -5,6 +5,7 @@
   "description": "<p>A more modern NATO mixed faction reflecting the units involved in Operation Iraqi Freedom.</p>",
   "aircrafts": [
     "A-10C Thunderbolt II (Suite 3)",
+    "A-10C Thunderbolt II (Suite 7)",
     "AH-64D Apache Longbow",
     "AH-64D Apache Longbow (AI)",
     "AV-8B Harrier II Night Attack",
@@ -22,10 +23,10 @@
     "F-15E Strike Eagle (Suite 4+)",
     "F-16A MLU",
     "F-16CM Fighting Falcon (Block 50)",
-	"F-16D Fighting Falcon (Block 52+)",
-	"F-16D Fighting Falcon (Block 52)",
-	"F-16D Fighting Falcon (Block 50+)",
-	"F-16D Fighting Falcon (Block 50)",
+    "F-16D Fighting Falcon (Block 52+)",
+    "F-16D Fighting Falcon (Block 52)",
+    "F-16D Fighting Falcon (Block 50+)",
+    "F-16D Fighting Falcon (Block 50)",
     "F-22A Raptor",
     "F/A-18C Hornet (Lot 20)",
     "Mirage 2000C",
@@ -46,6 +47,7 @@
   "tankers": [
     "KC-130",
     "KC-130J",
+    "KC-135 Stratotanker MPRS",
     "KC-135 Stratotanker",
     "S-3B Tanker"
   ],
diff --git a/resources/factions/Syria-Lebanon_2005_Allied_Sword.json b/resources/factions/Syria-Lebanon_2005_Allied_Sword.json
deleted file mode 100644
index 2104e0ba..00000000
--- a/resources/factions/Syria-Lebanon_2005_Allied_Sword.json
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  "country": "Combined Joint Task Forces Red",
-  "name": "Syria-Lebanon 2005 (Allied Sword)",
-  "authors": "Fuzzle",
-  "description": "<p>Syria-Lebanon alliance in a modern setting with several imported Russian assets. Designed for use with the Allied Sword scenario.</p>",
-  "aircrafts": [
-    "MiG-23ML Flogger-G",
-    "MiG-25RBT Foxbat-B",
-    "MiG-29A Fulcrum-A",
-    "Su-17M4 Fitter-K",
-    "Su-24M Fencer-D",
-    "Su-30 Flanker-C",
-    "Su-34 Fullback",
-    "L-39ZA Albatros",
-    "Tu-22M3 Backfire-C",
-    "Mi-24V Hind-E",
-    "Mi-8MTV2 Hip",
-    "SA 342M Gazelle",
-    "SA 342L Gazelle",
-    "IL-76MD"
-  ],
-  "awacs": [
-    "A-50"
-  ],
-  "tankers": [
-    "IL-78M"
-  ],
-  "frontline_units": [
-    "BMP-1",
-    "BMP-2",
-    "BTR-80",
-    "BRDM-2",
-    "MT-LB",
-    "T-55A",
-    "T-72B with Kontakt-1 ERA",
-    "T-90A",
-    "ZSU-57-2 'Sparka'"
-  ],
-  "artillery_units": [
-    "BM-21 Grad",
-    "2S1 Gvozdika"
-  ],
-  "logistics_units": [
-    "Truck Ural-375",
-    "LUV UAZ-469 Jeep"
-  ],
-  "infantry_units": [
-    "Paratrooper AKS",
-    "Infantry AK-74 Rus",
-    "Paratrooper RPG-16",
-    "MANPADS SA-18 Igla-S \"Grouse\""
-  ],
-  "preset_groups": [
-    "SA-2/S-75",
-    "SA-3/S-125",
-    "SA-6",
-    "SA-11",
-    "SA-10/S-300PS",
-    "Silkworm",
-    "Cold-War-Flak",
-    "Russian Navy",
-    "KS-19/SON-9"
-  ],
-  "naval_units": [
-    "Corvette 1124.4 Grish",
-    "Corvette 1241.1 Molniya",
-    "FAC La Combattante IIa",
-    "Frigate 1135M Rezky"
-  ],
-  "air_defense_units": [
-    "SAM P19 \"Flat Face\" SR (SA-2/3)",
-    "EWR 1L13",
-    "EWR 55G6",
-    "SAM SA-8 Osa \"Gecko\" TEL",
-    "SA-9 Strela",
-    "SA-13 Gopher (9K35 Strela-10M3)",
-    "SA-19 Grison (2K22 Tunguska)",
-    "ZSU-57-2 'Sparka'",
-    "AAA ZU-23 Closed Emplacement",
-    "ZU-23 on Ural-375",
-    "ZSU-23-4 Shilka"
-  ],
-  "missiles": [
-    "SSM SS-1C Scud-B"
-  ],
-  "helicopter_carrier_names": [],
-  "requirements": {},
-  "carrier_names": []
-}
\ No newline at end of file
diff --git a/resources/factions/russia_1990.json b/resources/factions/russia_1990.json
index 027d9703..4480fa26 100644
--- a/resources/factions/russia_1990.json
+++ b/resources/factions/russia_1990.json
@@ -9,6 +9,7 @@
   "aircrafts": [
     "IL-76MD",
     "Ka-50 Hokum",
+    "Ka-50 Hokum III",
     "Mi-24V Hind-E",
     "Mi-24P Hind-F",
     "Mi-8MTV2 Hip",