From 399f9960eee332e4aec7b4d0e2204795fd2af070 Mon Sep 17 00:00:00 2001
From: Avior <florian.bouillon@delta-wings.net>
Date: Sat, 8 Feb 2020 02:02:16 +0100
Subject: [PATCH] Updated Sword Shield Date (35/202 done)

Signed-off-by: Avior <florian.bouillon@delta-wings.net>
---
 cards/swsh/swsh1/1.ts   | 21 ++++-----------------
 cards/swsh/swsh1/10.ts  | 18 ++++++------------
 cards/swsh/swsh1/100.ts |  3 +--
 cards/swsh/swsh1/101.ts |  3 +--
 cards/swsh/swsh1/102.ts |  3 +--
 cards/swsh/swsh1/103.ts |  3 +--
 cards/swsh/swsh1/104.ts |  8 +-------
 cards/swsh/swsh1/105.ts |  3 +--
 cards/swsh/swsh1/106.ts |  3 +--
 cards/swsh/swsh1/107.ts |  3 +--
 cards/swsh/swsh1/108.ts |  3 +--
 cards/swsh/swsh1/109.ts |  3 +--
 cards/swsh/swsh1/11.ts  | 20 ++++++--------------
 cards/swsh/swsh1/110.ts |  3 +--
 cards/swsh/swsh1/111.ts |  3 +--
 cards/swsh/swsh1/112.ts |  3 +--
 cards/swsh/swsh1/113.ts |  3 +--
 cards/swsh/swsh1/114.ts |  3 +--
 cards/swsh/swsh1/115.ts |  8 +-------
 cards/swsh/swsh1/116.ts |  3 +--
 cards/swsh/swsh1/117.ts |  3 +--
 cards/swsh/swsh1/118.ts |  3 +--
 cards/swsh/swsh1/119.ts |  3 +--
 cards/swsh/swsh1/12.ts  | 18 +++++++-----------
 cards/swsh/swsh1/120.ts |  8 +-------
 cards/swsh/swsh1/121.ts |  3 +--
 cards/swsh/swsh1/122.ts |  3 +--
 cards/swsh/swsh1/123.ts |  3 +--
 cards/swsh/swsh1/124.ts |  3 +--
 cards/swsh/swsh1/125.ts |  3 +--
 cards/swsh/swsh1/126.ts |  3 +--
 cards/swsh/swsh1/127.ts |  3 +--
 cards/swsh/swsh1/128.ts |  3 +--
 cards/swsh/swsh1/129.ts |  3 +--
 cards/swsh/swsh1/13.ts  | 16 +++++++---------
 cards/swsh/swsh1/130.ts |  3 +--
 cards/swsh/swsh1/131.ts |  3 +--
 cards/swsh/swsh1/132.ts |  3 +--
 cards/swsh/swsh1/133.ts |  3 +--
 cards/swsh/swsh1/134.ts |  3 +--
 cards/swsh/swsh1/135.ts |  3 +--
 cards/swsh/swsh1/136.ts |  3 +--
 cards/swsh/swsh1/137.ts |  3 +--
 cards/swsh/swsh1/138.ts |  8 +-------
 cards/swsh/swsh1/139.ts |  8 +-------
 cards/swsh/swsh1/14.ts  | 17 ++++-------------
 cards/swsh/swsh1/140.ts |  3 +--
 cards/swsh/swsh1/141.ts |  8 +-------
 cards/swsh/swsh1/142.ts |  3 +--
 cards/swsh/swsh1/143.ts |  3 +--
 cards/swsh/swsh1/144.ts |  3 +--
 cards/swsh/swsh1/145.ts |  3 +--
 cards/swsh/swsh1/146.ts |  3 +--
 cards/swsh/swsh1/147.ts |  3 +--
 cards/swsh/swsh1/148.ts |  3 +--
 cards/swsh/swsh1/149.ts |  3 +--
 cards/swsh/swsh1/15.ts  | 11 ++---------
 cards/swsh/swsh1/150.ts |  3 +--
 cards/swsh/swsh1/151.ts |  3 +--
 cards/swsh/swsh1/152.ts |  3 +--
 cards/swsh/swsh1/153.ts |  3 +--
 cards/swsh/swsh1/154.ts |  3 +--
 cards/swsh/swsh1/155.ts |  8 +-------
 cards/swsh/swsh1/156.ts |  3 +--
 cards/swsh/swsh1/157.ts |  3 +--
 cards/swsh/swsh1/158.ts |  3 +--
 cards/swsh/swsh1/159.ts |  3 +--
 cards/swsh/swsh1/16.ts  | 16 ++++++----------
 cards/swsh/swsh1/160.ts |  3 +--
 cards/swsh/swsh1/161.ts |  3 +--
 cards/swsh/swsh1/162.ts |  3 +--
 cards/swsh/swsh1/163.ts |  3 +--
 cards/swsh/swsh1/164.ts |  3 +--
 cards/swsh/swsh1/165.ts |  3 +--
 cards/swsh/swsh1/166.ts |  3 +--
 cards/swsh/swsh1/167.ts |  3 +--
 cards/swsh/swsh1/168.ts |  3 +--
 cards/swsh/swsh1/169.ts |  3 +--
 cards/swsh/swsh1/17.ts  | 16 +++++++---------
 cards/swsh/swsh1/170.ts |  3 +--
 cards/swsh/swsh1/171.ts |  3 +--
 cards/swsh/swsh1/172.ts |  3 +--
 cards/swsh/swsh1/173.ts |  3 +--
 cards/swsh/swsh1/174.ts |  3 +--
 cards/swsh/swsh1/175.ts |  3 +--
 cards/swsh/swsh1/176.ts |  3 +--
 cards/swsh/swsh1/177.ts |  3 +--
 cards/swsh/swsh1/178.ts |  3 +--
 cards/swsh/swsh1/179.ts |  3 +--
 cards/swsh/swsh1/18.ts  | 16 +++++++---------
 cards/swsh/swsh1/180.ts |  3 +--
 cards/swsh/swsh1/181.ts |  3 +--
 cards/swsh/swsh1/182.ts |  3 +--
 cards/swsh/swsh1/183.ts |  3 +--
 cards/swsh/swsh1/184.ts |  3 +--
 cards/swsh/swsh1/185.ts |  3 +--
 cards/swsh/swsh1/186.ts |  3 +--
 cards/swsh/swsh1/187.ts |  8 +-------
 cards/swsh/swsh1/188.ts |  8 +-------
 cards/swsh/swsh1/189.ts |  8 +-------
 cards/swsh/swsh1/19.ts  | 11 +++--------
 cards/swsh/swsh1/190.ts |  8 +-------
 cards/swsh/swsh1/191.ts |  8 +-------
 cards/swsh/swsh1/192.ts |  8 +-------
 cards/swsh/swsh1/193.ts |  8 +-------
 cards/swsh/swsh1/194.ts |  8 +-------
 cards/swsh/swsh1/195.ts |  8 +-------
 cards/swsh/swsh1/196.ts |  8 +-------
 cards/swsh/swsh1/197.ts |  8 +-------
 cards/swsh/swsh1/198.ts |  8 +-------
 cards/swsh/swsh1/199.ts |  3 +--
 cards/swsh/swsh1/2.ts   | 22 ++++++++--------------
 cards/swsh/swsh1/20.ts  | 16 ++++++----------
 cards/swsh/swsh1/200.ts |  3 +--
 cards/swsh/swsh1/201.ts |  3 +--
 cards/swsh/swsh1/202.ts |  3 +--
 cards/swsh/swsh1/21.ts  | 11 +++--------
 cards/swsh/swsh1/22.ts  | 16 ++++++++--------
 cards/swsh/swsh1/23.ts  | 13 +++++--------
 cards/swsh/swsh1/24.ts  | 21 ++++++---------------
 cards/swsh/swsh1/25.ts  | 19 +++----------------
 cards/swsh/swsh1/26.ts  | 13 ++++---------
 cards/swsh/swsh1/27.ts  | 18 ++++++++----------
 cards/swsh/swsh1/28.ts  | 15 ++++-----------
 cards/swsh/swsh1/29.ts  | 13 ++++---------
 cards/swsh/swsh1/3.ts   | 18 ++++++++----------
 cards/swsh/swsh1/30.ts  | 16 ++++++----------
 cards/swsh/swsh1/31.ts  | 14 ++++++--------
 cards/swsh/swsh1/32.ts  | 16 ++++++++--------
 cards/swsh/swsh1/33.ts  | 14 +++++++-------
 cards/swsh/swsh1/34.ts  |  9 ++-------
 cards/swsh/swsh1/35.ts  |  9 ++-------
 cards/swsh/swsh1/36.ts  |  3 +--
 cards/swsh/swsh1/37.ts  |  3 +--
 cards/swsh/swsh1/38.ts  |  3 +--
 cards/swsh/swsh1/39.ts  |  3 +--
 cards/swsh/swsh1/4.ts   | 15 ++++-----------
 cards/swsh/swsh1/40.ts  |  3 +--
 cards/swsh/swsh1/41.ts  |  3 +--
 cards/swsh/swsh1/42.ts  |  3 +--
 cards/swsh/swsh1/43.ts  |  3 +--
 cards/swsh/swsh1/44.ts  |  3 +--
 cards/swsh/swsh1/45.ts  |  3 +--
 cards/swsh/swsh1/46.ts  |  3 +--
 cards/swsh/swsh1/47.ts  |  3 +--
 cards/swsh/swsh1/48.ts  |  3 +--
 cards/swsh/swsh1/49.ts  |  8 +-------
 cards/swsh/swsh1/5.ts   | 16 ++++++++--------
 cards/swsh/swsh1/50.ts  |  3 +--
 cards/swsh/swsh1/51.ts  |  3 +--
 cards/swsh/swsh1/52.ts  |  3 +--
 cards/swsh/swsh1/53.ts  |  8 +-------
 cards/swsh/swsh1/54.ts  |  3 +--
 cards/swsh/swsh1/55.ts  |  3 +--
 cards/swsh/swsh1/56.ts  |  3 +--
 cards/swsh/swsh1/57.ts  |  3 +--
 cards/swsh/swsh1/58.ts  |  3 +--
 cards/swsh/swsh1/59.ts  |  3 +--
 cards/swsh/swsh1/6.ts   | 13 ++++---------
 cards/swsh/swsh1/60.ts  |  3 +--
 cards/swsh/swsh1/61.ts  |  3 +--
 cards/swsh/swsh1/62.ts  |  3 +--
 cards/swsh/swsh1/63.ts  |  3 +--
 cards/swsh/swsh1/64.ts  |  3 +--
 cards/swsh/swsh1/65.ts  |  3 +--
 cards/swsh/swsh1/66.ts  |  3 +--
 cards/swsh/swsh1/67.ts  |  3 +--
 cards/swsh/swsh1/68.ts  |  3 +--
 cards/swsh/swsh1/69.ts  |  3 +--
 cards/swsh/swsh1/7.ts   | 17 ++++-------------
 cards/swsh/swsh1/70.ts  |  3 +--
 cards/swsh/swsh1/71.ts  |  3 +--
 cards/swsh/swsh1/72.ts  |  8 +-------
 cards/swsh/swsh1/73.ts  |  3 +--
 cards/swsh/swsh1/74.ts  |  3 +--
 cards/swsh/swsh1/75.ts  |  3 +--
 cards/swsh/swsh1/76.ts  |  3 +--
 cards/swsh/swsh1/77.ts  |  3 +--
 cards/swsh/swsh1/78.ts  |  3 +--
 cards/swsh/swsh1/79.ts  |  8 +-------
 cards/swsh/swsh1/8.ts   | 11 ++---------
 cards/swsh/swsh1/80.ts  |  3 +--
 cards/swsh/swsh1/81.ts  |  3 +--
 cards/swsh/swsh1/82.ts  |  3 +--
 cards/swsh/swsh1/83.ts  |  3 +--
 cards/swsh/swsh1/84.ts  |  3 +--
 cards/swsh/swsh1/85.ts  |  3 +--
 cards/swsh/swsh1/86.ts  |  8 +-------
 cards/swsh/swsh1/87.ts  |  3 +--
 cards/swsh/swsh1/88.ts  |  3 +--
 cards/swsh/swsh1/89.ts  |  3 +--
 cards/swsh/swsh1/9.ts   | 19 ++++++-------------
 cards/swsh/swsh1/90.ts  |  3 +--
 cards/swsh/swsh1/91.ts  |  8 +-------
 cards/swsh/swsh1/92.ts  |  3 +--
 cards/swsh/swsh1/93.ts  |  3 +--
 cards/swsh/swsh1/94.ts  |  3 +--
 cards/swsh/swsh1/95.ts  |  3 +--
 cards/swsh/swsh1/96.ts  |  3 +--
 cards/swsh/swsh1/97.ts  |  3 +--
 cards/swsh/swsh1/98.ts  |  3 +--
 cards/swsh/swsh1/99.ts  |  3 +--
 202 files changed, 352 insertions(+), 818 deletions(-)

