From d169a67833a9d7c8d2a21dfced0c509f57a2356b Mon Sep 17 00:00:00 2001
From: yugi-classic <113375742+yugi-classic@users.noreply.github.com>
Date: Sun, 4 May 2025 00:37:30 +0200
Subject: [PATCH] fix: correct data for sets tk-ex-latia, tk-ex-latio, tk-ex-m,
 tk-ex-p, tk-bw-e, tk-bw-z (#726)

Co-authored-by: Avior <github@avior.me>
---
 ...rill).ts => BW trainer Kit (Excadrill).ts} |  6 +-
 .../BW trainer Kit (Excadrill)/1.ts           | 61 ++++++++++++++++
 .../10.ts                                     |  6 +-
 .../BW trainer Kit (Excadrill)/11.ts          | 49 +++++++++++++
 .../BW trainer Kit (Excadrill)/12.ts          | 52 ++++++++++++++
 .../BW trainer Kit (Excadrill)/13.ts          | 62 ++++++++++++++++
 .../BW trainer Kit (Excadrill)/14.ts          | 67 +++++++++++++++++
 .../15.ts                                     |  7 +-
 .../16.ts                                     |  7 +-
 .../17.ts                                     | 70 ++++++++++--------
 .../BW trainer Kit (Excadrill)/18.ts          | 52 ++++++++++++++
 .../BW trainer Kit (Excadrill)/19.ts          | 69 ++++++++++++++++++
 .../2.ts                                      |  6 +-
 .../20.ts                                     |  6 +-
 .../21.ts                                     |  7 +-
 .../22.ts                                     |  6 +-
 .../23.ts                                     |  7 +-
 .../24.ts                                     |  7 +-
 .../BW trainer Kit (Excadrill)/25.ts          | 60 ++++++++++++++++
 .../26.ts                                     |  6 +-
 .../BW trainer Kit (Excadrill)/27.ts          | 61 ++++++++++++++++
 .../28.ts                                     |  6 +-
 .../BW trainer Kit (Excadrill)/29.ts          | 49 +++++++++++++
 .../3.ts                                      |  6 +-
 .../30.ts                                     | 70 ++++++++++--------
 .../4.ts                                      |  7 +-
 .../5.ts                                      |  6 +-
 .../6.ts                                      |  6 +-
 .../7.ts                                      |  6 +-
 .../8.ts                                      |  6 +-
 .../9.ts                                      |  6 +-
 ...oroark).ts => BW trainer Kit (Zoroark).ts} |  4 +-
 .../BW trainer Kit (Zoroark)/1.ts             | 60 ++++++++++++++++
 .../10.ts                                     |  6 +-
 .../11.ts                                     |  7 +-
 .../BW trainer Kit (Zoroark)/12.ts            | 55 ++++++++++++++
 .../BW trainer Kit (Zoroark)/13.ts            | 55 ++++++++++++++
 .../BW trainer Kit (Zoroark)/14.ts            | 54 ++++++++++++++
 .../15.ts                                     | 38 ++++++++--
 .../16.ts                                     |  7 +-
 .../17.ts                                     | 57 ++++++++-------
 .../18.ts                                     |  7 +-
 .../BW trainer Kit (Zoroark)/19.ts            | 49 +++++++++++++
 .../BW trainer Kit (Zoroark)/2.ts             | 71 +++++++++++++++++++
 .../20.ts                                     |  6 +-
 .../BW trainer Kit (Zoroark)/21.ts            | 54 ++++++++++++++
 .../22.ts                                     |  6 +-
 .../BW trainer Kit (Zoroark)/23.ts            | 55 ++++++++++++++
 .../24.ts                                     |  6 +-
 .../BW trainer Kit (Zoroark)/25.ts            | 60 ++++++++++++++++
 .../26.ts                                     |  6 +-
 .../27.ts                                     |  7 +-
 .../28.ts                                     |  6 +-
 .../BW trainer Kit (Zoroark)/29.ts            | 55 ++++++++++++++
 .../3.ts                                      |  6 +-
 .../30.ts                                     | 57 ++++++++-------
 .../BW trainer Kit (Zoroark)/4.ts             | 49 +++++++++++++
 .../5.ts                                      |  6 +-
 .../6.ts                                      |  6 +-
 .../7.ts                                      |  6 +-
 .../8.ts                                      |  6 +-
 .../9.ts                                      |  6 +-
 .../Trainer kits/EX trainer Kit (Latias)/1.ts | 21 ++++--
 .../EX trainer Kit (Latias)/10.ts             | 17 +++++
 .../Trainer kits/EX trainer Kit (Latias)/2.ts | 38 ++++++++--
 .../Trainer kits/EX trainer Kit (Latias)/3.ts | 40 +++++++++--
 .../Trainer kits/EX trainer Kit (Latias)/4.ts | 34 +++++++--
 .../Trainer kits/EX trainer Kit (Latias)/5.ts | 33 +++++++--
 .../Trainer kits/EX trainer Kit (Latias)/6.ts | 34 +++++++--
 .../Trainer kits/EX trainer Kit (Latias)/7.ts | 29 ++++++--
 .../Trainer kits/EX trainer Kit (Latias)/8.ts | 19 +++++
 .../Trainer kits/EX trainer Kit (Latias)/9.ts | 19 +++++
 .../Trainer kits/EX trainer Kit (Latios)/1.ts | 31 +++++++-
 .../EX trainer Kit (Latios)/10.ts             | 17 +++++
 .../Trainer kits/EX trainer Kit (Latios)/2.ts | 35 +++++++--
 .../Trainer kits/EX trainer Kit (Latios)/3.ts | 37 ++++++++--
 .../Trainer kits/EX trainer Kit (Latios)/4.ts | 35 +++++++--
 .../Trainer kits/EX trainer Kit (Latios)/5.ts | 39 ++++++++--
 .../Trainer kits/EX trainer Kit (Latios)/6.ts | 29 ++++++--
 .../Trainer kits/EX trainer Kit (Latios)/7.ts | 28 ++++++--
 .../Trainer kits/EX trainer Kit (Latios)/8.ts | 19 +++++
 .../Trainer kits/EX trainer Kit (Latios)/9.ts | 19 +++++
 ...(Ninun).ts => EX trainer Kit 2 (Minun).ts} |  4 +-
 .../1.ts                                      | 41 ++++++++---
 .../EX trainer Kit 2 (Minun)/10.ts            | 19 +++++
 .../EX trainer Kit 2 (Minun)/11.ts            | 18 +++++
 .../EX trainer Kit 2 (Minun)/12.ts            | 18 +++++
 .../2.ts                                      | 30 ++++++--
 .../3.ts                                      | 41 ++++++++---
 .../4.ts                                      | 31 ++++++--
 .../5.ts                                      | 35 ++++++---
 .../6.ts                                      | 42 ++++++++---
 .../EX trainer Kit 2 (Minun)/7.ts             | 55 ++++++++++++++
 .../EX trainer Kit 2 (Minun)/8.ts             | 21 ++++++
 .../EX trainer Kit 2 (Minun)/9.ts             | 19 +++++
 .../EX trainer Kit 2 (Plusle)/1.ts            | 27 +++++--
 .../EX trainer Kit 2 (Plusle)/10.ts           | 21 ++++++
 .../EX trainer Kit 2 (Plusle)/11.ts           | 18 +++++
 .../EX trainer Kit 2 (Plusle)/12.ts           | 18 +++++
 .../EX trainer Kit 2 (Plusle)/2.ts            | 57 +++++++++++++++
 .../EX trainer Kit 2 (Plusle)/3.ts            | 58 +++++++++++++++
 .../EX trainer Kit 2 (Plusle)/4.ts            | 28 ++++++--
 .../EX trainer Kit 2 (Plusle)/5.ts            | 64 +++++++++++++++++
 .../EX trainer Kit 2 (Plusle)/6.ts            | 40 +++++++++--
 .../EX trainer Kit 2 (Plusle)/7.ts            | 46 ++++++++++++
 .../EX trainer Kit 2 (Plusle)/8.ts            | 19 +++++
 .../EX trainer Kit 2 (Plusle)/9.ts            | 19 +++++
 .../HS trainer Kit (Excadrill)/1.ts           | 30 --------
 .../HS trainer Kit (Excadrill)/11.ts          | 30 --------
 .../HS trainer Kit (Excadrill)/12.ts          | 30 --------
 .../HS trainer Kit (Excadrill)/13.ts          | 35 ---------
 .../HS trainer Kit (Excadrill)/14.ts          | 40 -----------
 .../HS trainer Kit (Excadrill)/18.ts          | 30 --------
 .../HS trainer Kit (Excadrill)/19.ts          | 40 -----------
 .../HS trainer Kit (Excadrill)/25.ts          | 35 ---------
 .../HS trainer Kit (Excadrill)/27.ts          | 30 --------
 .../HS trainer Kit (Excadrill)/29.ts          | 30 --------
 .../HS trainer Kit (Zoroark)/1.ts             | 35 ---------
 .../HS trainer Kit (Zoroark)/12.ts            | 30 --------
 .../HS trainer Kit (Zoroark)/13.ts            | 35 ---------
 .../HS trainer Kit (Zoroark)/14.ts            | 35 ---------
 .../HS trainer Kit (Zoroark)/19.ts            | 30 --------
 .../HS trainer Kit (Zoroark)/2.ts             | 40 -----------
 .../HS trainer Kit (Zoroark)/21.ts            | 35 ---------
 .../HS trainer Kit (Zoroark)/23.ts            | 35 ---------
 .../HS trainer Kit (Zoroark)/25.ts            | 35 ---------
 .../HS trainer Kit (Zoroark)/29.ts            | 30 --------
 .../HS trainer Kit (Zoroark)/4.ts             | 30 --------
 128 files changed, 2709 insertions(+), 1068 deletions(-)
 rename data/Trainer kits/{HS trainer Kit (Excadrill).ts => BW trainer Kit (Excadrill).ts} (67%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Excadrill)/1.ts
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/10.ts (76%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Excadrill)/11.ts
 create mode 100644 data/Trainer kits/BW trainer Kit (Excadrill)/12.ts
 create mode 100644 data/Trainer kits/BW trainer Kit (Excadrill)/13.ts
 create mode 100644 data/Trainer kits/BW trainer Kit (Excadrill)/14.ts
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/15.ts (82%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/16.ts (91%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/17.ts (82%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Excadrill)/18.ts
 create mode 100644 data/Trainer kits/BW trainer Kit (Excadrill)/19.ts
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/2.ts (76%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/20.ts (76%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/21.ts (90%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/22.ts (76%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/23.ts (82%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/24.ts (93%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Excadrill)/25.ts
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/26.ts (76%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Excadrill)/27.ts
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/28.ts (76%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Excadrill)/29.ts
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/3.ts (76%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/30.ts (82%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/4.ts (87%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/5.ts (76%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/6.ts (76%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/7.ts (76%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/8.ts (76%)
 rename data/Trainer kits/{HS trainer Kit (Excadrill) => BW trainer Kit (Excadrill)}/9.ts (76%)
 rename data/Trainer kits/{HS trainer Kit (Zoroark).ts => BW trainer Kit (Zoroark).ts} (82%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Zoroark)/1.ts
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/10.ts (77%)
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/11.ts (91%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Zoroark)/12.ts
 create mode 100644 data/Trainer kits/BW trainer Kit (Zoroark)/13.ts
 create mode 100644 data/Trainer kits/BW trainer Kit (Zoroark)/14.ts
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/15.ts (51%)
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/16.ts (87%)
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/17.ts (84%)
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/18.ts (93%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Zoroark)/19.ts
 create mode 100644 data/Trainer kits/BW trainer Kit (Zoroark)/2.ts
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/20.ts (77%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Zoroark)/21.ts
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/22.ts (77%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Zoroark)/23.ts
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/24.ts (77%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Zoroark)/25.ts
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/26.ts (77%)
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/27.ts (90%)
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/28.ts (77%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Zoroark)/29.ts
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/3.ts (77%)
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/30.ts (84%)
 create mode 100644 data/Trainer kits/BW trainer Kit (Zoroark)/4.ts
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/5.ts (77%)
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/6.ts (77%)
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/7.ts (77%)
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/8.ts (77%)
 rename data/Trainer kits/{HS trainer Kit (Zoroark) => BW trainer Kit (Zoroark)}/9.ts (77%)
 create mode 100644 data/Trainer kits/EX trainer Kit (Latias)/10.ts
 create mode 100644 data/Trainer kits/EX trainer Kit (Latias)/8.ts
 create mode 100644 data/Trainer kits/EX trainer Kit (Latias)/9.ts
 create mode 100644 data/Trainer kits/EX trainer Kit (Latios)/10.ts
 create mode 100644 data/Trainer kits/EX trainer Kit (Latios)/8.ts
 create mode 100644 data/Trainer kits/EX trainer Kit (Latios)/9.ts
 rename data/Trainer kits/{EX trainer Kit 2 (Ninun).ts => EX trainer Kit 2 (Minun).ts} (88%)
 rename data/Trainer kits/{EX trainer Kit 2 (Ninun) => EX trainer Kit 2 (Minun)}/1.ts (52%)
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Minun)/10.ts
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Minun)/11.ts
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Minun)/12.ts
 rename data/Trainer kits/{EX trainer Kit 2 (Ninun) => EX trainer Kit 2 (Minun)}/2.ts (55%)
 rename data/Trainer kits/{EX trainer Kit 2 (Ninun) => EX trainer Kit 2 (Minun)}/3.ts (56%)
 rename data/Trainer kits/{EX trainer Kit 2 (Ninun) => EX trainer Kit 2 (Minun)}/4.ts (54%)
 rename data/Trainer kits/{EX trainer Kit 2 (Ninun) => EX trainer Kit 2 (Minun)}/5.ts (65%)
 rename data/Trainer kits/{EX trainer Kit 2 (Ninun) => EX trainer Kit 2 (Minun)}/6.ts (62%)
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Minun)/7.ts
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Minun)/8.ts
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Minun)/9.ts
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Plusle)/10.ts
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Plusle)/11.ts
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Plusle)/12.ts
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Plusle)/2.ts
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Plusle)/3.ts
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Plusle)/5.ts
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Plusle)/7.ts
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Plusle)/8.ts
 create mode 100644 data/Trainer kits/EX trainer Kit 2 (Plusle)/9.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Excadrill)/1.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Excadrill)/11.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Excadrill)/12.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Excadrill)/13.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Excadrill)/14.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Excadrill)/18.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Excadrill)/19.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Excadrill)/25.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Excadrill)/27.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Excadrill)/29.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Zoroark)/1.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Zoroark)/12.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Zoroark)/13.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Zoroark)/14.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Zoroark)/19.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Zoroark)/2.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Zoroark)/21.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Zoroark)/23.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Zoroark)/25.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Zoroark)/29.ts
 delete mode 100644 data/Trainer kits/HS trainer Kit (Zoroark)/4.ts

