diff --git a/resources/dcs/beacons/falklands.json b/resources/dcs/beacons/falklands.json
new file mode 100644
index 00000000..d8147d05
--- /dev/null
+++ b/resources/dcs/beacons/falklands.json
@@ -0,0 +1,198 @@
+[
+ {
+  "name": "ELCALACAFE",
+  "callsign": "EC",
+  "beacon_type": 15,
+  "hertz": 108900000,
+  "channel": null
+ },
+ {
+  "name": "ELCALAFATE",
+  "callsign": "ec",
+  "beacon_type": 14,
+  "hertz": 108900000,
+  "channel": null
+ },
+ {
+  "name": "ECA",
+  "callsign": "ECA",
+  "beacon_type": 4,
+  "hertz": 114700000,
+  "channel": 94
+ },
+ {
+  "name": "MTPLEASANT",
+  "callsign": "imp",
+  "beacon_type": 14,
+  "hertz": 111900000,
+  "channel": null
+ },
+ {
+  "name": "MP",
+  "callsign": "MP",
+  "beacon_type": 10,
+  "hertz": 380000,
+  "channel": null
+ },
+ {
+  "name": "MPA",
+  "callsign": "MPA",
+  "beacon_type": 5,
+  "hertz": 112200000,
+  "channel": 59
+ },
+ {
+  "name": "MTP",
+  "callsign": "MTP",
+  "beacon_type": 2,
+  "hertz": 114700000,
+  "channel": 94
+ },
+ {
+  "name": "MTPLEASANT",
+  "callsign": "IMP",
+  "beacon_type": 15,
+  "hertz": 111900000,
+  "channel": null
+ },
+ {
+  "name": "stanleyairport",
+  "callsign": "SA",
+  "beacon_type": 10,
+  "hertz": 305000,
+  "channel": null
+ },
+ {
+  "name": "DFO",
+  "callsign": "DFO",
+  "beacon_type": 2,
+  "hertz": 113300000,
+  "channel": null
+ },
+ {
+  "name": "PUERTO NATALES",
+  "callsign": "PNT",
+  "beacon_type": 4,
+  "hertz": 115900000,
+  "channel": 106
+ },
+ {
+  "name": "Puerto Williams",
+  "callsign": "PWL",
+  "beacon_type": 4,
+  "hertz": 114900000,
+  "channel": 96
+ },
+ {
+  "name": "ptarenas",
+  "callsign": "inas",
+  "beacon_type": 15,
+  "hertz": 109900000,
+  "channel": null
+ },
+ {
+  "name": "",
+  "callsign": "INAS",
+  "beacon_type": 14,
+  "hertz": 109900000,
+  "channel": null
+ },
+ {
+  "name": "NAS",
+  "callsign": "NAS",
+  "beacon_type": 4,
+  "hertz": 114100000,
+  "channel": null
+ },
+ {
+  "name": "NAS",
+  "callsign": "NAS",
+  "beacon_type": 9,
+  "hertz": 270000,
+  "channel": null
+ },
+ {
+  "name": "GAL",
+  "callsign": "GAL",
+  "beacon_type": 4,
+  "hertz": 116700000,
+  "channel": 114
+ },
+ {
+  "name": "RIOGALLEGOS",
+  "callsign": "gl",
+  "beacon_type": 14,
+  "hertz": 110300000,
+  "channel": null
+ },
+ {
+  "name": "RIOGALLEGOS",
+  "callsign": "gl",
+  "beacon_type": 15,
+  "hertz": 110300000,
+  "channel": null
+ },
+ {
+  "name": "RIOGRANDE",
+  "callsign": "gr",
+  "beacon_type": 14,
+  "hertz": 109500000,
+  "channel": null
+ },
+ {
+  "name": "GRA",
+  "callsign": "GRA",
+  "beacon_type": 4,
+  "hertz": 117300000,
+  "channel": 120
+ },
+ {
+  "name": "RIOGRANDE",
+  "callsign": "gr",
+  "beacon_type": 15,
+  "hertz": 109500000,
+  "channel": null
+ },
+ {
+  "name": "riograndendb",
+  "callsign": "P",
+  "beacon_type": 10,
+  "hertz": 265000,
+  "channel": null
+ },
+ {
+  "name": "riogrande",
+  "callsign": "gra",
+  "beacon_type": 5,
+  "hertz": 1000000,
+  "channel": 31
+ },
+ {
+  "name": "San Julian",
+  "callsign": "",
+  "beacon_type": 4,
+  "hertz": 117700000,
+  "channel": null
+ },
+ {
+  "name": "RIOGRANDE",
+  "callsign": "us",
+  "beacon_type": 14,
+  "hertz": 111300000,
+  "channel": null
+ },
+ {
+  "name": "Ushuaia",
+  "callsign": "us",
+  "beacon_type": 15,
+  "hertz": 111300000,
+  "channel": null
+ },
+ {
+  "name": "USU",
+  "callsign": "USU",
+  "beacon_type": 2,
+  "hertz": 113700000,
+  "channel": 84
+ }
+]
\ No newline at end of file
diff --git a/resources/dcs/beacons/nevada.json b/resources/dcs/beacons/nevada.json
index 4c93b5c5..3984e44c 100644
--- a/resources/dcs/beacons/nevada.json
+++ b/resources/dcs/beacons/nevada.json
@@ -1,97 +1,97 @@
 [
  {
-  "name": "",
+  "name": "Creech",
   "callsign": "ICRR",
   "beacon_type": 15,
   "hertz": 108700000,
   "channel": 24
  },
  {
-  "name": "",
+  "name": "Creech",
   "callsign": "ICRR",
   "beacon_type": 14,
   "hertz": 108700000,
   "channel": 24
  },
  {
-  "name": "",
+  "name": "Creech",
   "callsign": "ICRS",
   "beacon_type": 14,
   "hertz": 108500000,
   "channel": 22
  },
  {
-  "name": "",
+  "name": "Creech",
   "callsign": "ICRS",
   "beacon_type": 15,
   "hertz": 108500000,
   "channel": 22
  },
  {
-  "name": "Indian Springs",
+  "name": "Creech",
   "callsign": "INS",
   "beacon_type": 5,
   "hertz": null,
   "channel": 87
  },
  {
-  "name": "",
+  "name": "Groom-Lake",
   "callsign": "GLRI",
   "beacon_type": 14,
   "hertz": 109300000,
   "channel": 30
  },
  {
-  "name": "",
+  "name": "Groom-Lake",
   "callsign": "GLRI",
   "beacon_type": 15,
   "hertz": 109300000,
   "channel": 30
  },
  {
-  "name": "Groom Lake",
+  "name": "Groom-Lake",
   "callsign": "GRL",
   "beacon_type": 5,
   "hertz": null,
   "channel": 18
  },
  {
-  "name": "",
+  "name": "McCarran-International",
   "callsign": "I-RLE",
   "beacon_type": 15,
   "hertz": 111750000,
   "channel": null
  },
  {
-  "name": "",
+  "name": "McCarran-International",
   "callsign": "I-LAS",
   "beacon_type": 15,
   "hertz": 110300000,
   "channel": 40
  },
  {
-  "name": "",
+  "name": "McCarran-International",
   "callsign": "I-RLE",
   "beacon_type": 14,
   "hertz": 111750000,
   "channel": null
  },
  {
-  "name": "",
+  "name": "McCarran-International",
   "callsign": "I-LAS",
   "beacon_type": 14,
   "hertz": 110300000,
   "channel": 40
  },
  {
-  "name": "Las Vegas",
+  "name": "McCarran-International",
   "callsign": "LAS",
   "beacon_type": 6,
   "hertz": 116900000,
   "channel": 116
  },
  {
-  "name": "",
+  "name": "Nellis",
   "callsign": "IDIQ",
   "beacon_type": 15,
   "hertz": 109100000,
@@ -105,49 +105,49 @@
   "channel": 12
  },
  {
-  "name": "",
+  "name": "Nellis",
   "callsign": "IDIQ",
   "beacon_type": 14,
   "hertz": 109100000,
   "channel": null
  },
  {
-  "name": "",
+  "name": "North-Las-Vegas",
   "callsign": "I-HWG",
   "beacon_type": 14,
   "hertz": 110700000,
   "channel": null
  },
  {
-  "name": "",
+  "name": "North-Las-Vegas",
   "callsign": "I-HWG",
   "beacon_type": 15,
   "hertz": 110700000,
   "channel": null
  },
  {
-  "name": "",
+  "name": "Tonopah-Test-Range",
   "callsign": "I-RVP",
   "beacon_type": 14,
   "hertz": 108300000,
   "channel": null
  },
  {
-  "name": "",
+  "name": "Tonopah-Test-Range",
   "callsign": "I-UVV",
   "beacon_type": 14,
   "hertz": 111700000,
   "channel": null
  },
  {
-  "name": "",
+  "name": "Tonopah-Test-Range",
   "callsign": "I-UVV",
   "beacon_type": 15,
   "hertz": 111700000,
   "channel": null
  },
  {
-  "name": "",
+  "name": "Tonopah-Test-Range",
   "callsign": "I-RVP",
   "beacon_type": 15,
   "hertz": 108300000,
diff --git a/resources/dcs/beacons/syria.json b/resources/dcs/beacons/syria.json
index 13baa75c..cc5c43d9 100644
--- a/resources/dcs/beacons/syria.json
+++ b/resources/dcs/beacons/syria.json
@@ -1,18 +1,4 @@
 [
- {
-  "name": "Deir ez-Zor",
-  "callsign": "DRZ",
-  "beacon_type": 10,
-  "hertz": 295000,
-  "channel": null
- },
- {
-  "name": "GAZIANTEP",
-  "callsign": "GAZ",
-  "beacon_type": 10,
-  "hertz": 432000,
-  "channel": null
- },
  {
   "name": "BANIAS",
   "callsign": "BAN",
@@ -20,13 +6,6 @@
   "hertz": 304000,
   "channel": null
  },
- {
-  "name": "ALEPPO",
-  "callsign": "ALE",
-  "beacon_type": 10,
-  "hertz": 396000,
-  "channel": null
- },
  {
   "name": "KAHRAMANMARAS",
   "callsign": "KHM",
@@ -34,13 +13,6 @@
   "hertz": 374000,
   "channel": null
  },
- {
-  "name": "MEZZEH",
-  "callsign": "MEZ",
-  "beacon_type": 10,
-  "hertz": 358000,
-  "channel": null
- },
  {
   "name": "KLEYATE",
   "callsign": "RA",
@@ -55,13 +27,6 @@
   "hertz": 372500,
   "channel": null
  },
- {
-  "name": "ALEPPO",
-  "callsign": "MER",
-  "beacon_type": 10,
-  "hertz": 365000,
-  "channel": null
- },
  {
   "name": "TURAIF",
   "callsign": "TRF",
@@ -69,27 +34,13 @@
   "hertz": 116100000,
   "channel": null
  },
- {
-  "name": "Deir ez-Zor",
-  "callsign": "DRZ",
-  "beacon_type": 4,
-  "hertz": 117000000,
-  "channel": null
- },
  {
   "name": "BAYSUR",
   "callsign": "BAR",
-  "beacon_type": 4,
+  "beacon_type": 2,
   "hertz": 113900000,
   "channel": null
  },
- {
-  "name": "ALEPPO",
-  "callsign": "ALE",
-  "beacon_type": 4,
-  "hertz": 114500000,
-  "channel": null
- },
  {
   "name": "MARKA",
   "callsign": "AMN",
@@ -97,20 +48,6 @@
   "hertz": 116300000,
   "channel": null
  },
- {
-  "name": "GAZIANTEP",
-  "callsign": "GAZ",
-  "beacon_type": 4,
-  "hertz": 116700000,
-  "channel": null
- },
- {
-  "name": "ROSH-PINA",
-  "callsign": "ROP",
-  "beacon_type": 4,
-  "hertz": 115300000,
-  "channel": null
- },
  {
   "name": "TANF",
   "callsign": "TAN",
@@ -198,14 +135,7 @@
  {
   "name": "Akrotiri",
   "callsign": "AKR",
-  "beacon_type": 6,
-  "hertz": 116000000,
-  "channel": 107
- },
- {
-  "name": "Akrotiri",
-  "callsign": "AKR",
-  "beacon_type": 3,
+  "beacon_type": 5,
   "hertz": 116000000,
   "channel": 107
  },
@@ -304,14 +234,14 @@
   "name": "DAMASCUS",
   "callsign": "DAL",
   "beacon_type": 11,
-  "hertz": 342000,
+  "hertz": 342000000,
   "channel": null
  },
  {
   "name": "ABYAD",
   "callsign": "ABD",
   "beacon_type": 10,
-  "hertz": 264,
+  "hertz": 264000,
   "channel": null
  },
  {
@@ -321,6 +251,20 @@
   "hertz": 111100000,
   "channel": null
  },
+ {
+  "name": "Deir ez-Zor",
+  "callsign": "DRZ",
+  "beacon_type": 10,
+  "hertz": 295000,
+  "channel": null
+ },
+ {
+  "name": "Deir ez-Zor",
+  "callsign": "DRZ",
+  "beacon_type": 4,
+  "hertz": 117000000,
+  "channel": null
+ },
  {
   "name": "ERCAN",
   "callsign": "ECN",
@@ -328,6 +272,13 @@
   "hertz": 117000000,
   "channel": null
  },
+ {
+  "name": "",
+  "callsign": "IECR",
+  "beacon_type": 14,
+  "hertz": 108300000,
+  "channel": null
+ },
  {
   "name": "",
   "callsign": "IGNP",
@@ -343,25 +294,32 @@
   "channel": null
  },
  {
-  "name": "",
-  "callsign": "IGZP",
-  "beacon_type": 14,
-  "hertz": 108500000,
+  "name": "GAZIANTEP",
+  "callsign": "GAZ",
+  "beacon_type": 10,
+  "hertz": 432000,
+  "channel": null
+ },
+ {
+  "name": "GAZIANTEP",
+  "callsign": "GAZ",
+  "beacon_type": 4,
+  "hertz": 116700000,
   "channel": null
  },
  {
   "name": "",
   "callsign": "IGZP",
-  "beacon_type": 15,
+  "beacon_type": 14,
   "hertz": 108500000,
   "channel": null
  },
  {
   "name": "ALANYA/GAZIPASA",
   "callsign": "GZP",
-  "beacon_type": 4,
-  "hertz": 114200000,
-  "channel": null
+  "beacon_type": 3,
+  "hertz": 0,
+  "channel": 89
  },
  {
   "name": "GAZIPASA/ALANYA",
@@ -412,20 +370,6 @@
   "hertz": 336000,
   "channel": null
  },
- {
-  "name": "",
-  "callsign": "IHTY",
-  "beacon_type": 15,
-  "hertz": 108150000,
-  "channel": null
- },
- {
-  "name": "",
-  "callsign": "IHTY",
-  "beacon_type": 14,
-  "hertz": 108150000,
-  "channel": null
- },
  {
   "name": "INCIRLIC",
   "callsign": "DAN",
@@ -449,14 +393,14 @@
  },
  {
   "name": "",
-  "callsign": "DANM",
+  "callsign": "IDNA",
   "beacon_type": 15,
   "hertz": 111700000,
   "channel": null
  },
  {
   "name": "",
-  "callsign": "DANM",
+  "callsign": "IDNA",
   "beacon_type": 14,
   "hertz": 111700000,
   "channel": null
@@ -517,6 +461,34 @@
   "hertz": 414000,
   "channel": null
  },
+ {
+  "name": "MEZZEH",
+  "callsign": "MEZ",
+  "beacon_type": 10,
+  "hertz": 358000,
+  "channel": null
+ },
+ {
+  "name": "ALEPPO",
+  "callsign": "ALE",
+  "beacon_type": 10,
+  "hertz": 396000,
+  "channel": null
+ },
+ {
+  "name": "ALEPPO",
+  "callsign": "MER",
+  "beacon_type": 10,
+  "hertz": 365000,
+  "channel": null
+ },
+ {
+  "name": "ALEPPO",
+  "callsign": "ALE",
+  "beacon_type": 4,
+  "hertz": 114500000,
+  "channel": null
+ },
  {
   "name": "PALMYRA",
   "callsign": "PLR",
@@ -566,6 +538,13 @@
   "hertz": 117900000,
   "channel": null
  },
+ {
+  "name": "Pafos",
+  "callsign": "PHA",
+  "beacon_type": 5,
+  "hertz": null,
+  "channel": 79
+ },
  {
   "name": "RAMATDAVID",
   "callsign": "RMD",
@@ -594,6 +573,13 @@
   "hertz": 111100000,
   "channel": null
  },
+ {
+  "name": "ROSH-PINA",
+  "callsign": "ROP",
+  "beacon_type": 4,
+  "hertz": 115300000,
+  "channel": null
+ },
  {
   "name": "Cheka",
   "callsign": "CAK",