diff --git a/cards/swsh/swsh1/1.ts b/cards/swsh/swsh1/1.ts
index 28d1e7a51..61d921d0a 100644
--- a/cards/swsh/swsh1/1.ts
+++ b/cards/swsh/swsh1/1.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-1",
 	localId: 1,
 
+	dexId: 251,
+
 	// Card informations
 	name: {
 		en: "Celebi V",
@@ -23,22 +25,15 @@ const card: Card = {
 		Type.GRASS,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/1/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/1/low.png",
 		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/1/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/1/high.png",
-		},
 	},
 
-	evolveFrom: {},
-
 	tags: [
+		Tag.BASIC,
 		Tag.V,
 	],
 
@@ -50,11 +45,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.GRASS
 		],
@@ -87,8 +77,6 @@ const card: Card = {
 		value: "×2"
 	}],
 
-
-
 	retreat: 1,
 
 	rarity: Rarity.RareV,
@@ -96,10 +84,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/10.ts b/cards/swsh/swsh1/10.ts
index 9834b66c6..384df2362 100644
--- a/cards/swsh/swsh1/10.ts
+++ b/cards/swsh/swsh1/10.ts
@@ -29,14 +29,13 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/10/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/10/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/10/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/10/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
+	evolveTo: [{
+		en: "Thwackey",
+		fr: "Badabouin",
+	}],
 
 	tags: [
 		Tag.BASIC,
@@ -47,8 +46,6 @@ const card: Card = {
 		name: "Naoki Saito"
 	},
 
-
-
 	attacks: [{
 		cost: [
 			Type.COLORLESS
@@ -69,8 +66,6 @@ const card: Card = {
 		value: "×2"
 	}],
 
-
-
 	retreat: 1,
 
 	rarity: Rarity.Common,
@@ -78,10 +73,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/100.ts b/cards/swsh/swsh1/100.ts
index 92aa2687a..6d21cf597 100644
--- a/cards/swsh/swsh1/100.ts
+++ b/cards/swsh/swsh1/100.ts
@@ -90,10 +90,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/101.ts b/cards/swsh/swsh1/101.ts
index a6dce7973..3a26db850 100644
--- a/cards/swsh/swsh1/101.ts
+++ b/cards/swsh/swsh1/101.ts
@@ -84,10 +84,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/102.ts b/cards/swsh/swsh1/102.ts
index 231811398..260866a45 100644
--- a/cards/swsh/swsh1/102.ts
+++ b/cards/swsh/swsh1/102.ts
@@ -74,10 +74,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/103.ts b/cards/swsh/swsh1/103.ts
index 7a9fe0ba8..3afb87afa 100644
--- a/cards/swsh/swsh1/103.ts
+++ b/cards/swsh/swsh1/103.ts
@@ -95,10 +95,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/104.ts b/cards/swsh/swsh1/104.ts
index 5baa360ec..84e4d3e6d 100644
--- a/cards/swsh/swsh1/104.ts
+++ b/cards/swsh/swsh1/104.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.FIGHTING,
 			Type.COLORLESS
@@ -99,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/105.ts b/cards/swsh/swsh1/105.ts
index 4da5b2042..b35bf617d 100644
--- a/cards/swsh/swsh1/105.ts
+++ b/cards/swsh/swsh1/105.ts
@@ -84,10 +84,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/106.ts b/cards/swsh/swsh1/106.ts
index a2593de6f..f0c910535 100644
--- a/cards/swsh/swsh1/106.ts
+++ b/cards/swsh/swsh1/106.ts
@@ -83,10 +83,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/107.ts b/cards/swsh/swsh1/107.ts
index 0e42872ab..19cc99d2c 100644
--- a/cards/swsh/swsh1/107.ts
+++ b/cards/swsh/swsh1/107.ts
@@ -77,10 +77,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/108.ts b/cards/swsh/swsh1/108.ts
index ec50fa554..e0d1d259b 100644
--- a/cards/swsh/swsh1/108.ts
+++ b/cards/swsh/swsh1/108.ts
@@ -84,10 +84,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/109.ts b/cards/swsh/swsh1/109.ts
index dd1de3f3b..f52b63e9b 100644
--- a/cards/swsh/swsh1/109.ts
+++ b/cards/swsh/swsh1/109.ts
@@ -92,10 +92,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/11.ts b/cards/swsh/swsh1/11.ts
index 19bb30180..796883fd3 100644
--- a/cards/swsh/swsh1/11.ts
+++ b/cards/swsh/swsh1/11.ts
@@ -23,20 +23,17 @@ const card: Card = {
 		Type.GRASS,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/11/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/11/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/11/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/11/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
+	evolveTo: [{
+		en: "Thwackey",
+		fr: "Badabouin",
+	}],
 
 	tags: [
 		Tag.BASIC,
@@ -47,8 +44,6 @@ const card: Card = {
 		name: "Kouki Saitou"
 	},
 
-
-
 	attacks: [{
 		cost: [
 			Type.COLORLESS
@@ -75,8 +70,6 @@ const card: Card = {
 		value: "×2"
 	}],
 
-
-
 	retreat: 1,
 
 	rarity: Rarity.Common,
@@ -84,10 +77,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/110.ts b/cards/swsh/swsh1/110.ts
index a23adec8a..d141fc613 100644
--- a/cards/swsh/swsh1/110.ts
+++ b/cards/swsh/swsh1/110.ts
@@ -93,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/111.ts b/cards/swsh/swsh1/111.ts
index 8f6286697..62eeae639 100644
--- a/cards/swsh/swsh1/111.ts
+++ b/cards/swsh/swsh1/111.ts
@@ -78,10 +78,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/112.ts b/cards/swsh/swsh1/112.ts
index 6a0974653..98e109a40 100644
--- a/cards/swsh/swsh1/112.ts
+++ b/cards/swsh/swsh1/112.ts
@@ -75,10 +75,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/113.ts b/cards/swsh/swsh1/113.ts
index ffbe7ee42..674087941 100644
--- a/cards/swsh/swsh1/113.ts
+++ b/cards/swsh/swsh1/113.ts
@@ -96,10 +96,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/114.ts b/cards/swsh/swsh1/114.ts
index 63afc9051..920539b32 100644
--- a/cards/swsh/swsh1/114.ts
+++ b/cards/swsh/swsh1/114.ts
@@ -79,10 +79,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/115.ts b/cards/swsh/swsh1/115.ts
index c18e0eb27..2e171454c 100644
--- a/cards/swsh/swsh1/115.ts
+++ b/cards/swsh/swsh1/115.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.FIGHTING
 		],
@@ -94,10 +89,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/116.ts b/cards/swsh/swsh1/116.ts
index 5b3373d79..a930080bd 100644
--- a/cards/swsh/swsh1/116.ts
+++ b/cards/swsh/swsh1/116.ts
@@ -96,10 +96,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/117.ts b/cards/swsh/swsh1/117.ts
index 97b249ccb..ad1bd05d6 100644
--- a/cards/swsh/swsh1/117.ts
+++ b/cards/swsh/swsh1/117.ts
@@ -90,10 +90,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/118.ts b/cards/swsh/swsh1/118.ts
index c6ee48cbc..d7bcd2643 100644
--- a/cards/swsh/swsh1/118.ts
+++ b/cards/swsh/swsh1/118.ts
@@ -92,10 +92,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/119.ts b/cards/swsh/swsh1/119.ts
index 59b2c6a8f..cea59d17c 100644
--- a/cards/swsh/swsh1/119.ts
+++ b/cards/swsh/swsh1/119.ts
@@ -93,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/12.ts b/cards/swsh/swsh1/12.ts
index 3b0dd1d93..62e9d873c 100644
--- a/cards/swsh/swsh1/12.ts
+++ b/cards/swsh/swsh1/12.ts
@@ -23,17 +23,11 @@ const card: Card = {
 		Type.GRASS,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/12/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/12/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/12/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/12/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -41,6 +35,11 @@ const card: Card = {
 		fr: "Ouistempo",
 	},
 
+	evolveTo: [{
+		en: "Rillaboom",
+		fr: "Gorythmic",
+	}],
+
 	tags: [
 		Tag.STAGE1,
 	],
@@ -86,8 +85,6 @@ const card: Card = {
 		value: "×2"
 	}],
 
-
-
 	retreat: 2,
 
 	rarity: Rarity.Uncommon,
@@ -95,10 +92,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/120.ts b/cards/swsh/swsh1/120.ts
index f65a11f17..343c2c044 100644
--- a/cards/swsh/swsh1/120.ts
+++ b/cards/swsh/swsh1/120.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.DARKNESS
 		],
@@ -96,10 +91,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/121.ts b/cards/swsh/swsh1/121.ts
index 64cd5942e..e24702769 100644
--- a/cards/swsh/swsh1/121.ts
+++ b/cards/swsh/swsh1/121.ts
@@ -88,10 +88,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/122.ts b/cards/swsh/swsh1/122.ts
index a2fb84c66..9315cc2b3 100644
--- a/cards/swsh/swsh1/122.ts
+++ b/cards/swsh/swsh1/122.ts
@@ -99,10 +99,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/123.ts b/cards/swsh/swsh1/123.ts
index 78ee2415e..5cbb0ccdb 100644
--- a/cards/swsh/swsh1/123.ts
+++ b/cards/swsh/swsh1/123.ts
@@ -84,10 +84,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/124.ts b/cards/swsh/swsh1/124.ts
index 6d389ea23..819479655 100644
--- a/cards/swsh/swsh1/124.ts
+++ b/cards/swsh/swsh1/124.ts
@@ -94,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/125.ts b/cards/swsh/swsh1/125.ts
index 51bce60e0..ba908ad08 100644
--- a/cards/swsh/swsh1/125.ts
+++ b/cards/swsh/swsh1/125.ts
@@ -77,10 +77,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/126.ts b/cards/swsh/swsh1/126.ts
index aba384058..1de1937c4 100644
--- a/cards/swsh/swsh1/126.ts
+++ b/cards/swsh/swsh1/126.ts
@@ -92,10 +92,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/127.ts b/cards/swsh/swsh1/127.ts
index 8dc7bee68..a879ffa77 100644
--- a/cards/swsh/swsh1/127.ts
+++ b/cards/swsh/swsh1/127.ts
@@ -90,10 +90,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/128.ts b/cards/swsh/swsh1/128.ts
index 418afffaf..160a73246 100644
--- a/cards/swsh/swsh1/128.ts
+++ b/cards/swsh/swsh1/128.ts
@@ -93,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/129.ts b/cards/swsh/swsh1/129.ts
index 9bed45c0d..dfb2f5842 100644
--- a/cards/swsh/swsh1/129.ts
+++ b/cards/swsh/swsh1/129.ts
@@ -94,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/13.ts b/cards/swsh/swsh1/13.ts
index fa5b70edd..ba0cae80a 100644
--- a/cards/swsh/swsh1/13.ts
+++ b/cards/swsh/swsh1/13.ts
@@ -23,17 +23,11 @@ const card: Card = {
 		Type.GRASS,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/13/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/13/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/13/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/13/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -41,6 +35,11 @@ const card: Card = {
 		fr: "Ouistempo",
 	},
 
+	evolveTo: [{
+		en: "Rillaboom",
+		fr: "Gorythmic",
+	}],
+
 	tags: [
 		Tag.STAGE1,
 	],
@@ -93,10 +92,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/130.ts b/cards/swsh/swsh1/130.ts
index 2a2967f43..fd6660a94 100644
--- a/cards/swsh/swsh1/130.ts
+++ b/cards/swsh/swsh1/130.ts
@@ -77,10 +77,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/131.ts b/cards/swsh/swsh1/131.ts
index 5b35a4812..1871472d5 100644
--- a/cards/swsh/swsh1/131.ts
+++ b/cards/swsh/swsh1/131.ts
@@ -99,10 +99,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/132.ts b/cards/swsh/swsh1/132.ts
index ff7cfdb22..4b363da70 100644
--- a/cards/swsh/swsh1/132.ts
+++ b/cards/swsh/swsh1/132.ts
@@ -93,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/133.ts b/cards/swsh/swsh1/133.ts
index 7923712d5..3d6c8b752 100644
--- a/cards/swsh/swsh1/133.ts
+++ b/cards/swsh/swsh1/133.ts
@@ -87,10 +87,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/134.ts b/cards/swsh/swsh1/134.ts
index 20656b637..a61f12ce3 100644
--- a/cards/swsh/swsh1/134.ts
+++ b/cards/swsh/swsh1/134.ts
@@ -94,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/135.ts b/cards/swsh/swsh1/135.ts
index 520b87e17..32b35c76b 100644
--- a/cards/swsh/swsh1/135.ts
+++ b/cards/swsh/swsh1/135.ts
@@ -95,10 +95,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/136.ts b/cards/swsh/swsh1/136.ts
index efe665a85..8d86afbed 100644
--- a/cards/swsh/swsh1/136.ts
+++ b/cards/swsh/swsh1/136.ts
@@ -82,10 +82,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/137.ts b/cards/swsh/swsh1/137.ts
index e2fec0373..937e6a4ed 100644
--- a/cards/swsh/swsh1/137.ts
+++ b/cards/swsh/swsh1/137.ts
@@ -100,10 +100,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/138.ts b/cards/swsh/swsh1/138.ts
index 19719cfee..ff1ffa853 100644
--- a/cards/swsh/swsh1/138.ts
+++ b/cards/swsh/swsh1/138.ts
@@ -61,11 +61,6 @@ const card: Card = {
 	}],
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.METAL,
 			Type.METAL,
@@ -99,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/139.ts b/cards/swsh/swsh1/139.ts
index 3a5bc2622..d191a409d 100644
--- a/cards/swsh/swsh1/139.ts
+++ b/cards/swsh/swsh1/139.ts
@@ -61,11 +61,6 @@ const card: Card = {
 	}],
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.METAL,
 			Type.METAL,
@@ -99,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/14.ts b/cards/swsh/swsh1/14.ts
index 05f4be7d4..7b02fcffe 100644
--- a/cards/swsh/swsh1/14.ts
+++ b/cards/swsh/swsh1/14.ts
@@ -23,17 +23,11 @@ const card: Card = {
 		Type.GRASS,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/14/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/14/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/14/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/14/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -51,7 +45,7 @@ const card: Card = {
 	},
 
 	abilities: [{
-		id: -1,
+		id: 2,
 		type: AbilityType.TALENT,
 		name: {
 			en: "Voltage Beat",
@@ -59,7 +53,7 @@ const card: Card = {
 		},
 		text: {
 			en: "Once during your turn, you may search your deck for up to 2 Grass Energy cards and attach them to 1 of your Pokémon. Then, shuffle your deck.",
-			fr: "Une fois pendant votre tour, vous pouvez chercher dans votre deck jusqu’à 2 cartes Énergie Grass, puis les attacher à l’un de vos Pokémon. Mélangez ensuite votre deck.",
+			fr: "Une fois pendant votre tour, vous pouvez chercher dans votre deck jusqu’à 2 cartes Énergie Plante, puis les attacher à l’un de vos Pokémon. Mélangez ensuite votre deck.",
 		}
 	}],
 
@@ -82,8 +76,6 @@ const card: Card = {
 		value: "×2"
 	}],
 
-
-
 	retreat: 3,
 
 	rarity: Rarity.RareHolo,
@@ -91,10 +83,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/140.ts b/cards/swsh/swsh1/140.ts
index e388f8b50..a460d5b12 100644
--- a/cards/swsh/swsh1/140.ts
+++ b/cards/swsh/swsh1/140.ts
@@ -88,10 +88,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/141.ts b/cards/swsh/swsh1/141.ts
index 14532a49b..a381eef8f 100644
--- a/cards/swsh/swsh1/141.ts
+++ b/cards/swsh/swsh1/141.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.COLORLESS,
 			Type.COLORLESS,
@@ -101,10 +96,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/142.ts b/cards/swsh/swsh1/142.ts
index 372a8afbc..567492218 100644
--- a/cards/swsh/swsh1/142.ts
+++ b/cards/swsh/swsh1/142.ts
@@ -88,10 +88,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/143.ts b/cards/swsh/swsh1/143.ts
index 75a29efcf..d0e0ac5e7 100644
--- a/cards/swsh/swsh1/143.ts
+++ b/cards/swsh/swsh1/143.ts
@@ -90,10 +90,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/144.ts b/cards/swsh/swsh1/144.ts
index ca1fb3cd7..5415985fa 100644
--- a/cards/swsh/swsh1/144.ts
+++ b/cards/swsh/swsh1/144.ts
@@ -95,10 +95,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/145.ts b/cards/swsh/swsh1/145.ts
index 3bab28fb3..602ea1ecf 100644
--- a/cards/swsh/swsh1/145.ts
+++ b/cards/swsh/swsh1/145.ts
@@ -91,10 +91,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/146.ts b/cards/swsh/swsh1/146.ts
index 41c2f0447..badb0d5cc 100644
--- a/cards/swsh/swsh1/146.ts
+++ b/cards/swsh/swsh1/146.ts
@@ -74,10 +74,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/147.ts b/cards/swsh/swsh1/147.ts
index dab3ca4e1..f57905eb6 100644
--- a/cards/swsh/swsh1/147.ts
+++ b/cards/swsh/swsh1/147.ts
@@ -92,10 +92,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/148.ts b/cards/swsh/swsh1/148.ts
index 0d2b582ea..c37c26e5b 100644
--- a/cards/swsh/swsh1/148.ts
+++ b/cards/swsh/swsh1/148.ts
@@ -87,10 +87,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/149.ts b/cards/swsh/swsh1/149.ts
index 875f35fe0..f9449aa4d 100644
--- a/cards/swsh/swsh1/149.ts
+++ b/cards/swsh/swsh1/149.ts
@@ -79,10 +79,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/15.ts b/cards/swsh/swsh1/15.ts
index 4ee079068..2337bd1f6 100644
--- a/cards/swsh/swsh1/15.ts
+++ b/cards/swsh/swsh1/15.ts
@@ -23,17 +23,11 @@ const card: Card = {
 		Type.GRASS,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/15/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/15/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/15/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/15/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -99,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/150.ts b/cards/swsh/swsh1/150.ts
index 727355441..4053c7068 100644
--- a/cards/swsh/swsh1/150.ts
+++ b/cards/swsh/swsh1/150.ts
@@ -87,10 +87,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/151.ts b/cards/swsh/swsh1/151.ts
index a2617bec0..df876d4f1 100644
--- a/cards/swsh/swsh1/151.ts
+++ b/cards/swsh/swsh1/151.ts
@@ -94,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/152.ts b/cards/swsh/swsh1/152.ts
index e79e5f76d..a48fd82b7 100644
--- a/cards/swsh/swsh1/152.ts
+++ b/cards/swsh/swsh1/152.ts
@@ -79,10 +79,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/153.ts b/cards/swsh/swsh1/153.ts
index 659d0f249..6b926f2de 100644
--- a/cards/swsh/swsh1/153.ts
+++ b/cards/swsh/swsh1/153.ts
@@ -85,10 +85,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/154.ts b/cards/swsh/swsh1/154.ts
index 1c21bd4e7..afc4b81cc 100644
--- a/cards/swsh/swsh1/154.ts
+++ b/cards/swsh/swsh1/154.ts
@@ -96,10 +96,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/155.ts b/cards/swsh/swsh1/155.ts
index 8b0835fdc..2203698f8 100644
--- a/cards/swsh/swsh1/155.ts
+++ b/cards/swsh/swsh1/155.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.COLORLESS
 		],
@@ -99,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/156.ts b/cards/swsh/swsh1/156.ts
index 47cb3ad87..f77999cb2 100644
--- a/cards/swsh/swsh1/156.ts
+++ b/cards/swsh/swsh1/156.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/157.ts b/cards/swsh/swsh1/157.ts
index cda660a6f..7f46fdb81 100644
--- a/cards/swsh/swsh1/157.ts
+++ b/cards/swsh/swsh1/157.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/158.ts b/cards/swsh/swsh1/158.ts
index e984aeaaa..dcdef1758 100644
--- a/cards/swsh/swsh1/158.ts
+++ b/cards/swsh/swsh1/158.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/159.ts b/cards/swsh/swsh1/159.ts
index 16c894153..b1b131550 100644
--- a/cards/swsh/swsh1/159.ts
+++ b/cards/swsh/swsh1/159.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/16.ts b/cards/swsh/swsh1/16.ts
index d370ca9c8..af278b6dd 100644
--- a/cards/swsh/swsh1/16.ts
+++ b/cards/swsh/swsh1/16.ts
@@ -23,20 +23,17 @@ const card: Card = {
 		Type.GRASS,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/16/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/16/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/16/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/16/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
+	evolveTo: [{
+		en: "Dottler",
+		fr: "Coléodôme",
+	}],
 
 	tags: [
 		Tag.BASIC,
@@ -74,10 +71,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/160.ts b/cards/swsh/swsh1/160.ts
index 7af9cf6d6..9313b12e2 100644
--- a/cards/swsh/swsh1/160.ts
+++ b/cards/swsh/swsh1/160.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/161.ts b/cards/swsh/swsh1/161.ts
index 631abea34..d586853b2 100644
--- a/cards/swsh/swsh1/161.ts
+++ b/cards/swsh/swsh1/161.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/162.ts b/cards/swsh/swsh1/162.ts
index 3717df4dc..9c95768a8 100644
--- a/cards/swsh/swsh1/162.ts
+++ b/cards/swsh/swsh1/162.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/163.ts b/cards/swsh/swsh1/163.ts
index 79c2e82aa..8c0b1d961 100644
--- a/cards/swsh/swsh1/163.ts
+++ b/cards/swsh/swsh1/163.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/164.ts b/cards/swsh/swsh1/164.ts
index a6ada4558..22dd139e4 100644
--- a/cards/swsh/swsh1/164.ts
+++ b/cards/swsh/swsh1/164.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/165.ts b/cards/swsh/swsh1/165.ts
index 087daeb71..af86d2c80 100644
--- a/cards/swsh/swsh1/165.ts
+++ b/cards/swsh/swsh1/165.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/166.ts b/cards/swsh/swsh1/166.ts
index 4a6fb0622..600e94dd8 100644
--- a/cards/swsh/swsh1/166.ts
+++ b/cards/swsh/swsh1/166.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/167.ts b/cards/swsh/swsh1/167.ts
index 27e4ad35b..ec0049208 100644
--- a/cards/swsh/swsh1/167.ts
+++ b/cards/swsh/swsh1/167.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/168.ts b/cards/swsh/swsh1/168.ts
index a30e2f7b0..f1fb01e38 100644
--- a/cards/swsh/swsh1/168.ts
+++ b/cards/swsh/swsh1/168.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/169.ts b/cards/swsh/swsh1/169.ts
index 7ddf6c169..2a1110991 100644
--- a/cards/swsh/swsh1/169.ts
+++ b/cards/swsh/swsh1/169.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/17.ts b/cards/swsh/swsh1/17.ts
index 0f14b379e..9b0518fbb 100644
--- a/cards/swsh/swsh1/17.ts
+++ b/cards/swsh/swsh1/17.ts
@@ -29,15 +29,14 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/17/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/17/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/17/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/17/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
-
+	evolveTo: [{
+		en: "Dottler",
+		fr: "Coléodôme",
+	}],
+	
 	tags: [
 		Tag.BASIC,
 	],
@@ -77,10 +76,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/170.ts b/cards/swsh/swsh1/170.ts
index 150087f4f..7799e138a 100644
--- a/cards/swsh/swsh1/170.ts
+++ b/cards/swsh/swsh1/170.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/171.ts b/cards/swsh/swsh1/171.ts
index 8236bf814..7dad4fabe 100644
--- a/cards/swsh/swsh1/171.ts
+++ b/cards/swsh/swsh1/171.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/172.ts b/cards/swsh/swsh1/172.ts
index 1cab0f2e8..7d65254e5 100644
--- a/cards/swsh/swsh1/172.ts
+++ b/cards/swsh/swsh1/172.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/173.ts b/cards/swsh/swsh1/173.ts
index 9edf0d86a..142694680 100644
--- a/cards/swsh/swsh1/173.ts
+++ b/cards/swsh/swsh1/173.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/174.ts b/cards/swsh/swsh1/174.ts
index 70687c83d..abccdef21 100644
--- a/cards/swsh/swsh1/174.ts
+++ b/cards/swsh/swsh1/174.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/175.ts b/cards/swsh/swsh1/175.ts
index 6f77e0d50..789de46f8 100644
--- a/cards/swsh/swsh1/175.ts
+++ b/cards/swsh/swsh1/175.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/176.ts b/cards/swsh/swsh1/176.ts
index 2a0e719e9..47f536d3f 100644
--- a/cards/swsh/swsh1/176.ts
+++ b/cards/swsh/swsh1/176.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/177.ts b/cards/swsh/swsh1/177.ts
index db37622b0..808664313 100644
--- a/cards/swsh/swsh1/177.ts
+++ b/cards/swsh/swsh1/177.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/178.ts b/cards/swsh/swsh1/178.ts
index 7b9bf72d6..3e542b030 100644
--- a/cards/swsh/swsh1/178.ts
+++ b/cards/swsh/swsh1/178.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/179.ts b/cards/swsh/swsh1/179.ts
index d9eeace21..dbb6c379a 100644
--- a/cards/swsh/swsh1/179.ts
+++ b/cards/swsh/swsh1/179.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/18.ts b/cards/swsh/swsh1/18.ts
index 48c34f658..67b82b11f 100644
--- a/cards/swsh/swsh1/18.ts
+++ b/cards/swsh/swsh1/18.ts
@@ -23,17 +23,11 @@ const card: Card = {
 		Type.GRASS,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/18/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/18/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/18/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/18/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -41,6 +35,11 @@ const card: Card = {
 		fr: "Larvadar",
 	},
 
+	evolveTo: [{
+		en: "Orbeetle",
+		fr: "Astronelle",
+	}],
+
 	tags: [
 		Tag.STAGE1,
 	],
@@ -90,10 +89,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/180.ts b/cards/swsh/swsh1/180.ts
index 309f7c8af..40e3bfca8 100644
--- a/cards/swsh/swsh1/180.ts
+++ b/cards/swsh/swsh1/180.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/181.ts b/cards/swsh/swsh1/181.ts
index 8ab4401a6..bd28c2cca 100644
--- a/cards/swsh/swsh1/181.ts
+++ b/cards/swsh/swsh1/181.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/182.ts b/cards/swsh/swsh1/182.ts
index 09b778516..96202383b 100644
--- a/cards/swsh/swsh1/182.ts
+++ b/cards/swsh/swsh1/182.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/183.ts b/cards/swsh/swsh1/183.ts
index 22e739d8a..7687d40a0 100644
--- a/cards/swsh/swsh1/183.ts
+++ b/cards/swsh/swsh1/183.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/184.ts b/cards/swsh/swsh1/184.ts
index 1abbba74c..9eb3dab23 100644
--- a/cards/swsh/swsh1/184.ts
+++ b/cards/swsh/swsh1/184.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/185.ts b/cards/swsh/swsh1/185.ts
index 521155a0d..222905e6a 100644
--- a/cards/swsh/swsh1/185.ts
+++ b/cards/swsh/swsh1/185.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/186.ts b/cards/swsh/swsh1/186.ts
index 6b2a1a4b1..425949c8b 100644
--- a/cards/swsh/swsh1/186.ts
+++ b/cards/swsh/swsh1/186.ts
@@ -63,10 +63,9 @@ const card: Card = {
 	category: Category.ENERGY,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/187.ts b/cards/swsh/swsh1/187.ts
index f2290be3a..a601b6da4 100644
--- a/cards/swsh/swsh1/187.ts
+++ b/cards/swsh/swsh1/187.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.GRASS
 		],
@@ -98,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/188.ts b/cards/swsh/swsh1/188.ts
index 0a067a73a..284679d04 100644
--- a/cards/swsh/swsh1/188.ts
+++ b/cards/swsh/swsh1/188.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.FIRE,
 			Type.FIRE,
@@ -101,10 +96,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/189.ts b/cards/swsh/swsh1/189.ts
index a57c0c7ef..f27242e2a 100644
--- a/cards/swsh/swsh1/189.ts
+++ b/cards/swsh/swsh1/189.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.COLORLESS
 		],
@@ -98,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/19.ts b/cards/swsh/swsh1/19.ts
index 3e93aa1a2..bbedf198f 100644
--- a/cards/swsh/swsh1/19.ts
+++ b/cards/swsh/swsh1/19.ts
@@ -29,11 +29,7 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/19/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/19/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/19/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/19/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -51,7 +47,7 @@ const card: Card = {
 	},
 
 	abilities: [{
-		id: -1,
+		id: 2,
 		type: AbilityType.TALENT,
 		name: {
 			en: "Bug’s Radar",
@@ -93,10 +89,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/190.ts b/cards/swsh/swsh1/190.ts
index e94c4759a..721ee7d59 100644
--- a/cards/swsh/swsh1/190.ts
+++ b/cards/swsh/swsh1/190.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.COLORLESS
 		],
@@ -98,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/191.ts b/cards/swsh/swsh1/191.ts
index 6a6fb29ed..3213d95e3 100644
--- a/cards/swsh/swsh1/191.ts
+++ b/cards/swsh/swsh1/191.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.COLORLESS,
 			Type.COLORLESS
@@ -100,10 +95,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/192.ts b/cards/swsh/swsh1/192.ts
index d676c6a09..9916f4a73 100644
--- a/cards/swsh/swsh1/192.ts
+++ b/cards/swsh/swsh1/192.ts
@@ -61,11 +61,6 @@ const card: Card = {
 	}],
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.PSYCHIC,
 			Type.COLORLESS,
@@ -99,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/193.ts b/cards/swsh/swsh1/193.ts
index f4633db34..0463d3f88 100644
--- a/cards/swsh/swsh1/193.ts
+++ b/cards/swsh/swsh1/193.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.FIGHTING
 		],
@@ -94,10 +89,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/194.ts b/cards/swsh/swsh1/194.ts
index ad91b1554..b3f85d419 100644
--- a/cards/swsh/swsh1/194.ts
+++ b/cards/swsh/swsh1/194.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.DARKNESS
 		],
@@ -96,10 +91,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/195.ts b/cards/swsh/swsh1/195.ts
index b3eb2da0c..1e2cdc356 100644
--- a/cards/swsh/swsh1/195.ts
+++ b/cards/swsh/swsh1/195.ts
@@ -61,11 +61,6 @@ const card: Card = {
 	}],
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.METAL,
 			Type.METAL,
@@ -99,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/196.ts b/cards/swsh/swsh1/196.ts
index 9d0a8ba1e..a9bda0a29 100644
--- a/cards/swsh/swsh1/196.ts
+++ b/cards/swsh/swsh1/196.ts
@@ -61,11 +61,6 @@ const card: Card = {
 	}],
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.METAL,
 			Type.METAL,
@@ -99,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/197.ts b/cards/swsh/swsh1/197.ts
index ea844ac47..eb27fe28a 100644
--- a/cards/swsh/swsh1/197.ts
+++ b/cards/swsh/swsh1/197.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.COLORLESS,
 			Type.COLORLESS,
@@ -101,10 +96,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/198.ts b/cards/swsh/swsh1/198.ts
index 7d44daa2d..f6a2c0ed4 100644
--- a/cards/swsh/swsh1/198.ts
+++ b/cards/swsh/swsh1/198.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.COLORLESS
 		],
@@ -99,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/199.ts b/cards/swsh/swsh1/199.ts
index 7886a8544..393c55b36 100644
--- a/cards/swsh/swsh1/199.ts
+++ b/cards/swsh/swsh1/199.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/2.ts b/cards/swsh/swsh1/2.ts
index 8ef272c8f..4f47ead96 100644
--- a/cards/swsh/swsh1/2.ts
+++ b/cards/swsh/swsh1/2.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-2",
 	localId: 2,
 
+	dexId: 315,
+
 	// Card informations
 	name: {
 		en: "Roselia",
@@ -23,20 +25,17 @@ const card: Card = {
 		Type.GRASS,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/2/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/2/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/2/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/2/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
+	evolveTo: [{
+		en: "Roserade",
+		fr: "Roserade",
+	}],
 
 	tags: [
 		Tag.BASIC,
@@ -47,8 +46,6 @@ const card: Card = {
 		name: "sowsow"
 	},
 
-
-
 	attacks: [{
 		cost: [
 			Type.GRASS
@@ -69,8 +66,6 @@ const card: Card = {
 		value: "×2"
 	}],
 
-
-
 	retreat: 1,
 
 	rarity: Rarity.Common,
@@ -78,10 +73,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/20.ts b/cards/swsh/swsh1/20.ts
index 60003c720..02012a8ce 100644
--- a/cards/swsh/swsh1/20.ts
+++ b/cards/swsh/swsh1/20.ts
@@ -23,20 +23,17 @@ const card: Card = {
 		Type.GRASS,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/20/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/20/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/20/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/20/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
+	evolveTo: [{
+		en: "Eldegoss",
+		fr: "Blancoton",
+	}],
 
 	tags: [
 		Tag.BASIC,
@@ -86,10 +83,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/200.ts b/cards/swsh/swsh1/200.ts
index 26923a859..6c7b8ef2f 100644
--- a/cards/swsh/swsh1/200.ts
+++ b/cards/swsh/swsh1/200.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/201.ts b/cards/swsh/swsh1/201.ts
index f97235b98..353a8c80c 100644
--- a/cards/swsh/swsh1/201.ts
+++ b/cards/swsh/swsh1/201.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/202.ts b/cards/swsh/swsh1/202.ts
index d28c5616d..8c59e6324 100644
--- a/cards/swsh/swsh1/202.ts
+++ b/cards/swsh/swsh1/202.ts
@@ -66,10 +66,9 @@ const card: Card = {
 	category: Category.TRAINER,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/21.ts b/cards/swsh/swsh1/21.ts
index ad1ef5dc8..452135d91 100644
--- a/cards/swsh/swsh1/21.ts
+++ b/cards/swsh/swsh1/21.ts
@@ -29,11 +29,7 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/21/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/21/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/21/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/21/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -62,7 +58,7 @@ const card: Card = {
 		},
 		text: {
 			en: "Search your deck for up to 3 Grass Energy cards and attach them to your Benched Pokémon in any way you like. Then, shuffle your deck.",
-			fr: "Cherchez dans votre deck jusqu’à 3 cartes Énergie Grass, puis attachez-les à vos Pokémon de Banc comme il vous plaît. Mélangez ensuite votre deck.",
+			fr: "Cherchez dans votre deck jusqu’à 3 cartes Énergie Plante, puis attachez-les à vos Pokémon de Banc comme il vous plaît. Mélangez ensuite votre deck.",
 		},
 	},{
 		cost: [
@@ -89,10 +85,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/22.ts b/cards/swsh/swsh1/22.ts
index abd1c2f07..a10f9adfd 100644
--- a/cards/swsh/swsh1/22.ts
+++ b/cards/swsh/swsh1/22.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-22",
 	localId: 22,
 
+	dexId: 37,
+
 	// Card informations
 	name: {
 		en: "Vulpix",
@@ -29,14 +31,13 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/22/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/22/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/22/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/22/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
+	evolveTo: [{
+		en: "Ninetales",
+		fr: "Feunard",
+	}],
 
 	tags: [
 		Tag.BASIC,
@@ -74,10 +75,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/23.ts b/cards/swsh/swsh1/23.ts
index 83bc951f1..ab83d3521 100644
--- a/cards/swsh/swsh1/23.ts
+++ b/cards/swsh/swsh1/23.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-23",
 	localId: 23,
 
+	dexId: 38,
+
 	// Card informations
 	name: {
 		en: "Ninetales",
@@ -29,11 +31,7 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/23/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/23/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/23/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/23/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -62,7 +60,7 @@ const card: Card = {
 		},
 		text: {
 			en: "Attach a Fire Energy card from your discard pile to this Pokémon.",
-			fr: "Attachez une carte Énergie Fire de votre pile de défausse à ce Pokémon.",
+			fr: "Attachez une carte Énergie Feu de votre pile de défausse à ce Pokémon.",
 		},
 		damage: 30
 	},{
@@ -91,10 +89,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/24.ts b/cards/swsh/swsh1/24.ts
index 4ed028e49..a950c9b11 100644
--- a/cards/swsh/swsh1/24.ts
+++ b/cards/swsh/swsh1/24.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-24",
 	localId: 24,
 
+	dexId: 324,
+
 	// Card informations
 	name: {
 		en: "Torkoal V",
@@ -29,16 +31,11 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/24/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/24/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/24/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/24/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
-
 	tags: [
+		Tag.BASIC,
 		Tag.V,
 	],
 
@@ -50,11 +47,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.FIRE,
 			Type.FIRE,
@@ -66,7 +58,7 @@ const card: Card = {
 		},
 		text: {
 			en: "Discard the top card of your deck. If that card is a Fire Energy card, this attack does 90 more damage.",
-			fr: "Défaussez la carte du dessus de votre deck. Si cette carte-là est une carte Énergie Fire, cette attaque inflige 90 dégâts supplémentaires.",
+			fr: "Défaussez la carte du dessus de votre deck. Si cette carte-là est une carte Énergie Feu, cette attaque inflige 90 dégâts supplémentaires.",
 		},
 		damage: "90+"
 	},{
@@ -101,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/25.ts b/cards/swsh/swsh1/25.ts
index f373b9850..513c7eade 100644
--- a/cards/swsh/swsh1/25.ts
+++ b/cards/swsh/swsh1/25.ts
@@ -23,22 +23,15 @@ const card: Card = {
 		Type.FIRE,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/25/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/25/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/25/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/25/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
-
 	tags: [
+		Tag.BASIC,
 		Tag.V,
 	],
 
@@ -50,11 +43,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.COLORLESS
 		],
@@ -96,10 +84,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/26.ts b/cards/swsh/swsh1/26.ts
index 7756d79cd..f39e688aa 100644
--- a/cards/swsh/swsh1/26.ts
+++ b/cards/swsh/swsh1/26.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-26",
 	localId: 26,
 
+	dexId: 631,
+
 	// Card informations
 	name: {
 		en: "Heatmor",
@@ -29,15 +31,9 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/26/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/26/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/26/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/26/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
-
 	tags: [
 		Tag.BASIC,
 	],
@@ -88,10 +84,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/27.ts b/cards/swsh/swsh1/27.ts
index 8a9492497..7aceeaa7f 100644
--- a/cards/swsh/swsh1/27.ts
+++ b/cards/swsh/swsh1/27.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-27",
 	localId: 27,
 
+	dexId: 757,
+
 	// Card informations
 	name: {
 		en: "Salandit",
@@ -29,14 +31,13 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/27/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/27/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/27/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/27/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
+	evolveTo: [{
+		en: "Salazzle",
+		fr: "Malamandre",
+	}],
 
 	tags: [
 		Tag.BASIC,
@@ -47,8 +48,6 @@ const card: Card = {
 		name: "SATOSHI NAKAI"
 	},
 
-
-
 	attacks: [{
 		cost: [
 			Type.FIRE
@@ -77,10 +76,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/28.ts b/cards/swsh/swsh1/28.ts
index 848e1c68e..d4b42504c 100644
--- a/cards/swsh/swsh1/28.ts
+++ b/cards/swsh/swsh1/28.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-28",
 	localId: 28,
 
+	dexId: 758,
+
 	// Card informations
 	name: {
 		en: "Salazzle",
@@ -23,17 +25,11 @@ const card: Card = {
 		Type.FIRE,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/28/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/28/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/28/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/28/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -86,8 +82,6 @@ const card: Card = {
 		value: "×2"
 	}],
 
-
-
 	retreat: 1,
 
 	rarity: Rarity.Uncommon,
@@ -95,10 +89,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/29.ts b/cards/swsh/swsh1/29.ts
index 51c0ab127..36ad0c17f 100644
--- a/cards/swsh/swsh1/29.ts
+++ b/cards/swsh/swsh1/29.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-29",
 	localId: 29,
 
+	dexId: 776,
+
 	// Card informations
 	name: {
 		en: "Turtonator",
@@ -23,17 +25,11 @@ const card: Card = {
 		Type.FIRE,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/29/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/29/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/29/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/29/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {},
@@ -91,10 +87,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/3.ts b/cards/swsh/swsh1/3.ts
index 6775af989..3de77b2fa 100644
--- a/cards/swsh/swsh1/3.ts
+++ b/cards/swsh/swsh1/3.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-3",
 	localId: 3,
 
+	dexId: 315,
+
 	// Card informations
 	name: {
 		en: "Roselia",
@@ -23,20 +25,17 @@ const card: Card = {
 		Type.GRASS,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/3/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/3/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/3/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/3/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
+	evolveTo: [{
+		en: "Roserade",
+		fr: "Roserade",
+	}],
 
 	tags: [
 		Tag.BASIC,
@@ -87,10 +86,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/30.ts b/cards/swsh/swsh1/30.ts
index ddc003a02..c867df9ed 100644
--- a/cards/swsh/swsh1/30.ts
+++ b/cards/swsh/swsh1/30.ts
@@ -23,20 +23,17 @@ const card: Card = {
 		Type.FIRE,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/30/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/30/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/30/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/30/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
+	evolveTo: [{
+		en: "Raboot",
+		fr: "Lapyro",
+	}],
 
 	tags: [
 		Tag.BASIC,
@@ -78,10 +75,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/31.ts b/cards/swsh/swsh1/31.ts
index d1e53db27..246652708 100644
--- a/cards/swsh/swsh1/31.ts
+++ b/cards/swsh/swsh1/31.ts
@@ -29,14 +29,13 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/31/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/31/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/31/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/31/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
+	evolveTo: [{
+		en: "Raboot",
+		fr: "Lapyro",
+	}],
 
 	tags: [
 		Tag.BASIC,
@@ -84,10 +83,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/32.ts b/cards/swsh/swsh1/32.ts
index e6b9c6c91..f5804c25c 100644
--- a/cards/swsh/swsh1/32.ts
+++ b/cards/swsh/swsh1/32.ts
@@ -29,11 +29,7 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/32/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/32/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/32/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/32/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -41,6 +37,11 @@ const card: Card = {
 		fr: "Flambino",
 	},
 
+	evolveTo: [{
+		en: "Cinderace",
+		fr: "Pyrobut",
+	}],
+
 	tags: [
 		Tag.STAGE1,
 	],
@@ -62,7 +63,7 @@ const card: Card = {
 		},
 		text: {
 			en: "Search your deck for a Fire Energy card and attach it to this Pokémon. Then, shuffle your deck.",
-			fr: "Cherchez dans votre deck une carte Énergie Fire, puis attachez-la à ce Pokémon. Mélangez ensuite votre deck.",
+			fr: "Cherchez dans votre deck une carte Énergie Feu, puis attachez-la à ce Pokémon. Mélangez ensuite votre deck.",
 		},
 		damage: 20
 	},{
@@ -92,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/33.ts b/cards/swsh/swsh1/33.ts
index 0e05f1ce8..6c1c374a0 100644
--- a/cards/swsh/swsh1/33.ts
+++ b/cards/swsh/swsh1/33.ts
@@ -29,11 +29,7 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/33/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/33/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/33/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/33/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -41,6 +37,11 @@ const card: Card = {
 		fr: "Flambino",
 	},
 
+	evolveTo: [{
+		en: "Cinderace",
+		fr: "Pyrobut",
+	}],
+
 	tags: [
 		Tag.STAGE1,
 	],
@@ -87,10 +88,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/34.ts b/cards/swsh/swsh1/34.ts
index 6949ae473..9487c2d93 100644
--- a/cards/swsh/swsh1/34.ts
+++ b/cards/swsh/swsh1/34.ts
@@ -29,11 +29,7 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/34/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/34/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/34/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/34/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -94,10 +90,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/35.ts b/cards/swsh/swsh1/35.ts
index 5f245d22e..3e71b1815 100644
--- a/cards/swsh/swsh1/35.ts
+++ b/cards/swsh/swsh1/35.ts
@@ -29,11 +29,7 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/35/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/35/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/35/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/35/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -95,10 +91,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/36.ts b/cards/swsh/swsh1/36.ts
index 4ef604b2d..34ea38331 100644
--- a/cards/swsh/swsh1/36.ts
+++ b/cards/swsh/swsh1/36.ts
@@ -96,10 +96,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/37.ts b/cards/swsh/swsh1/37.ts
index 13d6a0e32..5fa82ef72 100644
--- a/cards/swsh/swsh1/37.ts
+++ b/cards/swsh/swsh1/37.ts
@@ -85,10 +85,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/38.ts b/cards/swsh/swsh1/38.ts
index f5a4e3258..eab52e064 100644
--- a/cards/swsh/swsh1/38.ts
+++ b/cards/swsh/swsh1/38.ts
@@ -79,10 +79,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/39.ts b/cards/swsh/swsh1/39.ts
index 9bf78869d..423d91ec1 100644
--- a/cards/swsh/swsh1/39.ts
+++ b/cards/swsh/swsh1/39.ts
@@ -96,10 +96,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/4.ts b/cards/swsh/swsh1/4.ts
index 696e016dc..d0b147610 100644
--- a/cards/swsh/swsh1/4.ts
+++ b/cards/swsh/swsh1/4.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-4",
 	localId: 4,
 
+	dexId: 407,
+
 	// Card informations
 	name: {
 		en: "Roserade",
@@ -23,17 +25,11 @@ const card: Card = {
 		Type.GRASS,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/4/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/4/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/4/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/4/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -50,8 +46,6 @@ const card: Card = {
 		name: "chibi"
 	},
 
-
-
 	attacks: [{
 		cost: [
 			Type.GRASS
@@ -96,10 +90,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/40.ts b/cards/swsh/swsh1/40.ts
index d6dc38bb7..8ea52f3d0 100644
--- a/cards/swsh/swsh1/40.ts
+++ b/cards/swsh/swsh1/40.ts
@@ -79,10 +79,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/41.ts b/cards/swsh/swsh1/41.ts
index 313aa69f7..ec3751577 100644
--- a/cards/swsh/swsh1/41.ts
+++ b/cards/swsh/swsh1/41.ts
@@ -92,10 +92,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/42.ts b/cards/swsh/swsh1/42.ts
index cc51a586f..5257a563d 100644
--- a/cards/swsh/swsh1/42.ts
+++ b/cards/swsh/swsh1/42.ts
@@ -87,10 +87,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/43.ts b/cards/swsh/swsh1/43.ts
index f03932355..3223bbe3e 100644
--- a/cards/swsh/swsh1/43.ts
+++ b/cards/swsh/swsh1/43.ts
@@ -79,10 +79,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/44.ts b/cards/swsh/swsh1/44.ts
index e49f38b29..1ee2a3dde 100644
--- a/cards/swsh/swsh1/44.ts
+++ b/cards/swsh/swsh1/44.ts
@@ -96,10 +96,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/45.ts b/cards/swsh/swsh1/45.ts
index 9cce5e85d..e81b0551b 100644
--- a/cards/swsh/swsh1/45.ts
+++ b/cards/swsh/swsh1/45.ts
@@ -74,10 +74,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/46.ts b/cards/swsh/swsh1/46.ts
index a172ad037..2996cb6d9 100644
--- a/cards/swsh/swsh1/46.ts
+++ b/cards/swsh/swsh1/46.ts
@@ -87,10 +87,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/47.ts b/cards/swsh/swsh1/47.ts
index 5936cd9aa..0363b3934 100644
--- a/cards/swsh/swsh1/47.ts
+++ b/cards/swsh/swsh1/47.ts
@@ -90,10 +90,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/48.ts b/cards/swsh/swsh1/48.ts
index 64981aabd..f0cef1313 100644
--- a/cards/swsh/swsh1/48.ts
+++ b/cards/swsh/swsh1/48.ts
@@ -81,10 +81,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/49.ts b/cards/swsh/swsh1/49.ts
index df1b8af94..a53158a9a 100644
--- a/cards/swsh/swsh1/49.ts
+++ b/cards/swsh/swsh1/49.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.COLORLESS
 		],
@@ -98,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/5.ts b/cards/swsh/swsh1/5.ts
index 6fa07761e..88d7e2705 100644
--- a/cards/swsh/swsh1/5.ts
+++ b/cards/swsh/swsh1/5.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-5",
 	localId: 5,
 
+	dexId: 546,
+
 	// Card informations
 	name: {
 		en: "Cottonee",
@@ -29,14 +31,13 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/5/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/5/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/5/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/5/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
+	evolveTo: [{
+		en: "Whimsicott",
+		fr: "Farfaduvet",
+	}],
 
 	tags: [
 		Tag.BASIC,
@@ -74,10 +75,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/50.ts b/cards/swsh/swsh1/50.ts
index 329806bdc..2355b48ae 100644
--- a/cards/swsh/swsh1/50.ts
+++ b/cards/swsh/swsh1/50.ts
@@ -88,10 +88,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/51.ts b/cards/swsh/swsh1/51.ts
index e45aae50c..0357192b7 100644
--- a/cards/swsh/swsh1/51.ts
+++ b/cards/swsh/swsh1/51.ts
@@ -89,10 +89,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/52.ts b/cards/swsh/swsh1/52.ts
index 2e30d9d21..760b2e8c6 100644
--- a/cards/swsh/swsh1/52.ts
+++ b/cards/swsh/swsh1/52.ts
@@ -87,10 +87,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/53.ts b/cards/swsh/swsh1/53.ts
index b387333c5..1479638ed 100644
--- a/cards/swsh/swsh1/53.ts
+++ b/cards/swsh/swsh1/53.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.WATER
 		],
@@ -94,10 +89,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/54.ts b/cards/swsh/swsh1/54.ts
index 10926753e..9aacd0d93 100644
--- a/cards/swsh/swsh1/54.ts
+++ b/cards/swsh/swsh1/54.ts
@@ -74,10 +74,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/55.ts b/cards/swsh/swsh1/55.ts
index f896e7c55..b1bed4f75 100644
--- a/cards/swsh/swsh1/55.ts
+++ b/cards/swsh/swsh1/55.ts
@@ -84,10 +84,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/56.ts b/cards/swsh/swsh1/56.ts
index 1a9b8d6c7..abbcb212c 100644
--- a/cards/swsh/swsh1/56.ts
+++ b/cards/swsh/swsh1/56.ts
@@ -89,10 +89,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/57.ts b/cards/swsh/swsh1/57.ts
index ee1d95012..000155c8c 100644
--- a/cards/swsh/swsh1/57.ts
+++ b/cards/swsh/swsh1/57.ts
@@ -87,10 +87,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/58.ts b/cards/swsh/swsh1/58.ts
index b4ce950af..e5855049f 100644
--- a/cards/swsh/swsh1/58.ts
+++ b/cards/swsh/swsh1/58.ts
@@ -93,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/59.ts b/cards/swsh/swsh1/59.ts
index b2c5294c4..59af014e9 100644
--- a/cards/swsh/swsh1/59.ts
+++ b/cards/swsh/swsh1/59.ts
@@ -95,10 +95,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/6.ts b/cards/swsh/swsh1/6.ts
index dac528dab..c26242a8b 100644
--- a/cards/swsh/swsh1/6.ts
+++ b/cards/swsh/swsh1/6.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-6",
 	localId: 6,
 
+	dexId: 547,
+
 	// Card informations
 	name: {
 		en: "Whimsicott",
@@ -29,11 +31,7 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/6/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/6/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/6/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/6/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {
@@ -80,8 +78,6 @@ const card: Card = {
 		value: "×2"
 	}],
 
-
-
 	retreat: 1,
 
 	rarity: Rarity.Rare,
@@ -89,10 +85,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/60.ts b/cards/swsh/swsh1/60.ts
index 320d9e025..dceaf2412 100644
--- a/cards/swsh/swsh1/60.ts
+++ b/cards/swsh/swsh1/60.ts
@@ -86,10 +86,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/61.ts b/cards/swsh/swsh1/61.ts
index baa93fcab..ea6e20889 100644
--- a/cards/swsh/swsh1/61.ts
+++ b/cards/swsh/swsh1/61.ts
@@ -99,10 +99,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/62.ts b/cards/swsh/swsh1/62.ts
index 2463a7027..11dc0069a 100644
--- a/cards/swsh/swsh1/62.ts
+++ b/cards/swsh/swsh1/62.ts
@@ -87,10 +87,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/63.ts b/cards/swsh/swsh1/63.ts
index 7d3fbbf63..eff127c70 100644
--- a/cards/swsh/swsh1/63.ts
+++ b/cards/swsh/swsh1/63.ts
@@ -74,10 +74,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/64.ts b/cards/swsh/swsh1/64.ts
index e3820211f..eaef1ab3f 100644
--- a/cards/swsh/swsh1/64.ts
+++ b/cards/swsh/swsh1/64.ts
@@ -89,10 +89,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/65.ts b/cards/swsh/swsh1/65.ts
index 488e7c42c..cda80c6cf 100644
--- a/cards/swsh/swsh1/65.ts
+++ b/cards/swsh/swsh1/65.ts
@@ -87,10 +87,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/66.ts b/cards/swsh/swsh1/66.ts
index fc3abf6c1..ba6197646 100644
--- a/cards/swsh/swsh1/66.ts
+++ b/cards/swsh/swsh1/66.ts
@@ -88,10 +88,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/67.ts b/cards/swsh/swsh1/67.ts
index a231e00c0..96292fa72 100644
--- a/cards/swsh/swsh1/67.ts
+++ b/cards/swsh/swsh1/67.ts
@@ -75,10 +75,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/68.ts b/cards/swsh/swsh1/68.ts
index 983a0c204..05b3989fc 100644
--- a/cards/swsh/swsh1/68.ts
+++ b/cards/swsh/swsh1/68.ts
@@ -87,10 +87,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/69.ts b/cards/swsh/swsh1/69.ts
index 6cfd1bd39..cfb243eb5 100644
--- a/cards/swsh/swsh1/69.ts
+++ b/cards/swsh/swsh1/69.ts
@@ -92,10 +92,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/7.ts b/cards/swsh/swsh1/7.ts
index 614e575a7..615cf8ce1 100644
--- a/cards/swsh/swsh1/7.ts
+++ b/cards/swsh/swsh1/7.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-7",
 	localId: 7,
 
+	dexId: 556,
+
 	// Card informations
 	name: {
 		en: "Maractus",
@@ -23,17 +25,11 @@ const card: Card = {
 		Type.GRASS,
 	],
 
-
-
 	image: {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/7/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/7/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/7/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/7/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {},
@@ -47,8 +43,6 @@ const card: Card = {
 		name: "Atsuko Nishida"
 	},
 
-
-
 	attacks: [{
 		cost: [
 			Type.COLORLESS
@@ -79,8 +73,6 @@ const card: Card = {
 		value: "×2"
 	}],
 
-
-
 	retreat: 2,
 
 	rarity: Rarity.Common,
@@ -88,10 +80,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/70.ts b/cards/swsh/swsh1/70.ts
index 2955d78a3..a4fe918c1 100644
--- a/cards/swsh/swsh1/70.ts
+++ b/cards/swsh/swsh1/70.ts
@@ -74,10 +74,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/71.ts b/cards/swsh/swsh1/71.ts
index ea3f5167a..b88136fba 100644
--- a/cards/swsh/swsh1/71.ts
+++ b/cards/swsh/swsh1/71.ts
@@ -82,10 +82,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/72.ts b/cards/swsh/swsh1/72.ts
index 84438edeb..9d228dc25 100644
--- a/cards/swsh/swsh1/72.ts
+++ b/cards/swsh/swsh1/72.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.LIGHTNING
 		],
@@ -98,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/73.ts b/cards/swsh/swsh1/73.ts
index 0d0912c25..9e166ca9a 100644
--- a/cards/swsh/swsh1/73.ts
+++ b/cards/swsh/swsh1/73.ts
@@ -86,10 +86,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/74.ts b/cards/swsh/swsh1/74.ts
index ea44a9fa5..b6f777423 100644
--- a/cards/swsh/swsh1/74.ts
+++ b/cards/swsh/swsh1/74.ts
@@ -84,10 +84,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/75.ts b/cards/swsh/swsh1/75.ts
index 769e0d466..19c1f99b4 100644
--- a/cards/swsh/swsh1/75.ts
+++ b/cards/swsh/swsh1/75.ts
@@ -97,10 +97,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/76.ts b/cards/swsh/swsh1/76.ts
index d12a58f51..3c8410aad 100644
--- a/cards/swsh/swsh1/76.ts
+++ b/cards/swsh/swsh1/76.ts
@@ -93,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/77.ts b/cards/swsh/swsh1/77.ts
index a10235da4..7cd1c6878 100644
--- a/cards/swsh/swsh1/77.ts
+++ b/cards/swsh/swsh1/77.ts
@@ -79,10 +79,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/78.ts b/cards/swsh/swsh1/78.ts
index 6bff3911e..c54df58f2 100644
--- a/cards/swsh/swsh1/78.ts
+++ b/cards/swsh/swsh1/78.ts
@@ -78,10 +78,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/79.ts b/cards/swsh/swsh1/79.ts
index 145f1a80e..5d99430ac 100644
--- a/cards/swsh/swsh1/79.ts
+++ b/cards/swsh/swsh1/79.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.COLORLESS
 		],
@@ -98,10 +93,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/8.ts b/cards/swsh/swsh1/8.ts
index 982632df6..e5fa40914 100644
--- a/cards/swsh/swsh1/8.ts
+++ b/cards/swsh/swsh1/8.ts
@@ -29,15 +29,9 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/8/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/8/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/8/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/8/high.png",
-		},
+		}
 	},
 
-	evolveFrom: {},
-
 	tags: [
 		Tag.BASIC,
 	],
@@ -79,10 +73,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/80.ts b/cards/swsh/swsh1/80.ts
index 5a72f4bc3..862694109 100644
--- a/cards/swsh/swsh1/80.ts
+++ b/cards/swsh/swsh1/80.ts
@@ -88,10 +88,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/81.ts b/cards/swsh/swsh1/81.ts
index 49a9ded40..047d02fca 100644
--- a/cards/swsh/swsh1/81.ts
+++ b/cards/swsh/swsh1/81.ts
@@ -81,10 +81,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/82.ts b/cards/swsh/swsh1/82.ts
index 2ea7a8489..6abcb1b47 100644
--- a/cards/swsh/swsh1/82.ts
+++ b/cards/swsh/swsh1/82.ts
@@ -96,10 +96,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/83.ts b/cards/swsh/swsh1/83.ts
index 100e501d5..5f01f9332 100644
--- a/cards/swsh/swsh1/83.ts
+++ b/cards/swsh/swsh1/83.ts
@@ -81,10 +81,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/84.ts b/cards/swsh/swsh1/84.ts
index 66c6f835f..2c155a7f8 100644
--- a/cards/swsh/swsh1/84.ts
+++ b/cards/swsh/swsh1/84.ts
@@ -94,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/85.ts b/cards/swsh/swsh1/85.ts
index d491395a9..7d67c7345 100644
--- a/cards/swsh/swsh1/85.ts
+++ b/cards/swsh/swsh1/85.ts
@@ -97,10 +97,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/86.ts b/cards/swsh/swsh1/86.ts
index 922659929..9074b768a 100644
--- a/cards/swsh/swsh1/86.ts
+++ b/cards/swsh/swsh1/86.ts
@@ -50,11 +50,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.COLORLESS,
 			Type.COLORLESS
@@ -100,10 +95,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/87.ts b/cards/swsh/swsh1/87.ts
index 02ee4e20c..43a24608a 100644
--- a/cards/swsh/swsh1/87.ts
+++ b/cards/swsh/swsh1/87.ts
@@ -90,10 +90,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/88.ts b/cards/swsh/swsh1/88.ts
index a5c8cd675..c3b1c68aa 100644
--- a/cards/swsh/swsh1/88.ts
+++ b/cards/swsh/swsh1/88.ts
@@ -97,10 +97,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/89.ts b/cards/swsh/swsh1/89.ts
index 2ab741a2e..a113dade4 100644
--- a/cards/swsh/swsh1/89.ts
+++ b/cards/swsh/swsh1/89.ts
@@ -80,10 +80,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/9.ts b/cards/swsh/swsh1/9.ts
index d6089ce22..2c95c2111 100644
--- a/cards/swsh/swsh1/9.ts
+++ b/cards/swsh/swsh1/9.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-9",
 	localId: 9,
 
+	dexId: 731,
+
 	// Card informations
 	name: {
 		en: "Dhelmise V",
@@ -29,16 +31,13 @@ const card: Card = {
 		low: {
 			en: "https://assets.tcgdex.net/en/swsh/swsh1/9/low.png",
 			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/9/low.png",
-		},
-		high: {
-			en: "https://assets.tcgdex.net/en/swsh/swsh1/9/high.png",
-			fr: "https://assets.tcgdex.net/fr/swsh/swsh1/9/high.png",
-		},
+		}
 	},
 
 	evolveFrom: {},
 
 	tags: [
+		Tag.BASIC,
 		Tag.V,
 	],
 
@@ -50,11 +49,6 @@ const card: Card = {
 
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.GRASS
 		],
@@ -64,7 +58,7 @@ const card: Card = {
 		},
 		text: {
 			en: "If any of your Grass Pokémon were Knocked Out by damage from an opponent’s attack during their last turn, this attack does 90 more damage.",
-			fr: "Si l’un de vos Pokémon Grass a été mis K.O. par les dégâts d’une attaque de votre adversaire lors de son dernier tour, cette attaque inflige 90 dégâts supplémentaires.",
+			fr: "Si l’un de vos Pokémon Plante a été mis K.O. par les dégâts d’une attaque de votre adversaire lors de son dernier tour, cette attaque inflige 90 dégâts supplémentaires.",
 		},
 		damage: "30+"
 	},{
@@ -98,10 +92,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/90.ts b/cards/swsh/swsh1/90.ts
index 10c7a8427..852569e2b 100644
--- a/cards/swsh/swsh1/90.ts
+++ b/cards/swsh/swsh1/90.ts
@@ -97,10 +97,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/91.ts b/cards/swsh/swsh1/91.ts
index d92a2bb6f..2dc2e4390 100644
--- a/cards/swsh/swsh1/91.ts
+++ b/cards/swsh/swsh1/91.ts
@@ -61,11 +61,6 @@ const card: Card = {
 	}],
 
 	attacks: [{
-		name: {
-			en: "V rule",
-			fr: "Règle V",
-		},
-	},{
 		cost: [
 			Type.PSYCHIC,
 			Type.COLORLESS,
@@ -99,10 +94,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/92.ts b/cards/swsh/swsh1/92.ts
index d22d27382..b2e4b90b1 100644
--- a/cards/swsh/swsh1/92.ts
+++ b/cards/swsh/swsh1/92.ts
@@ -74,10 +74,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/93.ts b/cards/swsh/swsh1/93.ts
index 4af2a4694..134bea2e9 100644
--- a/cards/swsh/swsh1/93.ts
+++ b/cards/swsh/swsh1/93.ts
@@ -77,10 +77,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/94.ts b/cards/swsh/swsh1/94.ts
index ba1b1b982..0ef58a62c 100644
--- a/cards/swsh/swsh1/94.ts
+++ b/cards/swsh/swsh1/94.ts
@@ -90,10 +90,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/95.ts b/cards/swsh/swsh1/95.ts
index 66fcf5447..c24ac0262 100644
--- a/cards/swsh/swsh1/95.ts
+++ b/cards/swsh/swsh1/95.ts
@@ -88,10 +88,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/96.ts b/cards/swsh/swsh1/96.ts
index f97410644..9bef91fd0 100644
--- a/cards/swsh/swsh1/96.ts
+++ b/cards/swsh/swsh1/96.ts
@@ -84,10 +84,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/97.ts b/cards/swsh/swsh1/97.ts
index 21fafc19f..75810ec31 100644
--- a/cards/swsh/swsh1/97.ts
+++ b/cards/swsh/swsh1/97.ts
@@ -89,10 +89,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/98.ts b/cards/swsh/swsh1/98.ts
index c87b19993..3432001d3 100644
--- a/cards/swsh/swsh1/98.ts
+++ b/cards/swsh/swsh1/98.ts
@@ -95,10 +95,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-
diff --git a/cards/swsh/swsh1/99.ts b/cards/swsh/swsh1/99.ts
index c98139365..f61b7b669 100644
--- a/cards/swsh/swsh1/99.ts
+++ b/cards/swsh/swsh1/99.ts
@@ -99,10 +99,9 @@ const card: Card = {
 	category: Category.POKEMON,
 
 	set: {
-		name: "undefined",
+		name: "Sword & Shield",
 		code: "swsh1"
 	}
 }
 
 export default card
-