diff --git a/data/Trainer kits/HS trainer Kit (Excadrill).ts b/data/Trainer kits/BW trainer Kit (Excadrill).ts
similarity index 67%
rename from data/Trainer kits/HS trainer Kit (Excadrill).ts
rename to data/Trainer kits/BW trainer Kit (Excadrill).ts
index 179543158..1646ef49d 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill).ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill).ts	
@@ -5,9 +5,9 @@ const set: Set = {
 	id: "tk-bw-e",
 
 	name: {
-		en: "HS trainer Kit (Excadrill)",
-		fr: "HS Kit du dresseur (Minitaupe)",
-		es: "Kit de Entrenador HeatGold & SoulSilver (Excadrill)",
+		en: "BW trainer Kit (Excadrill)",
+		fr: "BW Kit du dresseur (Minitaupe)",
+		es: "Kit de Entrenador BW (Excadrill)",
 	},
 
 	serie: serie,
diff --git a/data/Trainer kits/BW trainer Kit (Excadrill)/1.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/1.ts
new file mode 100644
index 000000000..d7ea66290
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/1.ts	
@@ -0,0 +1,61 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Excadrill).ts'
+
+const card: Card = {
+	dexId: [506],
+	set: Set,
+
+	name: {
+		en: "Lillipup",
+		fr: "Ponchiot",
+		es: "Lillipup",
+		it: "Lillipup",
+		pt: "Lillipup",
+		de: "Yorkleff"
+	},
+
+	illustrator: "Mosakazu Fukuda",
+	rarity: "None",
+	category: "Pokemon",
+	stage: "Basic",
+
+	hp: 50,
+
+	types: [
+		"Colorless"
+	],
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Pickup"
+		},
+		effect: {
+			en: "Put an Item card from your discard pile into your hand."
+		}
+	}, {
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Bite"
+		},
+		damage: 10
+	}],
+
+	weaknesses: [{
+		type: "Fighting",
+		value: "×2"
+	}],
+
+	description: {
+		en: "It faces strong opponents with great courage. But, when at a disadvantage in a fight, this intelligent Pokémon flees."
+	},
+
+	retreat: 1,
+
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/10.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/10.ts
similarity index 76%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/10.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/10.ts
index 544050dd2..c90198226 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/10.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/10.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Kampf-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Excadrill)/11.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/11.ts
new file mode 100644
index 000000000..00c04b9d0
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/11.ts	
@@ -0,0 +1,49 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Excadrill).ts'
+
+const card: Card = {
+	dexId: [532],
+	set: Set,
+
+	name: {
+		en: "Timburr",
+		fr: "Charpenti",
+		es: "Timburr",
+		it: "Timburr",
+		pt: "Timburr",
+		de: "Praktibalk"
+	},
+
+	illustrator: "match",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 60,
+	types: ["Fighting"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Fighting",
+			"Fighting"
+		],
+		name: {
+			en: "Pound"
+		},
+		damage: 30
+	}],
+
+	weaknesses: [
+		{
+			type: "Psychic",
+			value: "2x"
+		},
+	],
+
+	description: {
+		en: "It fights by swinging a piece of lumber around. It is close to evolving when it can handle the lumber without difficulty."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Excadrill)/12.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/12.ts
new file mode 100644
index 000000000..78f67c394
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/12.ts	
@@ -0,0 +1,52 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Excadrill).ts'
+
+const card: Card = {
+	dexId: [531],
+	set: Set,
+
+	name: {
+		en: "Audino",
+		fr: "Nanméouïe",
+		es: "Audino",
+		it: "Audino",
+		pt: "Audino",
+		de: "Ohrdoch"
+	},
+
+	illustrator: "MAHOU",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 80,
+	types: ["Colorless"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Doubleslap"
+		},
+		effect: {
+			en: "Flip 2 coins. This attack does 30 damage times the number of heads."
+		},
+		damage: "30x"
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	description: {
+		en: "It touches others with the feelers on its ears, using the sound of their heartbeats to tell how they are feeling."
+	},
+
+	retreat: 2,
+}
+
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Excadrill)/13.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/13.ts
new file mode 100644
index 000000000..774a27745
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/13.ts	
@@ -0,0 +1,62 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Excadrill).ts'
+
+const card: Card = {
+	dexId: [529],
+	set: Set,
+
+	name: {
+		en: "Drilbur",
+		fr: "Rototaupe",
+		es: "Drilbur",
+		it: "Drilbur",
+		pt: "Drilbur",
+		de: "Rotomurf"
+	},
+
+	rarity: "None",
+	category: "Pokemon",
+	hp: 70,
+	types: ["Fighting"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Hone Claws"
+		},
+		effect: {
+			en: "During your next turn, each of this Pokémon's attacks does 30 more damage (before applying Weakness and Ressistance)."
+		}
+	}, {
+		cost: [
+			"Fighting",
+		],
+		name: {
+			en: "Scratch"
+		},
+		damage: 10
+	}],
+
+	weaknesses: [
+		{
+			type: "Water",
+			value: "2x"
+		},
+	],
+
+	resistances: [{
+		type: "Lightning",
+		value: "-20"
+	}],
+
+	description: {
+		en: "It can dig through the ground at a speed of 30 mph. It could give a car running aboveground a good race."
+	},
+
+	retreat: 2,
+}
+
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Excadrill)/14.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/14.ts
new file mode 100644
index 000000000..a69b42fb0
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/14.ts	
@@ -0,0 +1,67 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Excadrill).ts'
+
+const card: Card = {
+	dexId: [533],
+	set: Set,
+
+	name: {
+		en: "Gurdurr",
+		fr: "Ouvrifier",
+		es: "Gurdurr",
+		it: "Gurdurr",
+		pt: "Gurdurr",
+		de: "Strepoli"
+	},
+
+	rarity: "None",
+	category: "Pokemon",
+	hp: 80,
+	types: ["Fighting"],
+
+	evolveFrom: {
+		en: "Timburr",
+		fr: "Charpenti",
+		es: "Timburr",
+		it: "Timburr",
+		pt: "Timburr",
+		de: "Praktibalk"
+	},
+
+	stage: "Stage1",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Bulk Up"
+		},
+		effect: {
+			en: "During your next turn, each of this Pokémon's attacks does 20 more damage (before applying Weakness and Resistance)."
+		}
+	}, {
+		cost: [
+			"Fighting",
+			"Fighting",
+			"Colorless"
+		],
+		name: {
+			en: "Pound"
+		},
+		damage: 60
+	}],
+
+	weaknesses: [{
+		type: "Psychic",
+		value: "×2"
+	}],
+
+	description: {
+		en: "They strengthen their bodies by carrying steel beams. They show off their big muscles to their friends."
+	},
+
+	retreat: 2,
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/15.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/15.ts
similarity index 82%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/15.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/15.ts
index ae873e38a..4a39a9b07 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/15.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/15.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,8 +13,9 @@ const card: Card = {
 		de: "Trank"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Trainer",
+	illustrator: "Ayaka Yoshida",
 
 	effect: {
 		en: "Heal 30 damage from 1 of your Pokémon.",
@@ -28,4 +29,4 @@ const card: Card = {
 	trainerType: "Item"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/16.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/16.ts
similarity index 91%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/16.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/16.ts
index 5b54689a6..e60d7af20 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/16.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/16.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,8 +13,9 @@ const card: Card = {
 		de: "PlusPower"
 	},
 
-	rarity: "Uncommon",
+	rarity: "None",
 	category: "Trainer",
+	illustrator: "5ban Graphics",
 
 	effect: {
 		en: "During this turn, your Pokémon’s attacks do 10 more damage to the Active Pokémon (before applying Weakness and Resistance).",
@@ -28,4 +29,4 @@ const card: Card = {
 	trainerType: "Item"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/17.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/17.ts
similarity index 82%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/17.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/17.ts
index ee048d4d0..ab4542350 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/17.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/17.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	dexId: [530],
@@ -14,37 +14,11 @@ const card: Card = {
 		de: "Stalobor"
 	},
 
-	illustrator: "5ban Graphics",
 	rarity: "None",
 	category: "Pokemon",
-
-	description: {
-		en: "It can help in tunnel construction. Its drill has evolved into steel strong enough to bore through iron plates."
-	},
-
+	illustrator: "5ban Graphics",
 	stage: "Stage1",
 
-	attacks: [{
-		name: {
-			en: "Metal Claw"
-		},
-
-		damage: 30
-	}, {
-		name: {
-			en: "Drill Run"
-		},
-
-		damage: 80,
-
-		effect: {
-			en: "Discard an Energy attached to the Defending Pokémon."
-		}
-	}],
-
-	hp: 110,
-	types: ["Fighting"],
-
 	evolveFrom: {
 		en: "Drilbur",
 		fr: "Rototaupe",
@@ -54,7 +28,35 @@ const card: Card = {
 		de: "Rotomurf"
 	},
 
-	retreat: 2,
+	hp: 110,
+
+	types: [
+		"Fighting"
+	],
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Metal Claw"
+		},
+
+		damage: 30
+	}, {
+		cost: [
+			"Fighting",
+			"Fighting",
+			"Fighting"
+		],
+		name: {
+			en: "Drill Run"
+		},
+		effect: {
+			en: "Discard an Energy attached to the Defending Pokémon."
+		},
+		damage: 80,
+	}],
 
 	weaknesses: [{
 		type: "Water",
@@ -64,7 +66,13 @@ const card: Card = {
 	resistances: [{
 		type: "Lightning",
 		value: "-20"
-	}]
+	}],
+
+	description: {
+		en: "It can help in tunnel construction. Its drill has evolved into steel strong enough to bore through iron plates."
+	},
+
+	retreat: 2,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Excadrill)/18.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/18.ts
new file mode 100644
index 000000000..78f67c394
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/18.ts	
@@ -0,0 +1,52 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Excadrill).ts'
+
+const card: Card = {
+	dexId: [531],
+	set: Set,
+
+	name: {
+		en: "Audino",
+		fr: "Nanméouïe",
+		es: "Audino",
+		it: "Audino",
+		pt: "Audino",
+		de: "Ohrdoch"
+	},
+
+	illustrator: "MAHOU",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 80,
+	types: ["Colorless"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Doubleslap"
+		},
+		effect: {
+			en: "Flip 2 coins. This attack does 30 damage times the number of heads."
+		},
+		damage: "30x"
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	description: {
+		en: "It touches others with the feelers on its ears, using the sound of their heartbeats to tell how they are feeling."
+	},
+
+	retreat: 2,
+}
+
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Excadrill)/19.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/19.ts
new file mode 100644
index 000000000..0bdfeb884
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/19.ts	
@@ -0,0 +1,69 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Excadrill).ts'
+
+const card: Card = {
+	dexId: [507],
+	set: Set,
+
+	name: {
+		en: "Herdier",
+		fr: "Ponchien",
+		es: "Herdier",
+		it: "Herdier",
+		pt: "Herdier",
+		de: "Terribark"
+	},
+
+	illustrator: "Midori Harada",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 80,
+	types: ["Colorless"],
+
+	evolveFrom: {
+		en: "Lillipup",
+		fr: "Ponchiot",
+		es: "Lillipup",
+		it: "Lillipup",
+		pt: "Lillipup",
+		de: "Yorkleff"
+	},
+
+	stage: "Stage1",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Collect"
+		},
+		effect: {
+			en: "Draw 3 cards."
+		}
+	}, {
+		cost: [
+			"Colorless",
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Bite"
+		},
+		damage: 50
+	}],
+
+	weaknesses: [{
+		type: "Fighting",
+		value: "×2"
+	}],
+
+	description: {
+		en: "It loyally follows its Trainer's orders. For ages, they have helped Trainers raise Pokémon."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/2.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/2.ts
similarity index 76%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/2.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/2.ts
index 544050dd2..c90198226 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/2.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/2.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Kampf-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/20.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/20.ts
similarity index 76%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/20.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/20.ts
index 544050dd2..c90198226 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/20.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/20.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Kampf-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/21.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/21.ts
similarity index 90%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/21.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/21.ts
index 340285cf6..311a669c6 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/21.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/21.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,8 +13,9 @@ const card: Card = {
 		de: "Energiesuche"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Trainer",
+	illustrator: "Ryo Ueda",
 
 	effect: {
 		en: "Search your deck for a basic Energy card, reveal it, and put it into your hand. Shuffle your deck afterward.",
@@ -28,4 +29,4 @@ const card: Card = {
 	trainerType: "Item"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/22.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/22.ts
similarity index 76%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/22.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/22.ts
index 544050dd2..c90198226 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/22.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/22.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Kampf-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/23.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/23.ts
similarity index 82%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/23.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/23.ts
index ae873e38a..4a39a9b07 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/23.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/23.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,8 +13,9 @@ const card: Card = {
 		de: "Trank"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Trainer",
+	illustrator: "Ayaka Yoshida",
 
 	effect: {
 		en: "Heal 30 damage from 1 of your Pokémon.",
@@ -28,4 +29,4 @@ const card: Card = {
 	trainerType: "Item"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/24.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/24.ts
similarity index 93%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/24.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/24.ts
index 571507119..e48aad786 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/24.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/24.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,8 +13,9 @@ const card: Card = {
 		de: "Pokémon-Kommunikation"
 	},
 
-	rarity: "Uncommon",
+	rarity: "None",
 	category: "Trainer",
+	illustrator: "5ban Graphics",
 
 	effect: {
 		en: "Reveal a Pokémon in your hand and put it on top of your deck. If you do, search your deck for a Pokémon, reveal it, and put it into your hand. Shuffle your deck afterward.",
@@ -28,4 +29,4 @@ const card: Card = {
 	trainerType: "Item"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Excadrill)/25.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/25.ts
new file mode 100644
index 000000000..b9b3bc5b8
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/25.ts	
@@ -0,0 +1,60 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Excadrill).ts'
+
+const card: Card = {
+	dexId: [529],
+	set: Set,
+
+	name: {
+		en: "Drilbur",
+		fr: "Rototaupe",
+		es: "Drilbur",
+		it: "Drilbur",
+		pt: "Drilbur",
+		de: "Rotomurf"
+	},
+
+	rarity: "None",
+	category: "Pokemon",
+	hp: 70,
+	types: ["Fighting"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Hone Claws"
+		},
+		effect: {
+			en: "During your next turn, each of this Pokémon's attacks does 30 more damage (before applying Weakness and Ressistance)."
+		}
+	}, {
+		cost: [
+			"Fighting",
+		],
+		name: {
+			en: "Scratch"
+		},
+		damage: 10
+	}],
+
+	weaknesses: [{
+		type: "Water",
+		value: "×2"
+	}],
+
+	resistances: [{
+		type: "Lightning",
+		value: "-20"
+	}],
+
+	description: {
+		en: "It can dig through the ground at a speed of 30 mph. It could give a car running aboveground a good race."
+	},
+
+	retreat: 2,
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/26.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/26.ts
similarity index 76%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/26.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/26.ts
index 544050dd2..c90198226 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/26.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/26.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Kampf-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Excadrill)/27.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/27.ts
new file mode 100644
index 000000000..d7ea66290
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/27.ts	
@@ -0,0 +1,61 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Excadrill).ts'
+
+const card: Card = {
+	dexId: [506],
+	set: Set,
+
+	name: {
+		en: "Lillipup",
+		fr: "Ponchiot",
+		es: "Lillipup",
+		it: "Lillipup",
+		pt: "Lillipup",
+		de: "Yorkleff"
+	},
+
+	illustrator: "Mosakazu Fukuda",
+	rarity: "None",
+	category: "Pokemon",
+	stage: "Basic",
+
+	hp: 50,
+
+	types: [
+		"Colorless"
+	],
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Pickup"
+		},
+		effect: {
+			en: "Put an Item card from your discard pile into your hand."
+		}
+	}, {
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Bite"
+		},
+		damage: 10
+	}],
+
+	weaknesses: [{
+		type: "Fighting",
+		value: "×2"
+	}],
+
+	description: {
+		en: "It faces strong opponents with great courage. But, when at a disadvantage in a fight, this intelligent Pokémon flees."
+	},
+
+	retreat: 1,
+
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/28.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/28.ts
similarity index 76%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/28.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/28.ts
index 544050dd2..c90198226 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/28.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/28.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Kampf-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Excadrill)/29.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/29.ts
new file mode 100644
index 000000000..00c04b9d0
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/29.ts	
@@ -0,0 +1,49 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Excadrill).ts'
+
+const card: Card = {
+	dexId: [532],
+	set: Set,
+
+	name: {
+		en: "Timburr",
+		fr: "Charpenti",
+		es: "Timburr",
+		it: "Timburr",
+		pt: "Timburr",
+		de: "Praktibalk"
+	},
+
+	illustrator: "match",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 60,
+	types: ["Fighting"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Fighting",
+			"Fighting"
+		],
+		name: {
+			en: "Pound"
+		},
+		damage: 30
+	}],
+
+	weaknesses: [
+		{
+			type: "Psychic",
+			value: "2x"
+		},
+	],
+
+	description: {
+		en: "It fights by swinging a piece of lumber around. It is close to evolving when it can handle the lumber without difficulty."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/3.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/3.ts
similarity index 76%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/3.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/3.ts
index 544050dd2..c90198226 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/3.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/3.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Kampf-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/30.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/30.ts
similarity index 82%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/30.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/30.ts
index ee048d4d0..ab4542350 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/30.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/30.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	dexId: [530],
@@ -14,37 +14,11 @@ const card: Card = {
 		de: "Stalobor"
 	},
 
-	illustrator: "5ban Graphics",
 	rarity: "None",
 	category: "Pokemon",
-
-	description: {
-		en: "It can help in tunnel construction. Its drill has evolved into steel strong enough to bore through iron plates."
-	},
-
+	illustrator: "5ban Graphics",
 	stage: "Stage1",
 
-	attacks: [{
-		name: {
-			en: "Metal Claw"
-		},
-
-		damage: 30
-	}, {
-		name: {
-			en: "Drill Run"
-		},
-
-		damage: 80,
-
-		effect: {
-			en: "Discard an Energy attached to the Defending Pokémon."
-		}
-	}],
-
-	hp: 110,
-	types: ["Fighting"],
-
 	evolveFrom: {
 		en: "Drilbur",
 		fr: "Rototaupe",
@@ -54,7 +28,35 @@ const card: Card = {
 		de: "Rotomurf"
 	},
 
-	retreat: 2,
+	hp: 110,
+
+	types: [
+		"Fighting"
+	],
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Metal Claw"
+		},
+
+		damage: 30
+	}, {
+		cost: [
+			"Fighting",
+			"Fighting",
+			"Fighting"
+		],
+		name: {
+			en: "Drill Run"
+		},
+		effect: {
+			en: "Discard an Energy attached to the Defending Pokémon."
+		},
+		damage: 80,
+	}],
 
 	weaknesses: [{
 		type: "Water",
@@ -64,7 +66,13 @@ const card: Card = {
 	resistances: [{
 		type: "Lightning",
 		value: "-20"
-	}]
+	}],
+
+	description: {
+		en: "It can help in tunnel construction. Its drill has evolved into steel strong enough to bore through iron plates."
+	},
+
+	retreat: 2,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/4.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/4.ts
similarity index 87%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/4.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/4.ts
index 2f790e9a5..ebfc1c3f2 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/4.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/4.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,8 +13,9 @@ const card: Card = {
 		de: "Energie-Umschalter"
 	},
 
-	rarity: "Uncommon",
+	rarity: "None",
 	category: "Trainer",
+	illustrator: "Kent Kanetsuna",
 
 	effect: {
 		en: "Move a basic Energy from 1 of your Pokémon to another of your Pokémon.",
@@ -28,4 +29,4 @@ const card: Card = {
 	trainerType: "Item"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/5.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/5.ts
similarity index 76%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/5.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/5.ts
index 544050dd2..c90198226 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/5.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/5.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Kampf-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/6.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/6.ts
similarity index 76%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/6.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/6.ts
index 544050dd2..c90198226 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/6.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/6.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Kampf-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/7.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/7.ts
similarity index 76%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/7.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/7.ts
index 544050dd2..c90198226 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/7.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/7.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Kampf-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/8.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/8.ts
similarity index 76%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/8.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/8.ts
index 544050dd2..c90198226 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/8.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/8.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Kampf-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/9.ts b/data/Trainer kits/BW trainer Kit (Excadrill)/9.ts
similarity index 76%
rename from data/Trainer kits/HS trainer Kit (Excadrill)/9.ts
rename to data/Trainer kits/BW trainer Kit (Excadrill)/9.ts
index 544050dd2..c90198226 100644
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/9.ts	
+++ b/data/Trainer kits/BW trainer Kit (Excadrill)/9.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
+import Set from '../BW trainer Kit (Excadrill).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Kampf-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark).ts b/data/Trainer kits/BW trainer Kit (Zoroark).ts
similarity index 82%
rename from data/Trainer kits/HS trainer Kit (Zoroark).ts
rename to data/Trainer kits/BW trainer Kit (Zoroark).ts
index 336cee970..dc7323517 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark).ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark).ts	
@@ -5,8 +5,8 @@ const set: Set = {
 	id: "tk-bw-z",
 
 	name: {
-		en: "HS trainer Kit (Zoroark)",
-		fr: "HS Kit du dresseur (Zoroark)",
+		en: "BW trainer Kit (Zoroark)",
+		fr: "BW Kit du dresseur (Zoroark)",
 		es: "Kit de Entrenador XY (Pikachu Enmascarada)",
 	},
 
diff --git a/data/Trainer kits/BW trainer Kit (Zoroark)/1.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/1.ts
new file mode 100644
index 000000000..5d10e3cf9
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/1.ts	
@@ -0,0 +1,60 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Zoroark).ts'
+
+const card: Card = {
+	dexId: [509],
+	set: Set,
+
+	name: {
+		en: "Purrloin",
+		fr: "Chacripan",
+		es: "Purrloin",
+		it: "Purrloin",
+		pt: "Purrloin",
+		de: "Felilou"
+	},
+
+	illustrator: "Kagemaru Himeno",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 60,
+	types: ["Darkness"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Scratch"
+		},
+		damage: 10
+	}, {
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Slash"
+		},
+		damage: 20
+	}],
+
+	weaknesses: [{
+		type: "Fighting",
+		value: "×2"
+	}],
+
+	resistances: [{
+		type: "Psychic",
+		value: "-20"
+	}],
+
+	description: {
+		en: "Its cute act is a ruse. When victims let down their guard, they find their items taken. It attacks with sharp claws."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/10.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/10.ts
similarity index 77%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/10.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/10.ts
index 5d428f2a7..84dc11d00 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/10.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/10.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Finsternis-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/11.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/11.ts
similarity index 91%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/11.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/11.ts
index 0aee4ba15..f0e5d880d 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/11.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/11.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,7 +13,8 @@ const card: Card = {
 		de: "PlusPower"
 	},
 
-	rarity: "Uncommon",
+	illustrator: "5ban Graphics",
+	rarity: "None",
 	category: "Trainer",
 
 	effect: {
@@ -28,4 +29,4 @@ const card: Card = {
 	trainerType: "Item"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Zoroark)/12.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/12.ts
new file mode 100644
index 000000000..05b3b5d9f
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/12.ts	
@@ -0,0 +1,55 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Zoroark).ts'
+
+const card: Card = {
+	dexId: [504],
+	set: Set,
+
+	name: {
+		en: "Patrat",
+		fr: "Ratentif",
+		es: "Patrat",
+		it: "Patrat",
+		pt: "Patrat",
+		de: "Nagelotz"
+	},
+
+	illustrator: "Kagemaru Himeno",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 50,
+	types: ["Colorless"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Tackle"
+		},
+		damage: 10
+	}, {
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Bite"
+		},
+		damage: 20
+	}],
+
+	weaknesses: [{
+		type: "Fighting",
+		value: "×2"
+	}],
+
+	description: {
+		en: "Using food stored in cheek pouches, they can keep watch for days. They use their tails to communicate with others."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Zoroark)/13.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/13.ts
new file mode 100644
index 000000000..44cd09007
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/13.ts	
@@ -0,0 +1,55 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Zoroark).ts'
+
+const card: Card = {
+	dexId: [570],
+	set: Set,
+
+	name: {
+		en: "Zorua",
+		fr: "Zorua",
+		es: "Zorua",
+		it: "Zorua",
+		pt: "Zorua",
+		de: "Zorua"
+	},
+
+	illustrator: "Kouki Saitou",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 60,
+	types: ["Darkness"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Lunge"
+		},
+		effect: {
+			en: "Flip a coin. If tails, this attack does nothing."
+		},
+		damage: 30
+	}],
+
+	weaknesses: [{
+		type: "Fighting",
+		value: "×2"
+	}],
+
+	resistances: [{
+		type: "Psychic",
+		value: "-20"
+	}],
+
+	description: {
+		en: "To protect themselves from danger, they hide their true identities by transforming into people and Pokémon."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Zoroark)/14.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/14.ts
new file mode 100644
index 000000000..4e0dc67a9
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/14.ts	
@@ -0,0 +1,54 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Zoroark).ts'
+
+const card: Card = {
+	dexId: [519],
+	set: Set,
+
+	name: {
+		en: "Pidove",
+		fr: "Poichigeon",
+		es: "Pidove",
+		it: "Pidove",
+		pt: "Pidove",
+		de: "Dusselgurr"
+	},
+
+	illustrator: "Masakazu Fukuda",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 50,
+	types: ["Colorless"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Quick Attack"
+		},
+		effect: {
+			en: "Flip a coin. If heads, this attack does 10 more damage."
+		},
+		damage: "10+"
+	}],
+
+	weaknesses: [{
+		type: "Lightning",
+		value: "×2"
+	}],
+
+	resistances: [{
+		type: "Fighting",
+		value: "-20"
+	}],
+
+	description: {
+		en: "Each follows its Trainer's orders as best it can, but they sometimes fail to understand complicated commands."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/15.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/15.ts
similarity index 51%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/15.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/15.ts
index aa61ed83a..f74a22aaf 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/15.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/15.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	dexId: [520],
@@ -14,7 +14,8 @@ const card: Card = {
 		de: "Navitaub"
 	},
 
-	rarity: "Uncommon",
+	illustrator: "Kouki Saitou",
+	rarity: "None",
 	category: "Pokemon",
 	hp: 70,
 	types: ["Colorless"],
@@ -29,7 +30,28 @@ const card: Card = {
 	},
 
 	stage: "Stage1",
-	retreat: 1,
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Gust"
+		},
+		damage: 20
+	}, {
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Quick Attack"
+		},
+		effect: {
+			en: "Flip a coin. If heads, this attack does 30 more damage."
+		},
+		damage: "20+"
+	}],
 
 	weaknesses: [{
 		type: "Lightning",
@@ -39,7 +61,13 @@ const card: Card = {
 	resistances: [{
 		type: "Fighting",
 		value: "-20"
-	}]
+	}],
+
+	description: {
+		en: "It can return to its Trainer's location regardless of the distance separating them."
+	},
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/16.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/16.ts
similarity index 87%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/16.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/16.ts
index 23827fca6..0dcf2e4be 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/16.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/16.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,7 +13,8 @@ const card: Card = {
 		de: "Energie-Rückgewinnung"
 	},
 
-	rarity: "Uncommon",
+	illustrator: "Kent Kanetsuna",
+	rarity: "None",
 	category: "Trainer",
 
 	effect: {
@@ -28,4 +29,4 @@ const card: Card = {
 	trainerType: "Item"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/17.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/17.ts
similarity index 84%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/17.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/17.ts
index 13961e894..24ff430b3 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/17.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/17.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	dexId: [571],
@@ -18,30 +18,8 @@ const card: Card = {
 	rarity: "None",
 	category: "Pokemon",
 
-	description: {
-		en: "Bonds between these Pokémon are very strong. It protects the safety of its pack by tricking its opponents."
-	},
-
 	stage: "Stage1",
 
-	attacks: [{
-		name: {
-			en: "Fury Swipes"
-		},
-
-		damage: "20×",
-
-		effect: {
-			en: "Flip 3 coins. This attack does 20 damage times the number of heads."
-		}
-	}, {
-		name: {
-			en: "Night Daze"
-		},
-
-		damage: 80
-	}],
-
 	hp: 100,
 	types: ["Darkness"],
 
@@ -54,7 +32,28 @@ const card: Card = {
 		de: "Zorua"
 	},
 
-	retreat: 2,
+	attacks: [{
+		cost: [
+			"Darkness"
+		],
+		name: {
+			en: "Fury Swipes"
+		},
+		effect: {
+			en: "Flip 3 coins. This attack does 20 damage times the number of heads."
+		},
+		damage: "20×",
+	}, {
+		cost: [
+			"Darkness",
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Night Daze"
+		},
+		damage: 80
+	}],
 
 	weaknesses: [{
 		type: "Fighting",
@@ -64,7 +63,13 @@ const card: Card = {
 	resistances: [{
 		type: "Psychic",
 		value: "-20"
-	}]
+	}],
+
+	description: {
+		en: "Bonds between these Pokémon are very strong. It protects the safety of its pack by tricking its opponents."
+	},
+
+	retreat: 2,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/18.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/18.ts
similarity index 93%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/18.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/18.ts
index c98256447..7c1153f6f 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/18.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/18.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,7 +13,8 @@ const card: Card = {
 		de: "Pokémon-Kommunikation"
 	},
 
-	rarity: "Uncommon",
+	illustrator: "5ban Graphics",
+	rarity: "None",
 	category: "Trainer",
 
 	effect: {
@@ -28,4 +29,4 @@ const card: Card = {
 	trainerType: "Item"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Zoroark)/19.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/19.ts
new file mode 100644
index 000000000..2414927b0
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/19.ts	
@@ -0,0 +1,49 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Zoroark).ts'
+
+const card: Card = {
+	dexId: [572],
+	set: Set,
+
+	name: {
+		en: "Minccino",
+		fr: "Chinchidou",
+		es: "Minccino",
+		it: "Minccino",
+		pt: "Minccino",
+		de: "Picochilla"
+	},
+
+	illustrator: "sui",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 60,
+	types: ["Colorless"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Tail Slap"
+		},
+		effect: {
+			en: "Flip 2 coins. This attack does 10 damage times the number of heads."
+		},
+		damage: "10x"
+	}],
+
+	weaknesses: [{
+		type: "Fighting",
+		value: "×2"
+	}],
+
+	description: {
+		en: "They greet one another by rubbing each other with their tails, which are always kept well groomed and clean."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Zoroark)/2.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/2.ts
new file mode 100644
index 000000000..772e69908
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/2.ts	
@@ -0,0 +1,71 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Zoroark).ts'
+
+const card: Card = {
+	dexId: [505],
+	set: Set,
+
+	name: {
+		en: "Watchog",
+		fr: "Miradar",
+		es: "Watchog",
+		it: "Watchog",
+		pt: "Watchog",
+		de: "Kukmarda"
+	},
+
+	illustrator: "match",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 90,
+	types: ["Colorless"],
+
+	evolveFrom: {
+		en: "Patrat",
+		fr: "Ratentif",
+		es: "Patrat",
+		it: "Patrat",
+		pt: "Patrat",
+		de: "Nagelotz"
+	},
+
+	stage: "Stage1",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Confuse Ray"
+		},
+		effect: {
+			en: "The Defending Pokémon is now Confused."
+		},
+	}, {
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Hyper Fang"
+		},
+		effect: {
+			en: "Flip a coin. If tails, this attack does nothing."
+		},
+		damage: 60
+	}],
+
+	weaknesses: [{
+		type: "Fighting",
+		value: "×2"
+	}],
+
+	description: {
+		en: "They make the patterns on their bodies shine in order to threaten predators. Keen eyesight lets them see in the dark."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/20.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/20.ts
similarity index 77%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/20.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/20.ts
index 5d428f2a7..84dc11d00 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/20.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/20.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Finsternis-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Zoroark)/21.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/21.ts
new file mode 100644
index 000000000..4e0dc67a9
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/21.ts	
@@ -0,0 +1,54 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Zoroark).ts'
+
+const card: Card = {
+	dexId: [519],
+	set: Set,
+
+	name: {
+		en: "Pidove",
+		fr: "Poichigeon",
+		es: "Pidove",
+		it: "Pidove",
+		pt: "Pidove",
+		de: "Dusselgurr"
+	},
+
+	illustrator: "Masakazu Fukuda",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 50,
+	types: ["Colorless"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Quick Attack"
+		},
+		effect: {
+			en: "Flip a coin. If heads, this attack does 10 more damage."
+		},
+		damage: "10+"
+	}],
+
+	weaknesses: [{
+		type: "Lightning",
+		value: "×2"
+	}],
+
+	resistances: [{
+		type: "Fighting",
+		value: "-20"
+	}],
+
+	description: {
+		en: "Each follows its Trainer's orders as best it can, but they sometimes fail to understand complicated commands."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/22.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/22.ts
similarity index 77%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/22.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/22.ts
index 5d428f2a7..84dc11d00 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/22.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/22.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Finsternis-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Zoroark)/23.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/23.ts
new file mode 100644
index 000000000..44cd09007
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/23.ts	
@@ -0,0 +1,55 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Zoroark).ts'
+
+const card: Card = {
+	dexId: [570],
+	set: Set,
+
+	name: {
+		en: "Zorua",
+		fr: "Zorua",
+		es: "Zorua",
+		it: "Zorua",
+		pt: "Zorua",
+		de: "Zorua"
+	},
+
+	illustrator: "Kouki Saitou",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 60,
+	types: ["Darkness"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Lunge"
+		},
+		effect: {
+			en: "Flip a coin. If tails, this attack does nothing."
+		},
+		damage: 30
+	}],
+
+	weaknesses: [{
+		type: "Fighting",
+		value: "×2"
+	}],
+
+	resistances: [{
+		type: "Psychic",
+		value: "-20"
+	}],
+
+	description: {
+		en: "To protect themselves from danger, they hide their true identities by transforming into people and Pokémon."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/24.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/24.ts
similarity index 77%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/24.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/24.ts
index 5d428f2a7..84dc11d00 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/24.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/24.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Finsternis-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Zoroark)/25.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/25.ts
new file mode 100644
index 000000000..5d10e3cf9
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/25.ts	
@@ -0,0 +1,60 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Zoroark).ts'
+
+const card: Card = {
+	dexId: [509],
+	set: Set,
+
+	name: {
+		en: "Purrloin",
+		fr: "Chacripan",
+		es: "Purrloin",
+		it: "Purrloin",
+		pt: "Purrloin",
+		de: "Felilou"
+	},
+
+	illustrator: "Kagemaru Himeno",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 60,
+	types: ["Darkness"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Scratch"
+		},
+		damage: 10
+	}, {
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Slash"
+		},
+		damage: 20
+	}],
+
+	weaknesses: [{
+		type: "Fighting",
+		value: "×2"
+	}],
+
+	resistances: [{
+		type: "Psychic",
+		value: "-20"
+	}],
+
+	description: {
+		en: "Its cute act is a ruse. When victims let down their guard, they find their items taken. It attacks with sharp claws."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/26.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/26.ts
similarity index 77%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/26.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/26.ts
index 5d428f2a7..84dc11d00 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/26.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/26.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Finsternis-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/27.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/27.ts
similarity index 90%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/27.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/27.ts
index e51189597..7177ab47b 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/27.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/27.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,7 +13,8 @@ const card: Card = {
 		de: "Energiesuche"
 	},
 
-	rarity: "Common",
+	illustrator: "Ryo Ueda",
+	rarity: "None",
 	category: "Trainer",
 
 	effect: {
@@ -28,4 +29,4 @@ const card: Card = {
 	trainerType: "Item"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/28.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/28.ts
similarity index 77%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/28.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/28.ts
index 5d428f2a7..84dc11d00 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/28.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/28.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Finsternis-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Zoroark)/29.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/29.ts
new file mode 100644
index 000000000..05b3b5d9f
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/29.ts	
@@ -0,0 +1,55 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Zoroark).ts'
+
+const card: Card = {
+	dexId: [504],
+	set: Set,
+
+	name: {
+		en: "Patrat",
+		fr: "Ratentif",
+		es: "Patrat",
+		it: "Patrat",
+		pt: "Patrat",
+		de: "Nagelotz"
+	},
+
+	illustrator: "Kagemaru Himeno",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 50,
+	types: ["Colorless"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Tackle"
+		},
+		damage: 10
+	}, {
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Bite"
+		},
+		damage: 20
+	}],
+
+	weaknesses: [{
+		type: "Fighting",
+		value: "×2"
+	}],
+
+	description: {
+		en: "Using food stored in cheek pouches, they can keep watch for days. They use their tails to communicate with others."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/3.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/3.ts
similarity index 77%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/3.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/3.ts
index 5d428f2a7..84dc11d00 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/3.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/3.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Finsternis-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/30.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/30.ts
similarity index 84%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/30.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/30.ts
index 13961e894..24ff430b3 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/30.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/30.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	dexId: [571],
@@ -18,30 +18,8 @@ const card: Card = {
 	rarity: "None",
 	category: "Pokemon",
 
-	description: {
-		en: "Bonds between these Pokémon are very strong. It protects the safety of its pack by tricking its opponents."
-	},
-
 	stage: "Stage1",
 
-	attacks: [{
-		name: {
-			en: "Fury Swipes"
-		},
-
-		damage: "20×",
-
-		effect: {
-			en: "Flip 3 coins. This attack does 20 damage times the number of heads."
-		}
-	}, {
-		name: {
-			en: "Night Daze"
-		},
-
-		damage: 80
-	}],
-
 	hp: 100,
 	types: ["Darkness"],
 
@@ -54,7 +32,28 @@ const card: Card = {
 		de: "Zorua"
 	},
 
-	retreat: 2,
+	attacks: [{
+		cost: [
+			"Darkness"
+		],
+		name: {
+			en: "Fury Swipes"
+		},
+		effect: {
+			en: "Flip 3 coins. This attack does 20 damage times the number of heads."
+		},
+		damage: "20×",
+	}, {
+		cost: [
+			"Darkness",
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Night Daze"
+		},
+		damage: 80
+	}],
 
 	weaknesses: [{
 		type: "Fighting",
@@ -64,7 +63,13 @@ const card: Card = {
 	resistances: [{
 		type: "Psychic",
 		value: "-20"
-	}]
+	}],
+
+	description: {
+		en: "Bonds between these Pokémon are very strong. It protects the safety of its pack by tricking its opponents."
+	},
+
+	retreat: 2,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/BW trainer Kit (Zoroark)/4.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/4.ts
new file mode 100644
index 000000000..2414927b0
--- /dev/null
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/4.ts	
@@ -0,0 +1,49 @@
+import { Card } from '../../../interfaces'
+import Set from '../BW trainer Kit (Zoroark).ts'
+
+const card: Card = {
+	dexId: [572],
+	set: Set,
+
+	name: {
+		en: "Minccino",
+		fr: "Chinchidou",
+		es: "Minccino",
+		it: "Minccino",
+		pt: "Minccino",
+		de: "Picochilla"
+	},
+
+	illustrator: "sui",
+	rarity: "None",
+	category: "Pokemon",
+	hp: 60,
+	types: ["Colorless"],
+	stage: "Basic",
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Tail Slap"
+		},
+		effect: {
+			en: "Flip 2 coins. This attack does 10 damage times the number of heads."
+		},
+		damage: "10x"
+	}],
+
+	weaknesses: [{
+		type: "Fighting",
+		value: "×2"
+	}],
+
+	description: {
+		en: "They greet one another by rubbing each other with their tails, which are always kept well groomed and clean."
+	},
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/5.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/5.ts
similarity index 77%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/5.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/5.ts
index 5d428f2a7..84dc11d00 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/5.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/5.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Finsternis-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/6.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/6.ts
similarity index 77%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/6.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/6.ts
index 5d428f2a7..84dc11d00 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/6.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/6.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Finsternis-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/7.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/7.ts
similarity index 77%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/7.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/7.ts
index 5d428f2a7..84dc11d00 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/7.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/7.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Finsternis-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/8.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/8.ts
similarity index 77%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/8.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/8.ts
index 5d428f2a7..84dc11d00 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/8.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/8.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Finsternis-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/9.ts b/data/Trainer kits/BW trainer Kit (Zoroark)/9.ts
similarity index 77%
rename from data/Trainer kits/HS trainer Kit (Zoroark)/9.ts
rename to data/Trainer kits/BW trainer Kit (Zoroark)/9.ts
index 5d428f2a7..84dc11d00 100644
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/9.ts	
+++ b/data/Trainer kits/BW trainer Kit (Zoroark)/9.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
+import Set from '../BW trainer Kit (Zoroark).ts'
 
 const card: Card = {
 	set: Set,
@@ -13,9 +13,9 @@ const card: Card = {
 		de: "Finsternis-Energie"
 	},
 
-	rarity: "Common",
+	rarity: "None",
 	category: "Energy",
 	energyType: "Normal"
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latias)/1.ts b/data/Trainer kits/EX trainer Kit (Latias)/1.ts
index c426b657d..0c05cf987 100644
--- a/data/Trainer kits/EX trainer Kit (Latias)/1.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latias)/1.ts	
@@ -14,19 +14,32 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 40,
+
+	types: [
+		"Colorless",
+	],
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Headbutt"
 		},
