diff --git a/prisma/migrations/20241006184406_icao_aircraft_codes/migration.sql b/prisma/migrations/20241006184406_icao_aircraft_codes/migration.sql
new file mode 100644
index 0000000..e4a398f
--- /dev/null
+++ b/prisma/migrations/20241006184406_icao_aircraft_codes/migration.sql
@@ -0,0 +1,19 @@
+UPDATE flight
+SET aircraft = CASE aircraft
+                   WHEN 'A330' THEN 'A333'
+                   WHEN 'EMB1' THEN 'E120'
+                   WHEN 'EMB4' THEN 'E145'
+                   WHEN 'EMB7' THEN 'E170'
+                   WHEN 'A350' THEN 'A359'
+                   WHEN 'A380' THEN 'A388'
+                   WHEN 'B737' THEN 'B738'
+                   WHEN 'B747' THEN 'B744'
+                   WHEN 'B767' THEN 'B763'
+                   WHEN 'B777' THEN 'B772'
+                   WHEN 'B787' THEN 'B789'
+                   WHEN 'AN124' THEN 'A124'
+                   WHEN 'AN225' THEN 'A225'
+                   ELSE aircraft
+    END
+WHERE aircraft IN
+      ('A330', 'EMB1', 'EMB4', 'EMB7', 'A350', 'A380', 'B737', 'B747', 'B767', 'B777', 'B787', 'AN124', 'AN225');
diff --git a/src/lib/data/aircraft.ts b/src/lib/data/aircraft.ts
index dffa43d..1bb0d63 100644
--- a/src/lib/data/aircraft.ts
+++ b/src/lib/data/aircraft.ts
@@ -1,81 +1,26 @@
 export const AIRCRAFT = [
   {
-    name: 'Fokker 100',
-    icao: 'F100',
-    wtc: 'M',
-  },
-  {
-    name: 'BAe 146',
-    icao: 'B461',
-    wtc: 'M',
-  },
-  {
-    name: 'BAe 146',
-    icao: 'B462',
-    wtc: 'M',
-  },
-  {
-    name: 'BAe 146',
-    icao: 'B463',
-    wtc: 'M',
-  },
-  {
-  	name: 'Canadair Regional Jet CRJ-900',
-  	icao: 'CRJ9',
-  	wtc: 'M',
-  },
-  {
-  	name: 'Bombardier DHC-8-100 Dash 8',
-  	icao: 'DH8A',
-  	wtc: 'M',
-  },
-  {
-  	name: 'Bombardier DHC-8-200 Dash 8',
-  	icao: 'DH8B',
-  	wtc: 'M',
-  },
-  {
-  	name: 'Bombardier DHC-8-300 Dash 8',
-  	icao: 'DH8C',
-  	wtc: 'M',
-  },
-  {
-  	name: 'Bombardier DHC-8-400 Dash 8',
-  	icao: 'DH8D',
-  	wtc: 'M',
-  },
-  {
-    name: 'Embraer E170',
-    icao: 'E170',
-    wtc: 'M',
-  },
-  {
-    name: 'Embraer E175 (short wing)',
-    icao: 'E75S',
-    wtc: 'M',
-  },
-  {
-    name: 'Embraer E175 (long wing)',
-    icao: 'E75L',
-    wtc: 'M',
+    name: 'Agusta A109',
+    icao: 'A109',
+    wtc: 'L',
   },
   {
-    name: 'Embraer E190',
-    icao: 'E290',
-    wtc: 'M',
+    name: 'Airbus A300-100/200',
+    icao: 'A30B',
+    wtc: 'H',
   },
   {
-    name: 'Embraer E195',
-    icao: 'E295',
-    wtc: 'M',
+    name: 'Airbus A300-600',
+    icao: 'A306',
+    wtc: 'H',
   },
   {
-    name: 'Airbus A220',
+    name: 'Airbus A220-100',
     icao: 'BCS1',
     wtc: 'M',
   },
   {
-    name: 'Airbus A220',
+    name: 'Airbus A220-300',
     icao: 'BCS3',
     wtc: 'M',
   },
@@ -94,6 +39,11 @@ export const AIRCRAFT = [
     icao: 'A319',
     wtc: 'M',
   },
+  {
+    name: 'Airbus A319',
+    icao: 'A19N',
+    wtc: 'M',
+  },
   {
     name: 'Airbus A320',
     icao: 'A320',
@@ -110,8 +60,13 @@ export const AIRCRAFT = [
     wtc: 'M',
   },
   {
-    name: 'Airbus A330',
-    icao: 'A330',
+    name: 'Airbus A321neo',
+    icao: 'A21N',
+    wtc: 'M',
+  },
+  {
+    name: 'Airbus A330-200',
+    icao: 'A332',
     wtc: 'H',
   },
   {
@@ -125,320 +80,435 @@ export const AIRCRAFT = [
     wtc: 'H',
   },
   {
-    name: 'Airbus A350',
+    name: 'Airbus A340-200',
+    icao: 'A342',
+    wtc: 'H',
+  },
+  {
+    name: 'Airbus A340-300',
+    icao: 'A343',
+    wtc: 'H',
+  },
+  {
+    name: 'Airbus A340-500',
+    icao: 'A345',
+    wtc: 'H',
+  },
+  {
+    name: 'Airbus A340-600',
+    icao: 'A346',
+    wtc: 'H',
+  },
+  {
+    name: 'Airbus A350-900',
     icao: 'A359',
     wtc: 'H',
   },
   {
-    name: 'Airbus A380',
+    name: 'Airbus A350-1000',
+    icao: 'A35K',
+    wtc: 'H',
+  },
+  {
+    name: 'Airbus A380-800',
     icao: 'A388',
     wtc: 'J',
   },
   {
-    name: 'Boeing 707',
-    icao: 'B703',
-    wtc: 'H',
+    name: 'ATR-42-300',
+    icao: 'AT43',
+    wtc: 'M',
   },
   {
-    name: 'Boeing 717',
-    icao: 'B712',
+    name: 'ATR-42-400',
+    icao: 'AT44',
     wtc: 'M',
   },
   {
-    name: 'Boeing 727',
-    icao: 'B721',
+    name: 'ATR-42-500',
+    icao: 'AT45',
     wtc: 'M',
   },
   {
-    name: 'Boeing 727',
-    icao: 'B722',
+    name: 'ATR-42-600',
+    icao: 'AT46',
     wtc: 'M',
   },
   {
-    name: 'Boeing 737',
-    icao: 'B737',
+    name: 'ATR-72-200',
+    icao: 'AT72',
     wtc: 'M',
   },
   {
-    name: 'Boeing 737',
-    icao: 'B738',
+    name: 'ATR-72-210',
+    icao: 'AT73',
     wtc: 'M',
   },
   {
-    name: 'Boeing 747',
-    icao: 'B741',
-    wtc: 'H',
+    name: 'ATR-72-500',
+    icao: 'AT75',
+    wtc: 'M',
   },
   {
-    name: 'Boeing 747',
-    icao: 'B742',
-    wtc: 'H',
+    name: 'Antonov AN-12',
+    icao: 'AN12',
+    wtc: 'M',
   },
   {
-    name: 'Boeing 747',
-    icao: 'B743',
-    wtc: 'H',
+    name: 'Antonov AN-22',
+    icao: 'AN22',
+    wtc: 'L',
   },
   {
-    name: 'Boeing 747',
-    icao: 'B744',
-    wtc: 'H',
+    name: 'Antonov AN-24',
+    icao: 'AN24',
+    wtc: 'M',
   },
   {
-    name: 'Boeing 747SP',
-    icao: 'N74S',
-    wtc: 'H',
+    name: 'Antonov AN-26',
+    icao: 'AN26',
+    wtc: 'L',
   },
   {
-    name: 'Boeing 747SR',
-    icao: 'B74R',
-    wtc: 'H',
+    name: 'Antonov AN-28',
+    icao: 'AN28',
+    wtc: 'L',
   },
   {
-    name: 'Boeing 757',
-    icao: 'B752',
-    wtc: 'H',
+    name: 'Antonov AN-30',
+    icao: 'AN30',
+    wtc: 'L',
   },
   {
-    name: 'Boeing 757',
-    icao: 'B753',
-    wtc: 'H',
+    name: 'Antonov AN-32',
+    icao: 'AN32',
+    wtc: 'L',
   },
   {
-    name: 'Boeing 767',
-    icao: 'B762',
-    wtc: 'H',
+    name: 'Antonov AN-38',
+    icao: 'AN38',
+    wtc: 'L',
   },
   {
-    name: 'Boeing 767',
-    icao: 'B763',
-    wtc: 'H',
+    name: 'Antonov AN-72',
+    icao: 'AN72',
+    wtc: 'M',
   },
   {
-    name: 'Boeing 777',
-    icao: 'B772',
+    name: 'Antonov AN-124',
+    icao: 'A124',
     wtc: 'H',
   },
   {
-    name: 'Boeing 777',
-    icao: 'B773',
-    wtc: 'H',
+    name: 'Antonov AN-140',
+    icao: 'A140',
+    wtc: 'M',
   },
   {
-    name: 'Boeing 787',
-    icao: 'B78X',
-    wtc: 'H',
+    name: 'Antonov AN-148',
+    icao: 'A148',
+    wtc: 'M',
   },
   {
-    name: 'Boeing 787',
-    icao: 'B788',
-    wtc: 'H',
+    name: 'Antonov AN-225',
+    icao: 'A225',
+    wtc: 'J',
   },
   {
-    name: 'Boeing 787',
-    icao: 'B789',
-    wtc: 'H',
+    name: 'Avro RJ70',
+    icao: 'RJ70',
+    wtc: 'M',
   },
   {
-    name: 'Boeing 737 MAX',
-    icao: 'B37M',
+    name: 'Avro RJ85',
+    icao: 'RJ85',
     wtc: 'M',
   },
   {
-    name: 'Boeing 737 MAX',
-    icao: 'B38M',
+    name: 'Avro RJ100',
+    icao: 'RJ1H',
     wtc: 'M',
   },
   {
-    name: 'Boeing 737 MAX',
-    icao: 'B39M',
+    name: 'Ayres LM-200 Loadmaster',
+    icao: 'LOAD',
     wtc: 'M',
   },
   {
-    name: 'Boeing 737 MAX',
-    icao: 'B3XM',
+    name: 'BAe-146-100',
+    icao: 'B461',
     wtc: 'M',
   },
   {
-    name: 'Antonov AN-22',
-    icao: 'AN22',
-    wtc: 'L',
+    name: 'BAe-146-200',
+    icao: 'B462',
+    wtc: 'M',
   },
   {
-    name: 'Antonov AN-26',
-    icao: 'AN26',
+    name: 'BAe-146-300',
+    icao: 'B463',
+    wtc: 'M',
+  },
+  {
+    name: 'Beechcraft Baron',
+    icao: 'BE58',
     wtc: 'L',
   },
   {
-    name: 'Antonov AN-28',
-    icao: 'AN28',
+    name: 'Beechcraft King Air 90',
+    icao: 'BE9L',
     wtc: 'L',
   },
   {
-    name: 'Antonov AN-30',
-    icao: 'AN30',
+    name: 'Beechcraft King Air 200',
+    icao: 'BE20',
     wtc: 'L',
   },
   {
-    name: 'Antonov AN-32',
-    icao: 'AN32',
+    name: 'Beechcraft King Air 350',
+    icao: 'BE30',
     wtc: 'L',
   },
   {
-    name: 'Antonov AN-38',
-    icao: 'AN38',
+    name: 'Beechcraft Super King Air 350',
+    icao: 'BE35',
     wtc: 'L',
   },
   {
-    name: 'Antonov AN-140',
-    icao: 'A140',
+    name: 'Beechcraft 1900',
+    icao: 'BE19',
     wtc: 'M',
   },
   {
-    name: 'Antonov AN-124',
-    icao: 'A124',
-    wtc: 'H',
+    name: 'Bombardier DHC-8-100 Dash 8',
+    icao: 'DH8A',
+    wtc: 'M',
   },
   {
-    name: 'Antonov AN-225',
-    icao: 'A225',
-    wtc: 'H',
+    name: 'Bombardier DHC-8-200 Dash 8',
+    icao: 'DH8B',
+    wtc: 'M',
   },
   {
-    name: 'Antonov AN-148',
-    icao: 'A148',
+    name: 'Bombardier DHC-8-300 Dash 8',
+    icao: 'DH8C',
     wtc: 'M',
   },
   {
-    name: 'Airbus A300',
-    icao: 'A30B',
-    wtc: 'H',
+    name: 'Bombardier DHC-8-400 Dash 8',
+    icao: 'DH8D',
+    wtc: 'M',
   },
   {
-    name: 'Airbus A300-600',
-    icao: 'A306',
+    name: 'Boeing 707-100',
+    icao: 'B701',
     wtc: 'H',
   },
   {
-    name: 'Gulfstream/Rockwell (Aero) Commander',
-    icao: 'AC68',
-    wtc: 'L',
+    name: 'Boeing 707-300',
+    icao: 'B703',
+    wtc: 'H',
   },
   {
-    name: 'Gulfstream/Rockwell (Aero) Turbo Commander',
-    icao: 'AC90',
-    wtc: 'L',
+    name: 'Boeing 717-200',
+    icao: 'B712',
+    wtc: 'M',
   },
   {
-    name: 'Agusta A109',
-    icao: 'A109',
-    wtc: 'L',
+    name: 'Boeing 727-100',
+    icao: 'B721',
+    wtc: 'M',
   },
   {
-    name: 'Ayres LM-200 Loadmaster',
-    icao: 'LOAD',
+    name: 'Boeing 727-200',
+    icao: 'B722',
     wtc: 'M',
   },
   {
-    name: 'Antonov AN-24',
-    icao: 'AN24',
+    name: 'Boeing 737-200',
+    icao: 'B732',
     wtc: 'M',
   },
   {
-    name: 'Antonov AN-72',
-    icao: 'AN72',
+    name: 'Boeing 737-300',
+    icao: 'B733',
     wtc: 'M',
   },
   {
-    name: 'Antonov AN-12',
-    icao: 'AN12',
+    name: 'Boeing 737-400',
+    icao: 'B734',
     wtc: 'M',
   },
   {
-    name: 'Avro RJ',
-    icao: 'RJ1H',
+    name: 'Boeing 737-500',
+    icao: 'B735',
     wtc: 'M',
   },
   {
-    name: 'Aerospatiale/Alenia ATR 42',
-    icao: 'AT43',
+    name: 'Boeing 737-600',
+    icao: 'B736',
     wtc: 'M',
   },
   {
-    name: 'Aerospatiale/Alenia ATR 72',
-    icao: 'AT72',
+    name: 'Boeing 737-700',
+    icao: 'B737',
     wtc: 'M',
   },
   {
-    name: 'British Aerospace ATP',
-    icao: 'ATP',
+    name: 'Boeing 737-800',
+    icao: 'B738',
     wtc: 'M',
   },
   {
-    name: 'Avro RJX',
-    icao: 'RX1H',
+    name: 'Boeing 737-900',
+    icao: 'B739',
     wtc: 'M',
   },
   {
-    name: 'Embraer EMB-120',
-    icao: 'EMB1',
+    name: 'Boeing 737 MAX 7',
+    icao: 'B37M',
     wtc: 'M',
   },
   {
-    name: 'Embraer EMB-145',
-    icao: 'EMB4',
+    name: 'Boeing 737 MAX 8',
+    icao: 'B38M',
     wtc: 'M',
   },
   {
-    name: 'Embraer EMB-170',
-    icao: 'EMB7',
+    name: 'Boeing 737 MAX 9',
+    icao: 'B39M',
     wtc: 'M',
   },
   {
-    name: 'Embraer EMB-190',
-    icao: 'EMB9',
+    name: 'Boeing 737 MAX 10',
+    icao: 'B3XM',
     wtc: 'M',
   },
   {
-    name: 'Airbus A350',
-    icao: 'A350',
+    name: 'Boeing 747-100',
+    icao: 'B741',
     wtc: 'H',
   },
   {
-    name: 'Airbus A380',
-    icao: 'A380',
-    wtc: 'J',
+    name: 'Boeing 747-200',
+    icao: 'B742',
+    wtc: 'H',
   },
   {
-    name: 'Boeing 747',
-    icao: 'B747',
+    name: 'Boeing 747-300',
+    icao: 'B743',
     wtc: 'H',
   },
   {
-    name: 'Boeing 767',
-    icao: 'B767',
+    name: 'Boeing 747-400',
+    icao: 'B744',
     wtc: 'H',
   },
   {
-    name: 'Boeing 777',
-    icao: 'B777',
+    name: 'Boeing 747-8',
+    icao: 'B748',
     wtc: 'H',
   },
   {
-    name: 'Boeing 787',
-    icao: 'B787',
+    name: 'Boeing 747SP',
+    icao: 'N74S',
     wtc: 'H',
   },
   {
-    name: 'Antonov AN-124',
-    icao: 'AN124',
+    name: 'Boeing 747SR',
+    icao: 'B74R',
     wtc: 'H',
   },
   {
-    name: 'Antonov AN-225',
-    icao: 'AN225',
+    name: 'Boeing 757-200',
+    icao: 'B752',
+    wtc: 'H',
+  },
+  {
+    name: 'Boeing 757-300',
+    icao: 'B753',
+    wtc: 'H',
+  },
+  {
+    name: 'Boeing 767-200',
+    icao: 'B762',
+    wtc: 'H',
+  },
+  {
+    name: 'Boeing 767-300',
+    icao: 'B763',
+    wtc: 'H',
+  },
+  {
+    name: 'Boeing 767-400',
+    icao: 'B764',
+    wtc: 'H',
+  },
+  {
+    name: 'Boeing 777-200/ER',
+    icao: 'B772',
+    wtc: 'H',
+  },
+  {
+    name: 'Boeing 777-200LR',
+    icao: 'B77L',
     wtc: 'H',
   },
+  {
+    name: 'Boeing 777-300',
+    icao: 'B773',
+    wtc: 'H',
+  },
+  {
+    name: 'Boeing 777-300ER',
+    icao: 'B77W',
+    wtc: 'H',
+  },
+  {
+    name: 'Boeing 787-8',
+    icao: 'B788',
+    wtc: 'H',
+  },
+  {
+    name: 'Boeing 787-9',
+    icao: 'B789',
+    wtc: 'H',
+  },
+  {
+    name: 'Boeing 787-10',
+    icao: 'B78X',
+    wtc: 'H',
+  },
+  {
+    name: 'British Aerospace ATP',
+    icao: 'ATP',
+    wtc: 'M',
+  },
+  {
+    name: 'Canadair Regional Jet CRJ-100',
+    icao: 'CRJ1',
+    wtc: 'M',
+  },
+  {
+    name: 'Canadair Regional Jet CRJ-200',
+    icao: 'CRJ2',
+    wtc: 'M',
+  },
+  {
+    name: 'Canadair Regional Jet CRJ-550/700',
+    icao: 'CRJ7',
+    wtc: 'M',
+  },
+  {
+    name: 'Canadair Regional Jet CRJ-900',
+    icao: 'CRJ9',
+    wtc: 'M',
+  },
+  {
+    name: 'Canadair Regional Jet CRJ-1000',
+    icao: 'CRJX',
+    wtc: 'M',
+  },
   {
     name: 'Cessna 172',
     icao: 'C172',
@@ -500,33 +570,63 @@ export const AIRCRAFT = [
     wtc: 'L',
   },
   {
-    name: 'Beechcraft Baron',
-    icao: 'BE58',
-    wtc: 'L',
+    name: 'Embraer EMB-120 Brasilia',
+    icao: 'E120',
+    wtc: 'M',
   },
   {
-    name: 'Beechcraft King Air 90',
-    icao: 'BE9L',
-    wtc: 'L',
+    name: 'Embraer ERJ-135',
+    icao: 'E135',
+    wtc: 'M',
   },
   {
-    name: 'Beechcraft King Air 200',
-    icao: 'BE20',
-    wtc: 'L',
+    name: 'Embraer ERJ-145',
+    icao: 'E145',
+    wtc: 'M',
   },
   {
-    name: 'Beechcraft King Air 350',
-    icao: 'BE30',
-    wtc: 'L',
+    name: 'Embraer ERJ-170',
+    icao: 'E170',
+    wtc: 'M',
   },
   {
-    name: 'Beechcraft Super King Air 350',
-    icao: 'BE35',
-    wtc: 'L',
+    name: 'Embraer E175 (short wing)',
+    icao: 'E75S',
+    wtc: 'M',
   },
   {
-    name: 'Beechcraft 1900',
-    icao: 'BE19',
+    name: 'Embraer E175 (long wing)',
+    icao: 'E75L',
+    wtc: 'M',
+  },
+  {
+    name: 'Embraer ERJ-190',
+    icao: 'EMB9',
     wtc: 'M',
   },
+  {
+    name: 'Embraer E190 E2',
+    icao: 'E290',
+    wtc: 'M',
+  },
+  {
+    name: 'Embraer E195 E2',
+    icao: 'E295',
+    wtc: 'M',
+  },
+  {
+    name: 'Fokker 100',
+    icao: 'F100',
+    wtc: 'M',
+  },
+  {
+    name: 'Gulfstream/Rockwell (Aero) Commander',
+    icao: 'AC68',
+    wtc: 'L',
+  },
+  {
+    name: 'Gulfstream/Rockwell (Aero) Turbo Commander',
+    icao: 'AC90',
+    wtc: 'L',
+  },
 ] as const;