-
 		damage: 10
 	}, {
+		cost: [
+			"Fire",
+			"Colorless"
+		],
 		name: {
 			en: "Flare"
 		},
-
 		damage: 20
-	}]
+	}],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latias)/10.ts b/data/Trainer kits/EX trainer Kit (Latias)/10.ts
new file mode 100644
index 000000000..407c162ce
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit (Latias)/10.ts	
@@ -0,0 +1,17 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit (Latias)'
+
+const card: Card = {
+	name: {
+		en: "Fire Energy",
+	},
+	illustrator: "",
+	rarity: "None",
+	category: "Energy",
+
+	set: Set,
+	stage: "Basic",
+	energyType: "Normal",
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latias)/2.ts b/data/Trainer kits/EX trainer Kit (Latias)/2.ts
index c55d60a47..85f46d33a 100644
--- a/data/Trainer kits/EX trainer Kit (Latias)/2.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latias)/2.ts	
@@ -14,23 +14,47 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Stage1",
 
+	hp: 70,
+
+	types: [
+		"Fire",
+	],
+
+	evolveFrom: {
+		en: "Torchic",
+	},
+
 	attacks: [{
+		cost: [
+			"Fire",
+		],
 		name: {
 			en: "Flare"
 		},
-
 		damage: 20
 	}, {
+		cost: [
+			"Colorless",
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Double Kick"
 		},
-
-		damage: "40×",
-
 		effect: {
 			en: "Flip 2 coins. This attack does 40 damage times the number of heads."
-		}
-	}]
+		},
+		damage: "40×"
+	}],
+
+	weaknesses: [
+		{
+			type: "Water",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latias)/3.ts b/data/Trainer kits/EX trainer Kit (Latias)/3.ts
index 0d1169d05..8a0539d8f 100644
--- a/data/Trainer kits/EX trainer Kit (Latias)/3.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latias)/3.ts	
@@ -14,23 +14,49 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Stage1",
 
+	hp: 80,
+
+	types: [
+		"Colorless",
+	],
+
+	evolveFrom: {
+		en: "Skitty",
+	},
+
 	attacks: [{
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Scratch"
 		},
-
 		damage: 30
 	}, {
+		cost: [
+			"Colorless",
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Ultra Energy Source"
 		},
-
-		damage: "10×",
-
 		effect: {
 			en: "Does 10 damage times the number of basic Energy cards attached to all of the Active Pokémon (both yours and your opponent’s)."
-		}
-	}]
+		},
+		damage: "10×"
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
+
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latias)/4.ts b/data/Trainer kits/EX trainer Kit (Latias)/4.ts
index 7426a8089..8fe3cc6ba 100644
--- a/data/Trainer kits/EX trainer Kit (Latias)/4.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latias)/4.ts	
@@ -14,23 +14,43 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 70,
+
+	types: [
+		"Colorless",
+	],
+
 	attacks: [{
+		cost: [
+			"Fire",
+		],
 		name: {
 			en: "Dragon Dew"
 		},
-
-		damage: 10,
-
 		effect: {
 			en: "Remove 1 damage counter from 1 of your Pokémon."
-		}
+		},
+		damage: 10
 	}, {
+		cost: [
+			"Fire",
+			"Fire",
+			"Colorless"
+		],
 		name: {
 			en: "Heat Blast"
 		},
-
 		damage: 40
-	}]
+	}],
+
+	weaknesses: [
+		{
+			type: "Psychic",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latias)/5.ts b/data/Trainer kits/EX trainer Kit (Latias)/5.ts
index ae0e25fad..1f2a1cc92 100644
--- a/data/Trainer kits/EX trainer Kit (Latias)/5.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latias)/5.ts	
@@ -14,23 +14,42 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 40,
+
+	types: [
+		"Fire",
+	],
+
 	attacks: [{
+		cost: [
+			"Fire",
+		],
 		name: {
 			en: "Firebreathing"
 		},
-
-		damage: "10+",
-
 		effect: {
 			en: "Flip a coin. If heads, this attack does 10 damage plus 10 more damage."
-		}
+		},
+		damage: "10+"
 	}, {
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Tackle"
 		},
-
 		damage: 20
-	}]
+	}],
+
+	weaknesses: [
+		{
+			type: "Water",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latias)/6.ts b/data/Trainer kits/EX trainer Kit (Latias)/6.ts
index d6cfd9b01..f7152c10a 100644
--- a/data/Trainer kits/EX trainer Kit (Latias)/6.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latias)/6.ts	
@@ -14,23 +14,43 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 50,
+
+	types: [
+		"Colorless",
+	],
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Tackle"
 		},
-
 		damage: 10
 	}, {
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Lunge"
 		},
-
-		damage: 30,
-
 		effect: {
 			en: "Flip a coin. If tails, this attack does nothing."
-		}
-	}]
+		},
+		damage: 30
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
+
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latias)/7.ts b/data/Trainer kits/EX trainer Kit (Latias)/7.ts
index 7b2a0bc81..bf04bde4a 100644
--- a/data/Trainer kits/EX trainer Kit (Latias)/7.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latias)/7.ts	
@@ -14,17 +14,34 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 50,
+
+	types: [
+		"Fire",
+	],
+
 	attacks: [{
+		cost: [
+			"Fire",
+			"Colorless"
+		],
 		name: {
 			en: "Firebreathing"
 		},
-
-		damage: "20+",
-
 		effect: {
 			en: "Flip a coin. If heads, this attack does 20 damage plus 20 more damage."
-		}
-	}]
+		},
+		damage: "20+"
+	}],
+
+	weaknesses: [
+		{
+			type: "Water",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latias)/8.ts b/data/Trainer kits/EX trainer Kit (Latias)/8.ts
new file mode 100644
index 000000000..8959ed9e3
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit (Latias)/8.ts	
@@ -0,0 +1,19 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit (Latias)'
+
+const card: Card = {
+	name: {
+		en: "Potion"
+	},
+
+	illustrator: "Keiji Kinebuchi",
+	rarity: "None",
+	category: "Trainer",
+	set: Set,
+
+	effect: {
+		en: "Remove 2 damage counters from 1 of your Pokémon (remove 1 damage counter if that Pokémon has only 1)."
+	}
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latias)/9.ts b/data/Trainer kits/EX trainer Kit (Latias)/9.ts
new file mode 100644
index 000000000..806047218
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit (Latias)/9.ts	
@@ -0,0 +1,19 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit (Latias)'
+
+const card: Card = {
+	name: {
+		en: "Energy Search"
+	},
+
+	illustrator: "Kai Ishikawa",
+	rarity: "None",
+	category: "Trainer",
+	set: Set,
+
+	effect: {
+		en: "Search your deck for a basic Energy card, show it to your opponent, and put it into your hand. Shuffle your deck afterward."
+	}
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latios)/1.ts b/data/Trainer kits/EX trainer Kit (Latios)/1.ts
index 6b1fc7952..559651c39 100644
--- a/data/Trainer kits/EX trainer Kit (Latios)/1.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latios)/1.ts	
@@ -14,13 +14,38 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 50,
+
+	types: [
+		"Lightning",
+	],
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Headbutt"
 		},
-
 		damage: 10
-	}]
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	resistances: [
+		{
+			type: "Metal",
+			value: "-30"
+		},
+	],
+
+	retreat: 1,
+
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latios)/10.ts b/data/Trainer kits/EX trainer Kit (Latios)/10.ts
new file mode 100644
index 000000000..d59b68a0f
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit (Latios)/10.ts	
@@ -0,0 +1,17 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit (Latios)'
+
+const card: Card = {
+	name: {
+		en: "Lightning Energy",
+	},
+	illustrator: "",
+	rarity: "None",
+	category: "Energy",
+
+	set: Set,
+	stage: "Basic",
+	energyType: "Normal",
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latios)/2.ts b/data/Trainer kits/EX trainer Kit (Latios)/2.ts
index 37a9f045b..b1b161a10 100644
--- a/data/Trainer kits/EX trainer Kit (Latios)/2.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latios)/2.ts	
@@ -14,23 +14,44 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 80,
+
+	types: [
+		"Colorless",
+	],
+
 	attacks: [{
+		cost: [
+			"Lightning",
+			"Colorless"
+		],
 		name: {
 			en: "Gather Energy"
 		},
-
-		damage: 20,
-
 		effect: {
 			en: "Flip a coin. If heads, search your deck for a basic Energy card and attach it to 1 of your Pokémon. Shuffle your deck afterward."
-		}
+		},
+		damage: 20
 	}, {
+		cost: [
+			"Lightning",
+			"Lightning",
+			"Colorless"
+		],
 		name: {
 			en: "Dragon Claw"
 		},
-
 		damage: 40
-	}]
+	}],
+
+	weaknesses: [
+		{
+			type: "Psychic",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latios)/3.ts b/data/Trainer kits/EX trainer Kit (Latios)/3.ts
index 2154498c7..8cac62048 100644
--- a/data/Trainer kits/EX trainer Kit (Latios)/3.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latios)/3.ts	
@@ -14,25 +14,48 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Stage1",
 
+	hp: 70,
+
+	types: [
+		"Colorless",
+	],
+
+	evolveFrom: {
+		en: "Zigzagoon",
+	},
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Seek Out"
 		},
-
 		effect: {
 			en: "Search your deck for up to 2 cards and put them into your hand. Shuffle your deck afterward."
 		}
 	}, {
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Continuous Headbutt"
 		},
-
-		damage: "40×",
-
 		effect: {
 			en: "Flip a coin until you get tails. This attack does 40 damage times the number of heads."
-		}
-	}]
+		},
+		damage: "40×"
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latios)/4.ts b/data/Trainer kits/EX trainer Kit (Latios)/4.ts
index 2b051193a..83baedae3 100644
--- a/data/Trainer kits/EX trainer Kit (Latios)/4.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latios)/4.ts	
@@ -14,19 +14,46 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 40,
+
+	types: [
+		"Lightning",
+	],
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Rollout"
 		},
-
 		damage: 10
 	}, {
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Hook"
 		},
-
 		damage: 20
-	}]
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	resistances: [
+		{
+			type: "Metal",
+			value: "-30"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latios)/5.ts b/data/Trainer kits/EX trainer Kit (Latios)/5.ts
index d9fe71fde..3bcb88d5a 100644
--- a/data/Trainer kits/EX trainer Kit (Latios)/5.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latios)/5.ts	
@@ -14,23 +14,48 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Stage1",
 
+	hp: 80,
+
+	types: [
+		"Lightning",
+	],
+
+	evolveFrom: {
+		en: "Magnemite",
+	},
+
 	attacks: [{
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Ram"
 		},
-
 		damage: 20
 	}, {
+		cost: [
+			"Lightning",
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Triple Smash"
 		},
-
-		damage: "20+",
-
 		effect: {
 			en: "Flip 3 coins. This attack does 20 damage plus 20 more damage for each heads."
-		}
-	}]
+		},
+		damage: "20+"
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latios)/6.ts b/data/Trainer kits/EX trainer Kit (Latios)/6.ts
index 25cc0f97f..84073867e 100644
--- a/data/Trainer kits/EX trainer Kit (Latios)/6.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latios)/6.ts	
@@ -14,19 +14,40 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 50,
+
+	types: [
+		"Lightning",
+	],
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Scratch"
 		},
-
 		damage: 10
 	}, {
+		cost: [
+			"Lightning",
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Pika Bolt"
 		},
-
 		damage: 40
-	}]
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latios)/7.ts b/data/Trainer kits/EX trainer Kit (Latios)/7.ts
index bc48cb954..e33c99bc0 100644
--- a/data/Trainer kits/EX trainer Kit (Latios)/7.ts	
+++ b/data/Trainer kits/EX trainer Kit (Latios)/7.ts	
@@ -14,17 +14,33 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 40,
+
+	types: [
+		"Colorless",
+	],
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Fury Swipes"
 		},
-
-		damage: "10×",
-
 		effect: {
 			en: "Flip 3 coins. This attack does 10 damage times the number of heads."
-		}
-	}]
+		},
+		damage: "10×"
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latios)/8.ts b/data/Trainer kits/EX trainer Kit (Latios)/8.ts
new file mode 100644
index 000000000..eeb8ad6da
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit (Latios)/8.ts	
@@ -0,0 +1,19 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit (Latios)'
+
+const card: Card = {
+	name: {
+		en: "Potion"
+	},
+
+	illustrator: "Keiji Kinebuchi",
+	rarity: "None",
+	category: "Trainer",
+	set: Set,
+
+	effect: {
+		en: "Remove 2 damage counters from 1 of your Pokémon (remove 1 damage counter if that Pokémon has only 1)."
+	}
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit (Latios)/9.ts b/data/Trainer kits/EX trainer Kit (Latios)/9.ts
new file mode 100644
index 000000000..0e46f8d7c
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit (Latios)/9.ts	
@@ -0,0 +1,19 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit (Latios)'
+
+const card: Card = {
+	name: {
+		en: "Energy Search"
+	},
+
+	illustrator: "Kai Ishikawa",
+	rarity: "None",
+	category: "Trainer",
+	set: Set,
+
+	effect: {
+		en: "Search your deck for a basic Energy card, show it to your opponent, and put it into your hand. Shuffle your deck afterward."
+	}
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Ninun).ts b/data/Trainer kits/EX trainer Kit 2 (Minun).ts
similarity index 88%
rename from data/Trainer kits/EX trainer Kit 2 (Ninun).ts
rename to data/Trainer kits/EX trainer Kit 2 (Minun).ts
index 164e78686..d91242250 100644
--- a/data/Trainer kits/EX trainer Kit 2 (Ninun).ts	
+++ b/data/Trainer kits/EX trainer Kit 2 (Minun).ts	
@@ -2,10 +2,10 @@ import { Set } from '../../interfaces'
 import serie from '../Trainer kits'
 
 const set: Set = {
-	id: "tk-ex-n",
+	id: "tk-ex-m",
 
 	name: {
-		en: "EX trainer Kit 2 (Ninun)",
+		en: "EX trainer Kit 2 (Minun)",
 		it: "EX trainer Kit (Ninun)",
 		fr: "EX Kit dresseur (Négapi)",
 		es: "Kit de Entrenador EX (Ninun)",
diff --git a/data/Trainer kits/EX trainer Kit 2 (Ninun)/1.ts b/data/Trainer kits/EX trainer Kit 2 (Minun)/1.ts
similarity index 52%
rename from data/Trainer kits/EX trainer Kit 2 (Ninun)/1.ts
rename to data/Trainer kits/EX trainer Kit 2 (Minun)/1.ts
index 0909e869e..fe4ea5545 100644
--- a/data/Trainer kits/EX trainer Kit 2 (Ninun)/1.ts	
+++ b/data/Trainer kits/EX trainer Kit 2 (Minun)/1.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../EX trainer Kit 2 (Ninun)'
+import Set from '../EX trainer Kit 2 (Minun).ts'
 
 const card: Card = {
 	dexId: [59],
@@ -14,23 +14,48 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Stage1",
 
+	hp: 90,
+
+	types: [
+		"Fire",
+	],
+
+	evolveFrom: {
+		en: "Growlithe",
+	},
+
 	attacks: [{
+		cost: [
+			"Fire",
+		],
 		name: {
 			en: "Flare"
 		},
-
 		damage: 20
 	}, {
+		cost: [
+			"Fire",
+			"Colorless",
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Heat Tackle"
 		},
-
-		damage: 70,
-
 		effect: {
 			en: "Arcanine does 10 damage to itself."
-		}
-	}]
+		},
+		damage: 70
+	}],
+
+	weaknesses: [
+		{
+			type: "Water",
+			value: "2x"
+		},
+	],
+
+	retreat: 2,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Minun)/10.ts b/data/Trainer kits/EX trainer Kit 2 (Minun)/10.ts
new file mode 100644
index 000000000..96a13109c
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Minun)/10.ts	
@@ -0,0 +1,19 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Minun).ts'
+
+const card: Card = {
+	name: {
+		en: "Potion"
+	},
+
+	illustrator: "Keiji Kinebuchi",
+	rarity: "None",
+	category: "Trainer",
+	set: Set,
+
+	effect: {
+		en: "Remove 2 damage counters from 1 of your Pokémon (remove 1 damage counter if that Pokémon has only 1)."
+	}
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Minun)/11.ts b/data/Trainer kits/EX trainer Kit 2 (Minun)/11.ts
new file mode 100644
index 000000000..e417492e8
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Minun)/11.ts	
@@ -0,0 +1,18 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Minun).ts'
+
+const card: Card = {
+	name: {
+		en: "Fire Energy",
+	},
+
+	illustrator: "",
+	rarity: "None",
+	category: "Energy",
+
+	set: Set,
+	stage: "Basic",
+	energyType: "Normal",
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Minun)/12.ts b/data/Trainer kits/EX trainer Kit 2 (Minun)/12.ts
new file mode 100644
index 000000000..14665f7ee
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Minun)/12.ts	
@@ -0,0 +1,18 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Minun).ts'
+
+const card: Card = {
+	name: {
+		en: "Lightning Energy",
+	},
+
+	illustrator: "",
+	rarity: "None",
+	category: "Energy",
+
+	set: Set,
+	stage: "Basic",
+	energyType: "Normal",
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Ninun)/2.ts b/data/Trainer kits/EX trainer Kit 2 (Minun)/2.ts
similarity index 55%
rename from data/Trainer kits/EX trainer Kit 2 (Ninun)/2.ts
rename to data/Trainer kits/EX trainer Kit 2 (Minun)/2.ts
index 9c58c6039..ea7e76153 100644
--- a/data/Trainer kits/EX trainer Kit 2 (Ninun)/2.ts	
+++ b/data/Trainer kits/EX trainer Kit 2 (Minun)/2.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../EX trainer Kit 2 (Ninun)'
+import Set from '../EX trainer Kit 2 (Minun).ts'
 
 const card: Card = {
 	dexId: [4],
@@ -14,19 +14,39 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 50,
+
+	types: [
+		"Fire",
+	],
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Headbutt"
 		},
-
 		damage: 10
 	}, {
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Slash"
 		},
-
 		damage: 20
-	}]
+	}],
+
+	weaknesses: [
+		{
+			type: "Water",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Ninun)/3.ts b/data/Trainer kits/EX trainer Kit 2 (Minun)/3.ts
similarity index 56%
rename from data/Trainer kits/EX trainer Kit 2 (Ninun)/3.ts
rename to data/Trainer kits/EX trainer Kit 2 (Minun)/3.ts
index d46f2c6d6..4ee7f6238 100644
--- a/data/Trainer kits/EX trainer Kit 2 (Ninun)/3.ts	
+++ b/data/Trainer kits/EX trainer Kit 2 (Minun)/3.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../EX trainer Kit 2 (Ninun)'
+import Set from '../EX trainer Kit 2 (Minun).ts'
 
 const card: Card = {
 	dexId: [5],
@@ -14,23 +14,48 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Stage1",
 
+	hp: 70,
+
+	types: [
+		"Fire",
+	],
+
+	evolveFrom: {
+		en: "Charmander",
+	},
+
 	attacks: [{
+		cost: [
+			"Fire",
+			"Colorless"
+		],
 		name: {
 			en: "Flare"
 		},
-
 		damage: 30
 	}, {
+		cost: [
+			"Fire",
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Damage Burn"
 		},
-
-		damage: "40+",
-
 		effect: {
 			en: "If the Defending Pokémon already has any damage counters on it, this attack does 40 damage plus 20 more damage."
-		}
-	}]
+		},
+		damage: "40+"
+	}],
+
+	weaknesses: [
+		{
+			type: "Water",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Ninun)/4.ts b/data/Trainer kits/EX trainer Kit 2 (Minun)/4.ts
similarity index 54%
rename from data/Trainer kits/EX trainer Kit 2 (Ninun)/4.ts
rename to data/Trainer kits/EX trainer Kit 2 (Minun)/4.ts
index 0520d8c1b..fefe68e38 100644
--- a/data/Trainer kits/EX trainer Kit 2 (Ninun)/4.ts	
+++ b/data/Trainer kits/EX trainer Kit 2 (Minun)/4.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../EX trainer Kit 2 (Ninun)'
+import Set from '../EX trainer Kit 2 (Minun).ts'
 
 const card: Card = {
 	dexId: [58],
@@ -14,19 +14,40 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 60,
+
+	types: [
+		"Fire",
+	],
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Bite"
 		},
-
 		damage: 10
 	}, {
+		cost: [
+			"Fire",
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Flame Tail"
 		},
-
 		damage: 40
-	}]
+	}],
+
+	weaknesses: [
+		{
+			type: "Water",
+			value: "2x"
+		},
+	],
+
+	retreat: 2,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Ninun)/5.ts b/data/Trainer kits/EX trainer Kit 2 (Minun)/5.ts
similarity index 65%
rename from data/Trainer kits/EX trainer Kit 2 (Ninun)/5.ts
rename to data/Trainer kits/EX trainer Kit 2 (Minun)/5.ts
index 550708862..be0d6a6c5 100644
--- a/data/Trainer kits/EX trainer Kit 2 (Ninun)/5.ts	
+++ b/data/Trainer kits/EX trainer Kit 2 (Minun)/5.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../EX trainer Kit 2 (Ninun)'
+import Set from '../EX trainer Kit 2 (Minun).ts'
 
 const card: Card = {
 	dexId: [179],
@@ -14,25 +14,44 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 50,
+
+	types: [
+		"Lightning",
+	],
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Minor Errand-Running"
 		},
-
 		effect: {
 			en: "Search your deck for a basic Energy card, show it to your opponent, and put it into your hand. Shuffle your deck afterward."
 		}
 	}, {
+		cost: [
+			"Lightning",
+			"Colorless"
+		],
 		name: {
 			en: "Quick Attack"
 		},
-
-		damage: "10+",
-
 		effect: {
 			en: "Flip a coin. If heads, this attack does 10 damage plus 10 more damage."
-		}
-	}]
+		},
+		damage: "10+"
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Ninun)/6.ts b/data/Trainer kits/EX trainer Kit 2 (Minun)/6.ts
similarity index 62%
rename from data/Trainer kits/EX trainer Kit 2 (Ninun)/6.ts
rename to data/Trainer kits/EX trainer Kit 2 (Minun)/6.ts
index a76def310..76faf6809 100644
--- a/data/Trainer kits/EX trainer Kit 2 (Ninun)/6.ts	
+++ b/data/Trainer kits/EX trainer Kit 2 (Minun)/6.ts	
@@ -1,5 +1,5 @@
 import { Card } from '../../../interfaces'
-import Set from '../EX trainer Kit 2 (Ninun)'
+import Set from '../EX trainer Kit 2 (Minun).ts'
 
 const card: Card = {
 	dexId: [312],
@@ -14,25 +14,51 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 60,
+
+	types: [
+		"Lightning",
+	],
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Drawup Power"
 		},
-
 		effect: {
 			en: "Search your deck for an Energy card, show it to your opponent, and put into your hand. Shuffle your deck afterward."
 		}
 	}, {
+		cost: [
+			"Lightning",
+			"Colorless"
+		],
 		name: {
 			en: "Front Spark"
 		},
-
-		damage: 20,
-
 		effect: {
 			en: "Does 10 damage to 1 of your opponent’s Benched Pokémon. (Don’t apply Weakness and Resistance for Benched Pokémon.)"
-		}
-	}]
+		},
+		damage: 20
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	resistances: [
+		{
+			type: "Metal",
+			value: "-30"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Minun)/7.ts b/data/Trainer kits/EX trainer Kit 2 (Minun)/7.ts
new file mode 100644
index 000000000..91a343c46
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Minun)/7.ts	
@@ -0,0 +1,55 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Minun).ts'
+
+const card: Card = {
+	dexId: [37],
+	set: Set,
+
+	name: {
+		en: "Vulpix"
+	},
+
+	illustrator: "Midori Harada",
+	rarity: "None",
+	category: "Pokemon",
+	stage: "Basic",
+
+	hp: 50,
+
+	types: [
+		"Fire",
+	],
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Bite"
+		},
+		damage: 10
+	}, {
+		cost: [
+			"Fire",
+			"Colorless"
+		],
+		name: {
+			en: "Firebreathing"
+		},
+		effect: {
+			en: "Flip a coin. If heads, this attack does 20 damage plus 10 more damage."
+		},
+		damage: "20+"
+	}],
+
+	weaknesses: [
+		{
+			type: "Water",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Minun)/8.ts b/data/Trainer kits/EX trainer Kit 2 (Minun)/8.ts
new file mode 100644
index 000000000..5d7988ad1
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Minun)/8.ts	
@@ -0,0 +1,21 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Minun).ts'
+
+const card: Card = {
+	name: {
+		en: "Celio's Network"
+	},
+
+	illustrator: "Ken Sugimori",
+	rarity: "None",
+	category: "Trainer",
+	set: Set,
+
+	trainerType: "Supporter",
+
+	effect: {
+		en: "Search your deck for a Basic Pokémon or Evolution card (excluding Pokémon-ex), show it to your opponent, and put it into your hand. Shuffle your deck afterward."
+	}
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Minun)/9.ts b/data/Trainer kits/EX trainer Kit 2 (Minun)/9.ts
new file mode 100644
index 000000000..843d5af43
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Minun)/9.ts	
@@ -0,0 +1,19 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Minun).ts'
+
+const card: Card = {
+	name: {
+		en: "Energy Search"
+	},
+
+	illustrator: "Kai Ishikawa",
+	rarity: "None",
+	category: "Trainer",
+	set: Set,
+
+	effect: {
+		en: "Search your deck for a basic Energy card, show it to your opponent, and put it into your hand. Shuffle your deck afterward."
+	}
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Plusle)/1.ts b/data/Trainer kits/EX trainer Kit 2 (Plusle)/1.ts
index 0a07b036a..3e9073472 100644
--- a/data/Trainer kits/EX trainer Kit 2 (Plusle)/1.ts	
+++ b/data/Trainer kits/EX trainer Kit 2 (Plusle)/1.ts	
@@ -14,23 +14,42 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 50,
+
+	types: [
+		"Psychic",
+	],
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Call for Family"
 		},
-
 		effect: {
 			en: "Search your deck for a Basic Pokémon and put it onto your Bench. Shuffle your deck afterward."
 		}
 	}, {
+		cost: [
+			"Psychic",
+		],
 		name: {
 			en: "Metal Ball"
 		},
-
 		effect: {
 			en: "Put 1 damage counter on the Defending Pokémon."
 		}
-	}]
+	}],
+
+	weaknesses: [
+		{
+			type: "Psychic",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Plusle)/10.ts b/data/Trainer kits/EX trainer Kit 2 (Plusle)/10.ts
new file mode 100644
index 000000000..e5beb9267
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Plusle)/10.ts	
@@ -0,0 +1,21 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Plusle)'
+
+const card: Card = {
+	name: {
+		en: "Professor Cozmo's Discovery"
+	},
+
+	illustrator: "Ken Sugimori",
+	rarity: "None",
+	category: "Trainer",
+	set: Set,
+
+	trainerType: "Supporter",
+
+	effect: {
+		en: "Flip a coin. If heads, draw the bottom 3 cards of your deck. If tails, draw the top 2 cards of your deck."
+	}
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Plusle)/11.ts b/data/Trainer kits/EX trainer Kit 2 (Plusle)/11.ts
new file mode 100644
index 000000000..283fed18e
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Plusle)/11.ts	
@@ -0,0 +1,18 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Plusle)'
+
+const card: Card = {
+	name: {
+		en: "Lightning Energy",
+	},
+
+	illustrator: "",
+	rarity: "None",
+	category: "Energy",
+
+	set: Set,
+	stage: "Basic",
+	energyType: "Normal",
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Plusle)/12.ts b/data/Trainer kits/EX trainer Kit 2 (Plusle)/12.ts
new file mode 100644
index 000000000..65e930946
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Plusle)/12.ts	
@@ -0,0 +1,18 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Plusle)'
+
+const card: Card = {
+	name: {
+		en: "Psychic Energy",
+	},
+
+	illustrator: "",
+	rarity: "None",
+	category: "Energy",
+
+	set: Set,
+	stage: "Basic",
+	energyType: "Normal",
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Plusle)/2.ts b/data/Trainer kits/EX trainer Kit 2 (Plusle)/2.ts
new file mode 100644
index 000000000..b168ff239
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Plusle)/2.ts	
@@ -0,0 +1,57 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Plusle)'
+
+const card: Card = {
+	dexId: [309],
+	set: Set,
+
+	name: {
+		en: "Electrike"
+	},
+
+	illustrator: "Hiroki Fuchino",
+	rarity: "None",
+	category: "Pokemon",
+	stage: "Basic",
+
+	hp: 50,
+
+	types: [
+		"Lightning",
+	],
+
+	attacks: [{
+		cost: [
+			"Lightning",
+		],
+		name: {
+			en: "Recharge"
+		},
+		effect: {
+			en: "Search your deck for a Lightning Energy card and attach it to Electrike. Shuffle your deck afterward."
+		}
+	}, {
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Quick Attack"
+		},
+		effect: {
+			en: "Flip a coin. If heads, this attack does 10 damage plus 20 more damage."
+		},
+		damage: "10+"
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Plusle)/3.ts b/data/Trainer kits/EX trainer Kit 2 (Plusle)/3.ts
new file mode 100644
index 000000000..8da9b7928
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Plusle)/3.ts	
@@ -0,0 +1,58 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Plusle)'
+
+const card: Card = {
+	dexId: [326],
+	set: Set,
+
+	name: {
+		en: "Grumpig"
+	},
+
+	illustrator: "Ken Sugimori",
+	rarity: "None",
+	category: "Pokemon",
+	stage: "Stage1",
+
+	hp: 70,
+
+	types: [
+		"Psychic",
+	],
+
+	evolveFrom: {
+		en: "Spoink",
+	},
+
+	attacks: [{
+		cost: [
+			"Colorless",
+		],
+		name: {
+			en: "Snap Tail"
+		},
+		effect: {
+			en: "Choose 1 of your opponent's Pokémon. This attack does 10 damage to that Pokémon. (Don't apply Weakness and Resistance for Benched Pokémon.)"
+		},
+	}, {
+		cost: [
+			"Psychic",
+			"Colorless"
+		],
+		name: {
+			en: "Psypunch"
+		},
+		damage: 40
+	}],
+
+	weaknesses: [
+		{
+			type: "Psychic",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Plusle)/4.ts b/data/Trainer kits/EX trainer Kit 2 (Plusle)/4.ts
index fc8b04559..45a606a32 100644
--- a/data/Trainer kits/EX trainer Kit 2 (Plusle)/4.ts	
+++ b/data/Trainer kits/EX trainer Kit 2 (Plusle)/4.ts	
@@ -14,21 +14,41 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 50,
+
+	types: [
+		"Colorless",
+	],
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Collect"
 		},
-
 		effect: {
 			en: "Draw a card."
 		}
 	}, {
+		cost: [
+			"Colorless",
+			"Colorless"
+		],
 		name: {
 			en: "Cat Kick"
 		},
-
 		damage: 20
-	}]
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Plusle)/5.ts b/data/Trainer kits/EX trainer Kit 2 (Plusle)/5.ts
new file mode 100644
index 000000000..9f0478d78
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Plusle)/5.ts	
@@ -0,0 +1,64 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Plusle)'
+
+const card: Card = {
+	dexId: [375],
+	set: Set,
+
+	name: {
+		en: "Metang"
+	},
+
+	illustrator: "Hisao Nakamura",
+	rarity: "None",
+	category: "Pokemon",
+	stage: "Stage1",
+
+	hp: 80,
+
+	types: [
+		"Psychic",
+	],
+
+	evolveFrom: {
+		en: "Beldum",
+	},
+
+	attacks: [{
+		cost: [
+			"Psychic",
+			"Colorless"
+		],
+		name: {
+			en: "Psychic Boom"
+		},
+		effect: {
+			en: "Does 10 damage plus 10 more damage for each Energy attached to the Defending Pokémon."
+		},
+		damage: "10+"
+	}, {
+		cost: [
+			"Psychic",
+			"Colorless",
+			"Colorless"
+		],
+		name: {
+			en: "Quick Blow"
+		},
+		effect: {
+			en: "Flip a coin. If heads, this attack does 40 damage plus 20 more damage."
+		},
+		damage: "40+"
+	}],
+
+	weaknesses: [
+		{
+			type: "Psychic",
+			value: "2x"
+		},
+	],
+
+	retreat: 2,
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Plusle)/6.ts b/data/Trainer kits/EX trainer Kit 2 (Plusle)/6.ts
index 0b56477e4..d7368af5b 100644
--- a/data/Trainer kits/EX trainer Kit 2 (Plusle)/6.ts	
+++ b/data/Trainer kits/EX trainer Kit 2 (Plusle)/6.ts	
@@ -14,25 +14,51 @@ const card: Card = {
 	category: "Pokemon",
 	stage: "Basic",
 
+	hp: 60,
+
+	types: [
+		"Lightning",
+	],
+
 	attacks: [{
+		cost: [
+			"Colorless",
+		],
 		name: {
 			en: "Pickup Power"
 		},
-
 		effect: {
 			en: "Search your discard pile for an Energy card, show it to your opponent, and put it into your hand."
 		}
 	}, {
+		cost: [
+			"Lightning",
+			"Colorless"
+		],
 		name: {
 			en: "Rear Spark"
 		},
-
-		damage: 10,
-
 		effect: {
 			en: "Does 20 damage to 1 of your opponent’s Benched Pokémon. (Don’t apply Weakness and Resistance for Benched Pokémon.)"
-		}
-	}]
+		},
+		damage: 10,
+	}],
+
+	weaknesses: [
+		{
+			type: "Fighting",
+			value: "2x"
+		},
+	],
+
+	resistances: [
+		{
+			type: "Metal",
+			value: "-30"
+		},
+	],
+
+	retreat: 1,
 }
 
-export default card
\ No newline at end of file
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Plusle)/7.ts b/data/Trainer kits/EX trainer Kit 2 (Plusle)/7.ts
new file mode 100644
index 000000000..01edfa557
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Plusle)/7.ts	
@@ -0,0 +1,46 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Plusle)'
+
+const card: Card = {
+	dexId: [325],
+	set: Set,
+
+	name: {
+		en: "Spoink"
+	},
+
+	illustrator: "Ken Sugimori",
+	rarity: "None",
+	category: "Pokemon",
+	stage: "Basic",
+
+	hp: 50,
+
+	types: [
+		"Psychic",
+	],
+
+	attacks: [{
+		cost: [
+			"Psychic",
+		],
+		name: {
+			en: "Knock Away"
+		},
+		effect: {
+			en: "Flip a coin. If heads, this attack does 10 damage plus 10 more damage."
+		},
+		damage: "10+"
+	}],
+
+	weaknesses: [
+		{
+			type: "Psychic",
+			value: "2x"
+		},
+	],
+
+	retreat: 1,
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Plusle)/8.ts b/data/Trainer kits/EX trainer Kit 2 (Plusle)/8.ts
new file mode 100644
index 000000000..3b4aef32d
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Plusle)/8.ts	
@@ -0,0 +1,19 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Plusle)'
+
+const card: Card = {
+	name: {
+		en: "Energy Search"
+	},
+
+	illustrator: "Kai Ishikawa",
+	rarity: "None",
+	category: "Trainer",
+	set: Set,
+
+	effect: {
+		en: "Search your deck for a basic Energy card, show it to your opponent, and put it into your hand. Shuffle your deck afterward."
+	}
+}
+
+export default card
diff --git a/data/Trainer kits/EX trainer Kit 2 (Plusle)/9.ts b/data/Trainer kits/EX trainer Kit 2 (Plusle)/9.ts
new file mode 100644
index 000000000..1152077b0
--- /dev/null
+++ b/data/Trainer kits/EX trainer Kit 2 (Plusle)/9.ts	
@@ -0,0 +1,19 @@
+import { Card } from '../../../interfaces'
+import Set from '../EX trainer Kit 2 (Plusle)'
+
+const card: Card = {
+	name: {
+		en: "Potion"
+	},
+
+	illustrator: "Keiji Kinebuchi",
+	rarity: "None",
+	category: "Trainer",
+	set: Set,
+
+	effect: {
+		en: "Remove 2 damage counters from 1 of your Pokémon (remove 1 damage counter if that Pokémon has only 1)."
+	}
+}
+
+export default card
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/1.ts b/data/Trainer kits/HS trainer Kit (Excadrill)/1.ts
deleted file mode 100644
index db67ca187..000000000
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/1.ts	
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
-
-const card: Card = {
-	dexId: [506],
-	set: Set,
-
-	name: {
-		en: "Lillipup",
-		fr: "Ponchiot",
-		es: "Lillipup",
-		it: "Lillipup",
-		pt: "Lillipup",
-		de: "Yorkleff"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 50,
-	types: ["Colorless"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/11.ts b/data/Trainer kits/HS trainer Kit (Excadrill)/11.ts
deleted file mode 100644
index 92999a1d0..000000000
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/11.ts	
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
-
-const card: Card = {
-	dexId: [532],
-	set: Set,
-
-	name: {
-		en: "Timburr",
-		fr: "Charpenti",
-		es: "Timburr",
-		it: "Timburr",
-		pt: "Timburr",
-		de: "Praktibalk"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 60,
-	types: ["Fighting"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Psychic",
-		value: "×2"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/12.ts b/data/Trainer kits/HS trainer Kit (Excadrill)/12.ts
deleted file mode 100644
index 3f670958e..000000000
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/12.ts	
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
-
-const card: Card = {
-	dexId: [531],
-	set: Set,
-
-	name: {
-		en: "Audino",
-		fr: "Nanméouïe",
-		es: "Audino",
-		it: "Audino",
-		pt: "Audino",
-		de: "Ohrdoch"
-	},
-
-	rarity: "Uncommon",
-	category: "Pokemon",
-	hp: 80,
-	types: ["Colorless"],
-	stage: "Basic",
-	retreat: 2,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/13.ts b/data/Trainer kits/HS trainer Kit (Excadrill)/13.ts
deleted file mode 100644
index b544e1149..000000000
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/13.ts	
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
-
-const card: Card = {
-	dexId: [529],
-	set: Set,
-
-	name: {
-		en: "Drilbur",
-		fr: "Rototaupe",
-		es: "Drilbur",
-		it: "Drilbur",
-		pt: "Drilbur",
-		de: "Rotomurf"
-	},
-
-	rarity: "Uncommon",
-	category: "Pokemon",
-	hp: 70,
-	types: ["Fighting"],
-	stage: "Basic",
-	retreat: 2,
-
-	weaknesses: [{
-		type: "Water",
-		value: "×2"
-	}],
-
-	resistances: [{
-		type: "Lightning",
-		value: "-20"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/14.ts b/data/Trainer kits/HS trainer Kit (Excadrill)/14.ts
deleted file mode 100644
index 77cfa77e9..000000000
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/14.ts	
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
-
-const card: Card = {
-	dexId: [533],
-	set: Set,
-
-	name: {
-		en: "Gurdurr",
-		fr: "Ouvrifier",
-		es: "Gurdurr",
-		it: "Gurdurr",
-		pt: "Gurdurr",
-		de: "Strepoli"
-	},
-
-	rarity: "Uncommon",
-	category: "Pokemon",
-	hp: 80,
-	types: ["Fighting"],
-
-	evolveFrom: {
-		en: "Timburr",
-		fr: "Charpenti",
-		es: "Timburr",
-		it: "Timburr",
-		pt: "Timburr",
-		de: "Praktibalk"
-	},
-
-	stage: "Stage1",
-	retreat: 2,
-
-	weaknesses: [{
-		type: "Psychic",
-		value: "×2"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/18.ts b/data/Trainer kits/HS trainer Kit (Excadrill)/18.ts
deleted file mode 100644
index 3f670958e..000000000
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/18.ts	
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
-
-const card: Card = {
-	dexId: [531],
-	set: Set,
-
-	name: {
-		en: "Audino",
-		fr: "Nanméouïe",
-		es: "Audino",
-		it: "Audino",
-		pt: "Audino",
-		de: "Ohrdoch"
-	},
-
-	rarity: "Uncommon",
-	category: "Pokemon",
-	hp: 80,
-	types: ["Colorless"],
-	stage: "Basic",
-	retreat: 2,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/19.ts b/data/Trainer kits/HS trainer Kit (Excadrill)/19.ts
deleted file mode 100644
index 8e74f9486..000000000
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/19.ts	
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
-
-const card: Card = {
-	dexId: [507],
-	set: Set,
-
-	name: {
-		en: "Herdier",
-		fr: "Ponchien",
-		es: "Herdier",
-		it: "Herdier",
-		pt: "Herdier",
-		de: "Terribark"
-	},
-
-	rarity: "Uncommon",
-	category: "Pokemon",
-	hp: 80,
-	types: ["Colorless"],
-
-	evolveFrom: {
-		en: "Lillipup",
-		fr: "Ponchiot",
-		es: "Lillipup",
-		it: "Lillipup",
-		pt: "Lillipup",
-		de: "Yorkleff"
-	},
-
-	stage: "Stage1",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/25.ts b/data/Trainer kits/HS trainer Kit (Excadrill)/25.ts
deleted file mode 100644
index b544e1149..000000000
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/25.ts	
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
-
-const card: Card = {
-	dexId: [529],
-	set: Set,
-
-	name: {
-		en: "Drilbur",
-		fr: "Rototaupe",
-		es: "Drilbur",
-		it: "Drilbur",
-		pt: "Drilbur",
-		de: "Rotomurf"
-	},
-
-	rarity: "Uncommon",
-	category: "Pokemon",
-	hp: 70,
-	types: ["Fighting"],
-	stage: "Basic",
-	retreat: 2,
-
-	weaknesses: [{
-		type: "Water",
-		value: "×2"
-	}],
-
-	resistances: [{
-		type: "Lightning",
-		value: "-20"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/27.ts b/data/Trainer kits/HS trainer Kit (Excadrill)/27.ts
deleted file mode 100644
index db67ca187..000000000
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/27.ts	
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
-
-const card: Card = {
-	dexId: [506],
-	set: Set,
-
-	name: {
-		en: "Lillipup",
-		fr: "Ponchiot",
-		es: "Lillipup",
-		it: "Lillipup",
-		pt: "Lillipup",
-		de: "Yorkleff"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 50,
-	types: ["Colorless"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Excadrill)/29.ts b/data/Trainer kits/HS trainer Kit (Excadrill)/29.ts
deleted file mode 100644
index 92999a1d0..000000000
--- a/data/Trainer kits/HS trainer Kit (Excadrill)/29.ts	
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Excadrill)'
-
-const card: Card = {
-	dexId: [532],
-	set: Set,
-
-	name: {
-		en: "Timburr",
-		fr: "Charpenti",
-		es: "Timburr",
-		it: "Timburr",
-		pt: "Timburr",
-		de: "Praktibalk"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 60,
-	types: ["Fighting"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Psychic",
-		value: "×2"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/1.ts b/data/Trainer kits/HS trainer Kit (Zoroark)/1.ts
deleted file mode 100644
index faceb1f2e..000000000
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/1.ts	
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
-
-const card: Card = {
-	dexId: [509],
-	set: Set,
-
-	name: {
-		en: "Purrloin",
-		fr: "Chacripan",
-		es: "Purrloin",
-		it: "Purrloin",
-		pt: "Purrloin",
-		de: "Felilou"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 60,
-	types: ["Darkness"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}],
-
-	resistances: [{
-		type: "Psychic",
-		value: "-20"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/12.ts b/data/Trainer kits/HS trainer Kit (Zoroark)/12.ts
deleted file mode 100644
index f8ba3ee7b..000000000
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/12.ts	
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
-
-const card: Card = {
-	dexId: [504],
-	set: Set,
-
-	name: {
-		en: "Patrat",
-		fr: "Ratentif",
-		es: "Patrat",
-		it: "Patrat",
-		pt: "Patrat",
-		de: "Nagelotz"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 50,
-	types: ["Colorless"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/13.ts b/data/Trainer kits/HS trainer Kit (Zoroark)/13.ts
deleted file mode 100644
index 0d4007556..000000000
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/13.ts	
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
-
-const card: Card = {
-	dexId: [570],
-	set: Set,
-
-	name: {
-		en: "Zorua",
-		fr: "Zorua",
-		es: "Zorua",
-		it: "Zorua",
-		pt: "Zorua",
-		de: "Zorua"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 60,
-	types: ["Darkness"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}],
-
-	resistances: [{
-		type: "Psychic",
-		value: "-20"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/14.ts b/data/Trainer kits/HS trainer Kit (Zoroark)/14.ts
deleted file mode 100644
index 15a73711c..000000000
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/14.ts	
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
-
-const card: Card = {
-	dexId: [519],
-	set: Set,
-
-	name: {
-		en: "Pidove",
-		fr: "Poichigeon",
-		es: "Pidove",
-		it: "Pidove",
-		pt: "Pidove",
-		de: "Dusselgurr"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 50,
-	types: ["Colorless"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Lightning",
-		value: "×2"
-	}],
-
-	resistances: [{
-		type: "Fighting",
-		value: "-20"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/19.ts b/data/Trainer kits/HS trainer Kit (Zoroark)/19.ts
deleted file mode 100644
index 622e0b0d1..000000000
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/19.ts	
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
-
-const card: Card = {
-	dexId: [572],
-	set: Set,
-
-	name: {
-		en: "Minccino",
-		fr: "Chinchidou",
-		es: "Minccino",
-		it: "Minccino",
-		pt: "Minccino",
-		de: "Picochilla"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 60,
-	types: ["Colorless"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/2.ts b/data/Trainer kits/HS trainer Kit (Zoroark)/2.ts
deleted file mode 100644
index 98277940a..000000000
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/2.ts	
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
-
-const card: Card = {
-	dexId: [505],
-	set: Set,
-
-	name: {
-		en: "Watchog",
-		fr: "Miradar",
-		es: "Watchog",
-		it: "Watchog",
-		pt: "Watchog",
-		de: "Kukmarda"
-	},
-
-	rarity: "Uncommon",
-	category: "Pokemon",
-	hp: 90,
-	types: ["Colorless"],
-
-	evolveFrom: {
-		en: "Patrat",
-		fr: "Ratentif",
-		es: "Patrat",
-		it: "Patrat",
-		pt: "Patrat",
-		de: "Nagelotz"
-	},
-
-	stage: "Stage1",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/21.ts b/data/Trainer kits/HS trainer Kit (Zoroark)/21.ts
deleted file mode 100644
index 15a73711c..000000000
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/21.ts	
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
-
-const card: Card = {
-	dexId: [519],
-	set: Set,
-
-	name: {
-		en: "Pidove",
-		fr: "Poichigeon",
-		es: "Pidove",
-		it: "Pidove",
-		pt: "Pidove",
-		de: "Dusselgurr"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 50,
-	types: ["Colorless"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Lightning",
-		value: "×2"
-	}],
-
-	resistances: [{
-		type: "Fighting",
-		value: "-20"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/23.ts b/data/Trainer kits/HS trainer Kit (Zoroark)/23.ts
deleted file mode 100644
index 0d4007556..000000000
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/23.ts	
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
-
-const card: Card = {
-	dexId: [570],
-	set: Set,
-
-	name: {
-		en: "Zorua",
-		fr: "Zorua",
-		es: "Zorua",
-		it: "Zorua",
-		pt: "Zorua",
-		de: "Zorua"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 60,
-	types: ["Darkness"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}],
-
-	resistances: [{
-		type: "Psychic",
-		value: "-20"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/25.ts b/data/Trainer kits/HS trainer Kit (Zoroark)/25.ts
deleted file mode 100644
index faceb1f2e..000000000
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/25.ts	
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
-
-const card: Card = {
-	dexId: [509],
-	set: Set,
-
-	name: {
-		en: "Purrloin",
-		fr: "Chacripan",
-		es: "Purrloin",
-		it: "Purrloin",
-		pt: "Purrloin",
-		de: "Felilou"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 60,
-	types: ["Darkness"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}],
-
-	resistances: [{
-		type: "Psychic",
-		value: "-20"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/29.ts b/data/Trainer kits/HS trainer Kit (Zoroark)/29.ts
deleted file mode 100644
index f8ba3ee7b..000000000
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/29.ts	
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
-
-const card: Card = {
-	dexId: [504],
-	set: Set,
-
-	name: {
-		en: "Patrat",
-		fr: "Ratentif",
-		es: "Patrat",
-		it: "Patrat",
-		pt: "Patrat",
-		de: "Nagelotz"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 50,
-	types: ["Colorless"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}]
-}
-
-export default card
\ No newline at end of file
diff --git a/data/Trainer kits/HS trainer Kit (Zoroark)/4.ts b/data/Trainer kits/HS trainer Kit (Zoroark)/4.ts
deleted file mode 100644
index 622e0b0d1..000000000
--- a/data/Trainer kits/HS trainer Kit (Zoroark)/4.ts	
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Card } from '../../../interfaces'
-import Set from '../HS trainer Kit (Zoroark)'
-
-const card: Card = {
-	dexId: [572],
-	set: Set,
-
-	name: {
-		en: "Minccino",
-		fr: "Chinchidou",
-		es: "Minccino",
-		it: "Minccino",
-		pt: "Minccino",
-		de: "Picochilla"
-	},
-
-	rarity: "Common",
-	category: "Pokemon",
-	hp: 60,
-	types: ["Colorless"],
-	stage: "Basic",
-	retreat: 1,
-
-	weaknesses: [{
-		type: "Fighting",
-		value: "×2"
-	}]
-}
-
-export default card
\ No newline at end of file