diff --git a/cards/swsh/swsh1/195.ts b/cards/swsh/swsh1/195.ts
index 1663f233f..2ff4ebef2 100644
--- a/cards/swsh/swsh1/195.ts
+++ b/cards/swsh/swsh1/195.ts
@@ -11,6 +11,8 @@ const card: Card = {
 	id: "swsh1-195",
 	localId: 195,
 
+	dexId: 888,
+
 	// Card informations
 	name: {
 		en: "Zacian V",
diff --git a/cards/swsh/swsh2/139.ts b/cards/swsh/swsh2/139.ts
new file mode 100644
index 000000000..469fc4a14
--- /dev/null
+++ b/cards/swsh/swsh2/139.ts
@@ -0,0 +1,37 @@
+import Card from '../../../interfaces/Card'
+import Type from '../../../interfaces/Type'
+import Tag from '../../../interfaces/Tag'
+import Rarity from '../../../interfaces/Rarity'
+import AbilityType from '../../../interfaces/AbilityType'
+import Category from '../../../interfaces/Category'
+import path from 'path'
+import swsh2 from '../../../sets/swsh/swsh2'
+
+const localId = path.basename(__filename).split(".")[0]
+
+const card: Card = {
+
+	// ids
+	id: `swsh2-${localId}`,
+	localId: isNaN(parseInt(localId)) ? localId : parseInt(localId),
+
+	dexId: 888,
+
+	// Card informations
+	name: {
+		en: "Zacian",
+		fr: "Zacian",
+	},
+
+	tags: [
+		Tag.BASIC,
+	],
+
+	rarity: Rarity.RareHolo,
+
+	category: Category.POKEMON,
+
+	set: swsh2
+}
+
+export default card
diff --git a/cards/swsh/swsh2/140.ts b/cards/swsh/swsh2/140.ts
new file mode 100644
index 000000000..e8ac2f83c
--- /dev/null
+++ b/cards/swsh/swsh2/140.ts
@@ -0,0 +1,37 @@
+import Card from '../../../interfaces/Card'
+import Type from '../../../interfaces/Type'
+import Tag from '../../../interfaces/Tag'
+import Rarity from '../../../interfaces/Rarity'
+import AbilityType from '../../../interfaces/AbilityType'
+import Category from '../../../interfaces/Category'
+import path from 'path'
+import swsh2 from '../../../sets/swsh/swsh2'
+
+const localId = path.basename(__filename).split(".")[0]
+
+const card: Card = {
+
+	// ids
+	id: `swsh2-${localId}`,
+	localId: isNaN(parseInt(localId)) ? localId : parseInt(localId),
+
+	dexId: 889,
+
+	// Card informations
+	name: {
+		en: "Zamazenta",
+		fr: "Zamazenta",
+	},
+
+	tags: [
+		Tag.BASIC,
+	],
+
+	rarity: Rarity.RareHolo,
+
+	category: Category.POKEMON,
+
+	set: swsh2
+}
+
+export default card
diff --git a/expansions/base.ts b/expansions/base.ts
index 909ff5ff2..df03e45a1 100644
--- a/expansions/base.ts
+++ b/expansions/base.ts
@@ -1,6 +1,6 @@
 import Expansion from "../interfaces/Expansion";
 
-const set: Expansion = {
+const base: Expansion = {
 	name: {
 		en: "Base"
 	},
@@ -15,4 +15,4 @@ const set: Expansion = {
 	],
 }
 
-export default set
+export default base
diff --git a/expansions/ecard.ts b/expansions/ecard.ts
index 8d5a63115..9b9010fae 100644
--- a/expansions/ecard.ts
+++ b/expansions/ecard.ts
@@ -1,6 +1,6 @@
 import Expansion from "../interfaces/Expansion";
 
-const set: Expansion = {
+const ecard: Expansion = {
 	name: {
 		en: "E-Card",
 		fr: "E-Card",
@@ -13,4 +13,4 @@ const set: Expansion = {
 	]
 }
 
-export default set
+export default ecard
diff --git a/expansions/tk.ts b/expansions/tk.ts
new file mode 100644
index 000000000..a06eb96ac
--- /dev/null
+++ b/expansions/tk.ts
@@ -0,0 +1,11 @@
+import Expansion from "../interfaces/Expansion";
+
+const tk: Expansion = {
+	name: {
+		en: "Trainer kit"
+	},
+	code: "tk",
+	sets: []
+}
+
+export default tk
diff --git a/interfaces/Card.ts b/interfaces/Card.ts
index 8f8f7f2d1..640ec99a6 100644
--- a/interfaces/Card.ts
+++ b/interfaces/Card.ts
@@ -60,6 +60,16 @@ interface Card {
 		name: string
 		code: string
 	}| Set
+
+	/**
+	 * Override Set defaults
+	 */
+	cardTypes?: {
+		normal: boolean
+		reverse: boolean
+		holo: boolean
+		firstEd: boolean
+	}
 }
 
 export default Card
diff --git a/interfaces/Set.ts b/interfaces/Set.ts
index 9351e303d..8b486a112 100644
--- a/interfaces/Set.ts
+++ b/interfaces/Set.ts
@@ -1,45 +1,120 @@
 import LangList from "./LangList";
 import Expansion from "./Expansion";
 
+/**
+ * Set Interface containing all informations about the set
+ */
 export default interface Set {
-	// Display Name
+	/**
+	 * Display Name
+	 */
 	name: LangList<string> | string
 
+	/**
+	 * Expansion Object
+	 */
 	expansion?: Expansion
 
+	/**
+	 * Expansion code
+	 */
 	expansionCode?: string
 
+	/**
+	 * Set code (Also used as the slug)
+	 */
 	code: string
+
+	/**
+	 * Trading card online code
+	 */
 	tcgoCode?: string
 
 	cardCount?: {
-		// total containing all secrets
+		/**
+		 * total number of cards including secrets
+		 */
 		total: number
-		// official count on cards
+		/**
+		 * number of card indicated at the bottom of each cards
+		 */
 		official: number
 	}
 
+	cardTypes?: {
+		/**
+		 * Default: true
+		 */
+		normal: boolean
+		/**
+		 * Default: true
+		 */
+		reverse: boolean
+		/**
+		 * Default: true
+		 */
+		holo: boolean
+		/**
+		 * Default: false
+		 */
+		ed1: boolean
+	}
+
+	/**
+	 * Format of numbering
+	 * ex: SWSH[000] mean that it has SWSH as prefix and start at 000 -> 001 -> 002 -> etc
+	 *
+	 * @type {string}
+	 * @memberof Set
+	 */
 	format?: string
 
+	/**
+	 * Release date of the set
+	 * in format: yyyy-mm-dd
+	 * ex: 2002-12-22
+	 *
+	 * @type {string}
+	 * @memberof Set
+	 */
 	releaseDate?: string // date in format yyyy-mm-dd
 
-	// api endpoint for scrapping
+	/**
+	 * Aol Endpoint for scrapping
+	 */
 	api?: string
 
+	/**
+	 * Competition usage
+	 */
 	legal?: {
 		standard: boolean
 		expanded: boolean
 	}
 
 	images?: {
-		// thingy on bottom of cards
+		/**
+		 * Symbol icon on bottom of card
+		 * available extensions [
+		 * 	webp
+		 * 	jpg
+		 * 	png
+		 * ]
+		 */
 		symbol?: string
-		// Official logo of set
+		/**
+		 * Official logo of set
+		 * available extensions [
+		 * 	webp
+		 * 	jpg
+		 * 	png
+		 * ]
+		 */
 		logo?: string
 	}
 
-
-	//temp
-	slug?: string
-	subsets?: Array<Set>
+	/**
+	 * Language in which the set is available
+	 */
+	availability?: LangList<boolean>
 }
diff --git a/sets/base/base1.ts b/sets/base/base1.ts
index 343c8eede..ee3b68b36 100644
--- a/sets/base/base1.ts
+++ b/sets/base/base1.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/base/base1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/base/base1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/base/base1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/base/base1/logo.png"
 	}
 }
 
diff --git a/sets/base/base2.ts b/sets/base/base2.ts
index 5d2134d8b..19c5e17a2 100644
--- a/sets/base/base2.ts
+++ b/sets/base/base2.ts
@@ -21,8 +21,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/base/base2/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/base/base2/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/base/base2/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/base/base2/logo.png"
 	}
 }
 
diff --git a/sets/base/base3.ts b/sets/base/base3.ts
index 4be26c7a3..521b3f712 100644
--- a/sets/base/base3.ts
+++ b/sets/base/base3.ts
@@ -21,8 +21,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/base/base3/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/base/base3/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/base/base3/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/base/base3/logo.png"
 	}
 }
 
diff --git a/sets/base/base4.ts b/sets/base/base4.ts
index c4ce35a1d..8c7fa294c 100644
--- a/sets/base/base4.ts
+++ b/sets/base/base4.ts
@@ -21,8 +21,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/base/base4/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/base/base4/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/base/base4/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/base/base4/logo.png"
 	}
 }
 
diff --git a/sets/base/base5.ts b/sets/base/base5.ts
index 515a90054..bb9eae59c 100644
--- a/sets/base/base5.ts
+++ b/sets/base/base5.ts
@@ -21,8 +21,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/base/base5/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/base/base5/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/base/base5/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/base/base5/logo.png"
 	}
 }
 
diff --git a/sets/base/basep.ts b/sets/base/basep.ts
index 74fa28603..e8781fee3 100644
--- a/sets/base/basep.ts
+++ b/sets/base/basep.ts
@@ -2,7 +2,7 @@ import Set from '../../interfaces/Set'
 
 const set: Set = {
 	name: {
-		en: "Wizards of te Coast Promos"
+		en: "Wizards Black Star Promos"
 	},
 	code: "basep",
 	expansionCode: "base",
@@ -10,7 +10,7 @@ const set: Set = {
 
 	cardCount: {
 		total: 53,
-		official: 52
+		official: 53
 	},
 
 	releaseDate: "1999-07-01",
@@ -21,8 +21,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/base/basep/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/base/basep/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/base/basep/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/base/basep/logo.png"
 	}
 }
 
diff --git a/sets/base/wp.ts b/sets/base/wp.ts
new file mode 100644
index 000000000..e1fef6439
--- /dev/null
+++ b/sets/base/wp.ts
@@ -0,0 +1,28 @@
+import Set from '../../interfaces/Set'
+import base from '../../expansions/base'
+
+const set: Set = {
+	name: {
+		en: "W Promotional"
+	},
+	code: "wp",
+	expansion: base,
+
+	cardCount: {
+		total: 53,
+		official: 53
+	},
+
+	releaseDate: "1999-09-01", // day not found
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	availability: {
+		fr: false
+	}
+}
+
+export default set
diff --git a/sets/bw/bw1.ts b/sets/bw/bw1.ts
index ee0c7237f..b3feb6044 100644
--- a/sets/bw/bw1.ts
+++ b/sets/bw/bw1.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/bw/bw1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/bw/bw1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/bw/bw1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/bw/bw1/logo.png"
 	}
 }
 
diff --git a/sets/bw/bw10.ts b/sets/bw/bw10.ts
index e8b20bbc0..93bbe6cb8 100644
--- a/sets/bw/bw10.ts
+++ b/sets/bw/bw10.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/bw/bw10/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/bw/bw10/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/bw/bw10/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/bw/bw10/logo.png"
 	}
 }
 
diff --git a/sets/bw/bw11.ts b/sets/bw/bw11.ts
index 48466cb3a..2e4d74b60 100644
--- a/sets/bw/bw11.ts
+++ b/sets/bw/bw11.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/bw/bw11/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/bw/bw11/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/bw/bw11/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/bw/bw11/logo.png"
 	}
 }
 
diff --git a/sets/bw/bw2.ts b/sets/bw/bw2.ts
index 75deb628b..4b37df432 100644
--- a/sets/bw/bw2.ts
+++ b/sets/bw/bw2.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/bw/bw2/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/bw/bw2/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/bw/bw2/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/bw/bw2/logo.png"
 	}
 }
 
diff --git a/sets/bw/bw3.ts b/sets/bw/bw3.ts
index 21a3acf1d..eb86a057d 100644
--- a/sets/bw/bw3.ts
+++ b/sets/bw/bw3.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/bw/bw3/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/bw/bw3/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/bw/bw3/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/bw/bw3/logo.png"
 	}
 }
 
diff --git a/sets/bw/bw4.ts b/sets/bw/bw4.ts
index 361f11147..95245439a 100644
--- a/sets/bw/bw4.ts
+++ b/sets/bw/bw4.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/bw/bw4/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/bw/bw4/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/bw/bw4/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/bw/bw4/logo.png"
 	}
 }
 
diff --git a/sets/bw/bw5.ts b/sets/bw/bw5.ts
index 4854ad599..087ee20fe 100644
--- a/sets/bw/bw5.ts
+++ b/sets/bw/bw5.ts
@@ -22,8 +22,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/bw/bw5/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/bw/bw5/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/bw/bw5/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/bw/bw5/logo.png"
 	}
 }
 
diff --git a/sets/bw/bw6.ts b/sets/bw/bw6.ts
index 463f5b69d..f6af6b502 100644
--- a/sets/bw/bw6.ts
+++ b/sets/bw/bw6.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/bw/bw6/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/bw/bw6/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/bw/bw6/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/bw/bw6/logo.png"
 	}
 }
 
diff --git a/sets/bw/bw7.ts b/sets/bw/bw7.ts
index 446eaf4f2..d6790b79e 100644
--- a/sets/bw/bw7.ts
+++ b/sets/bw/bw7.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/bw/bw7/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/bw/bw7/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/bw/bw7/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/bw/bw7/logo.png"
 	}
 }
 
diff --git a/sets/bw/bw8.ts b/sets/bw/bw8.ts
index 0a90448e2..b9e46f785 100644
--- a/sets/bw/bw8.ts
+++ b/sets/bw/bw8.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/bw/bw8/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/bw/bw8/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/bw/bw8/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/bw/bw8/logo.png"
 	}
 }
 
diff --git a/sets/bw/bw9.ts b/sets/bw/bw9.ts
index 36aea97c3..cb41c9ef0 100644
--- a/sets/bw/bw9.ts
+++ b/sets/bw/bw9.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/bw/bw9/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/bw/bw9/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/bw/bw9/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/bw/bw9/logo.png"
 	}
 }
 
diff --git a/sets/bw/bwp.ts b/sets/bw/bwp.ts
index f09dc388c..c321e1488 100644
--- a/sets/bw/bwp.ts
+++ b/sets/bw/bwp.ts
@@ -25,8 +25,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/bw/bwp/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/bw/bwp/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/bw/bwp/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/bw/bwp/logo.png"
 	}
 }
 
diff --git a/sets/bw/dv1.ts b/sets/bw/dv1.ts
index f9c2b706c..8ef65c8bc 100644
--- a/sets/bw/dv1.ts
+++ b/sets/bw/dv1.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/bw/dv1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/bw/dv1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/bw/dv1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/bw/dv1/logo.png"
 	}
 }
 
diff --git a/sets/col/col1.ts b/sets/col/col1.ts
index 6ad46bd71..771288fe2 100644
--- a/sets/col/col1.ts
+++ b/sets/col/col1.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/col/col1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/col/col1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/col/col1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/col/col1/logo.png"
 	}
 }
 
diff --git a/sets/dp/dp1.ts b/sets/dp/dp1.ts
index a1ba15af3..04f37d745 100644
--- a/sets/dp/dp1.ts
+++ b/sets/dp/dp1.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/dp/dp1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/dp/dp1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/dp/dp1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/dp/dp1/logo.png"
 	}
 }
 
diff --git a/sets/dp/dp2.ts b/sets/dp/dp2.ts
index e7df004c3..c7d95db3c 100644
--- a/sets/dp/dp2.ts
+++ b/sets/dp/dp2.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/dp/dp2/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/dp/dp2/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/dp/dp2/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/dp/dp2/logo.png"
 	}
 }
 
diff --git a/sets/dp/dp3.ts b/sets/dp/dp3.ts
index 5f14f89e4..6e5dad407 100644
--- a/sets/dp/dp3.ts
+++ b/sets/dp/dp3.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/dp/dp3/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/dp/dp3/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/dp/dp3/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/dp/dp3/logo.png"
 	}
 }
 
diff --git a/sets/dp/dp4.ts b/sets/dp/dp4.ts
index cf2edf024..376926d47 100644
--- a/sets/dp/dp4.ts
+++ b/sets/dp/dp4.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/dp/dp4/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/dp/dp4/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/dp/dp4/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/dp/dp4/logo.png"
 	}
 }
 
diff --git a/sets/dp/dp5.ts b/sets/dp/dp5.ts
index bc41c0dc0..328e109b6 100644
--- a/sets/dp/dp5.ts
+++ b/sets/dp/dp5.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/dp/dp5/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/dp/dp5/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/dp/dp5/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/dp/dp5/logo.png"
 	}
 }
 
diff --git a/sets/dp/dp6.ts b/sets/dp/dp6.ts
index 57d4d028d..e14da8669 100644
--- a/sets/dp/dp6.ts
+++ b/sets/dp/dp6.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/dp/dp6/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/dp/dp6/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/dp/dp6/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/dp/dp6/logo.png"
 	}
 }
 
diff --git a/sets/dp/dp7.ts b/sets/dp/dp7.ts
index e0d6ff3cd..4d4c56963 100644
--- a/sets/dp/dp7.ts
+++ b/sets/dp/dp7.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/dp/dp7/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/dp/dp7/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/dp/dp7/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/dp/dp7/logo.png"
 	}
 }
 
diff --git a/sets/dp/dpp.ts b/sets/dp/dpp.ts
index 6ae753a10..8e15d69f5 100644
--- a/sets/dp/dpp.ts
+++ b/sets/dp/dpp.ts
@@ -21,8 +21,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/dp/dpp/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/dp/dpp/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/dp/dpp/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/dp/dpp/logo.png"
 	}
 }
 
diff --git a/sets/ecard/bog.ts b/sets/ecard/bog.ts
new file mode 100644
index 000000000..bf31bafc3
--- /dev/null
+++ b/sets/ecard/bog.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import ecard from '../../expansions/ecard'
+
+const set: Set = {
+	name: {
+		en: "Best of game"
+	},
+
+	code: "bog",
+
+	expansion: ecard,
+
+	cardCount: {
+		total: 9,
+		official: 9
+	},
+
+	releaseDate: "2002-12-01", //day not found
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: "https://assets.tcgdex.net/univ/sets/ecard/sp/symbol"
+	},
+
+	availability: {
+		fr: false
+	}
+}
+
+export default set
diff --git a/sets/ecard/ecard1.ts b/sets/ecard/ecard1.ts
index 67f4f5396..f28557fd2 100644
--- a/sets/ecard/ecard1.ts
+++ b/sets/ecard/ecard1.ts
@@ -2,7 +2,8 @@ import Set from '../../interfaces/Set'
 
 const set: Set = {
 	name: {
-		en: "Expedition Base Set"
+		en: "Expedition Base Set",
+		fr: "Expedition"
 	},
 	code: "ecard1",
 	expansionCode: "ecard",
@@ -21,8 +22,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ecard/ecard1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ecard/ecard1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ecard/ecard1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ecard/ecard1/logo.png"
 	}
 }
 
diff --git a/sets/ecard/ecard2.ts b/sets/ecard/ecard2.ts
index f550e9d19..1d44cf752 100644
--- a/sets/ecard/ecard2.ts
+++ b/sets/ecard/ecard2.ts
@@ -21,8 +21,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ecard/ecard2/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ecard/ecard2/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ecard/ecard2/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ecard/ecard2/logo.png"
 	}
 }
 
diff --git a/sets/ecard/ecard3.ts b/sets/ecard/ecard3.ts
index e001565d7..20ac16ac3 100644
--- a/sets/ecard/ecard3.ts
+++ b/sets/ecard/ecard3.ts
@@ -21,8 +21,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ecard/ecard3/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ecard/ecard3/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ecard/ecard3/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ecard/ecard3/logo.png"
 	}
 }
 
diff --git a/sets/ecard/sp.ts b/sets/ecard/sp.ts
new file mode 100644
index 000000000..654889826
--- /dev/null
+++ b/sets/ecard/sp.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import ecard from '../../expansions/ecard'
+
+const set: Set = {
+	name: {
+		en: "Sample"
+	},
+
+	code: "sp",
+
+	expansion: ecard,
+
+	cardCount: {
+		total: 10,
+		official: 10
+	},
+
+	releaseDate: "2002-08-01", //day not found
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: "https://assets.tcgdex.net/univ/sets/ecard/sp/symbol"
+	},
+
+	availability: {
+		fr: false
+	}
+}
+
+export default set
diff --git a/sets/ex/ex1.ts b/sets/ex/ex1.ts
index c214691cf..77401edbc 100644
--- a/sets/ex/ex1.ts
+++ b/sets/ex/ex1.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex1/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex10.ts b/sets/ex/ex10.ts
index 45ea33d79..113372fee 100644
--- a/sets/ex/ex10.ts
+++ b/sets/ex/ex10.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex10/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex10/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex10/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex10/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex11.ts b/sets/ex/ex11.ts
index a2e1dd6e7..e2fcffe55 100644
--- a/sets/ex/ex11.ts
+++ b/sets/ex/ex11.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex11/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex11/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex11/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex11/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex12.ts b/sets/ex/ex12.ts
index b1cd5e441..f0a71f716 100644
--- a/sets/ex/ex12.ts
+++ b/sets/ex/ex12.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex12/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex12/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex12/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex12/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex13.ts b/sets/ex/ex13.ts
index f30fcb716..55a688b74 100644
--- a/sets/ex/ex13.ts
+++ b/sets/ex/ex13.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex13/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex13/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex13/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex13/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex14.ts b/sets/ex/ex14.ts
index 282661797..a184a5b6e 100644
--- a/sets/ex/ex14.ts
+++ b/sets/ex/ex14.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex14/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex14/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex14/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex14/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex15.ts b/sets/ex/ex15.ts
index fc5a248d1..fad2935b0 100644
--- a/sets/ex/ex15.ts
+++ b/sets/ex/ex15.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex15/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex15/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex15/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex15/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex16.ts b/sets/ex/ex16.ts
index 63e4c726a..0e996f4ef 100644
--- a/sets/ex/ex16.ts
+++ b/sets/ex/ex16.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex16/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex16/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex16/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex16/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex2.ts b/sets/ex/ex2.ts
index ca76816dc..cf8f597be 100644
--- a/sets/ex/ex2.ts
+++ b/sets/ex/ex2.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex2/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex2/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex2/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex2/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex3.ts b/sets/ex/ex3.ts
index bfb2fa747..b18ea4cbb 100644
--- a/sets/ex/ex3.ts
+++ b/sets/ex/ex3.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex3/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex3/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex3/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex3/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex4.ts b/sets/ex/ex4.ts
index 152b50b16..732c08373 100644
--- a/sets/ex/ex4.ts
+++ b/sets/ex/ex4.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex4/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex4/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex4/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex4/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex5.ts b/sets/ex/ex5.ts
index bda835448..98212a595 100644
--- a/sets/ex/ex5.ts
+++ b/sets/ex/ex5.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex5/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex5/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex5/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex5/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex6.ts b/sets/ex/ex6.ts
index 139dcc195..d67c115fc 100644
--- a/sets/ex/ex6.ts
+++ b/sets/ex/ex6.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex6/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex6/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex6/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex6/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex7.ts b/sets/ex/ex7.ts
index 71bc680d0..adf073880 100644
--- a/sets/ex/ex7.ts
+++ b/sets/ex/ex7.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex7/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex7/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex7/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex7/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex8.ts b/sets/ex/ex8.ts
index eef97657f..2e5762e1c 100644
--- a/sets/ex/ex8.ts
+++ b/sets/ex/ex8.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex8/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex8/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex8/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex8/logo.png"
 	}
 }
 
diff --git a/sets/ex/ex9.ts b/sets/ex/ex9.ts
index bbe9a290a..7fe6f8d3d 100644
--- a/sets/ex/ex9.ts
+++ b/sets/ex/ex9.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/ex/ex9/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/ex/ex9/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/ex/ex9/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/ex/ex9/logo.png"
 	}
 }
 
diff --git a/sets/gym/gym1.ts b/sets/gym/gym1.ts
index 69c4f64d5..b5fda9d96 100644
--- a/sets/gym/gym1.ts
+++ b/sets/gym/gym1.ts
@@ -21,8 +21,12 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/gym/gym1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/gym/gym1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/gym/gym1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/gym/gym1/logo.png"
+	},
+
+	availability: {
+		fr: false
 	}
 }
 
diff --git a/sets/gym/gym2.ts b/sets/gym/gym2.ts
index 4325609cf..05bab7f9b 100644
--- a/sets/gym/gym2.ts
+++ b/sets/gym/gym2.ts
@@ -21,8 +21,12 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/gym/gym2/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/gym/gym2/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/gym/gym2/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/gym/gym2/logo.png"
+	},
+
+	availability: {
+		fr: false
 	}
 }
 
diff --git a/sets/hgss/hgss1.ts b/sets/hgss/hgss1.ts
index bf47f552d..d4960d1d4 100644
--- a/sets/hgss/hgss1.ts
+++ b/sets/hgss/hgss1.ts
@@ -22,8 +22,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/hgss/hgss1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/hgss/hgss1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/hgss/hgss1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/hgss/hgss1/logo.png"
 	}
 }
 
diff --git a/sets/hgss/hgss2.ts b/sets/hgss/hgss2.ts
index 0e9a7a0b2..51ba337d3 100644
--- a/sets/hgss/hgss2.ts
+++ b/sets/hgss/hgss2.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/hgss/hgss2/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/hgss/hgss2/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/hgss/hgss2/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/hgss/hgss2/logo.png"
 	}
 }
 
diff --git a/sets/hgss/hgss3.ts b/sets/hgss/hgss3.ts
index 92f3801b7..fc0a4846c 100644
--- a/sets/hgss/hgss3.ts
+++ b/sets/hgss/hgss3.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/hgss/hgss3/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/hgss/hgss3/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/hgss/hgss3/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/hgss/hgss3/logo.png"
 	}
 }
 
diff --git a/sets/hgss/hgss4.ts b/sets/hgss/hgss4.ts
index bc1a20a9f..d7a7f8106 100644
--- a/sets/hgss/hgss4.ts
+++ b/sets/hgss/hgss4.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/hgss/hgss4/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/hgss/hgss4/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/hgss/hgss4/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/hgss/hgss4/logo.png"
 	}
 }
 
diff --git a/sets/hgss/hgssp.ts b/sets/hgss/hgssp.ts
index d4a08d68c..7aaafa622 100644
--- a/sets/hgss/hgssp.ts
+++ b/sets/hgss/hgssp.ts
@@ -21,8 +21,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/hgss/hgssp/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/hgss/hgssp/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/hgss/hgssp/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/hgss/hgssp/logo.png"
 	}
 }
 
diff --git a/sets/lc/lc.ts b/sets/lc/lc.ts
index 9e4b0da16..8dbb61b0a 100644
--- a/sets/lc/lc.ts
+++ b/sets/lc/lc.ts
@@ -18,6 +18,10 @@ const set: Set = {
 	legal: {
 		standard: false,
 		expanded: false,
+	},
+
+	availability: {
+		fr: false
 	}
 }
 
diff --git a/sets/mc/2013bw.ts b/sets/mc/2013bw.ts
index 740efed31..20dca5b22 100644
--- a/sets/mc/2013bw.ts
+++ b/sets/mc/2013bw.ts
@@ -20,6 +20,10 @@ const set: Set = {
 	legal: {
 		standard: false,
 		expanded: false,
+	},
+
+	availability: {
+		en: false,
 	}
 }
 
diff --git a/sets/misc/jumbo.ts b/sets/misc/jumbo.ts
new file mode 100644
index 000000000..3d857784a
--- /dev/null
+++ b/sets/misc/jumbo.ts
@@ -0,0 +1,26 @@
+import Set from '../../interfaces/Set'
+
+// Card in maxi sizes
+
+const set: Set = {
+	name: {
+		en: `Jumbo cards`,
+		fr: `Cartes Jumbo`,
+	},
+	expansionCode: "misc",
+	code: `jumbo`,
+
+	cardCount: {
+		total: 160,
+		official: 160
+	},
+
+	releaseDate: `2000-02-01`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+}
+
+export default set
diff --git a/sets/neo/neo1.ts b/sets/neo/neo1.ts
index 5a4944282..a5f3b0505 100644
--- a/sets/neo/neo1.ts
+++ b/sets/neo/neo1.ts
@@ -21,8 +21,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/neo/neo1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/neo/neo1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/neo/neo1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/neo/neo1/logo.png"
 	}
 }
 
diff --git a/sets/neo/neo2.ts b/sets/neo/neo2.ts
index 4b35da11f..f8151c5f2 100644
--- a/sets/neo/neo2.ts
+++ b/sets/neo/neo2.ts
@@ -21,8 +21,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/neo/neo2/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/neo/neo2/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/neo/neo2/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/neo/neo2/logo.png"
 	}
 }
 
diff --git a/sets/neo/neo3.ts b/sets/neo/neo3.ts
index 389736879..5dd7697ae 100644
--- a/sets/neo/neo3.ts
+++ b/sets/neo/neo3.ts
@@ -21,8 +21,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/neo/neo3/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/neo/neo3/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/neo/neo3/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/neo/neo3/logo.png"
 	}
 }
 
diff --git a/sets/neo/neo4.ts b/sets/neo/neo4.ts
index 6ede1058b..ab9d3b96b 100644
--- a/sets/neo/neo4.ts
+++ b/sets/neo/neo4.ts
@@ -21,8 +21,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/neo/neo4/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/neo/neo4/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/neo/neo4/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/neo/neo4/logo.png"
 	}
 }
 
diff --git a/sets/neo/si1.ts b/sets/neo/si1.ts
index 6eaac89d8..f054e2033 100644
--- a/sets/neo/si1.ts
+++ b/sets/neo/si1.ts
@@ -20,8 +20,12 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/neo/si1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/neo/si1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/neo/si1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/neo/si1/logo.png"
+	},
+
+	availability: {
+		fr: false
 	}
 }
 
diff --git a/sets/pl/pl1.ts b/sets/pl/pl1.ts
index e9371d09e..aa256f154 100644
--- a/sets/pl/pl1.ts
+++ b/sets/pl/pl1.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pl/pl1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pl/pl1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pl/pl1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pl/pl1/logo.png"
 	}
 }
 
diff --git a/sets/pl/pl2.ts b/sets/pl/pl2.ts
index 71a7c47ff..de4ca5f5f 100644
--- a/sets/pl/pl2.ts
+++ b/sets/pl/pl2.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pl/pl2/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pl/pl2/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pl/pl2/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pl/pl2/logo.png"
 	}
 }
 
diff --git a/sets/pl/pl3.ts b/sets/pl/pl3.ts
index 2bb431c7b..10df217ad 100644
--- a/sets/pl/pl3.ts
+++ b/sets/pl/pl3.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pl/pl3/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pl/pl3/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pl/pl3/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pl/pl3/logo.png"
 	}
 }
 
diff --git a/sets/pl/pl4.ts b/sets/pl/pl4.ts
index fa246fe7f..42b514ee4 100644
--- a/sets/pl/pl4.ts
+++ b/sets/pl/pl4.ts
@@ -22,8 +22,12 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pl/pl4/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pl/pl4/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pl/pl4/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pl/pl4/logo.png"
+	},
+
+	availability: {
+		fr: false
 	}
 }
 
diff --git a/sets/pl/ru1.ts b/sets/pl/ru1.ts
index 452f1b0c9..86136249f 100644
--- a/sets/pl/ru1.ts
+++ b/sets/pl/ru1.ts
@@ -20,8 +20,12 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pl/ru1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pl/ru1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pl/ru1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pl/ru1/logo.png"
+	},
+
+	availability: {
+		fr: false
 	}
 }
 
diff --git a/sets/pop/np.ts b/sets/pop/np.ts
index 208db0cb5..4062386f4 100644
--- a/sets/pop/np.ts
+++ b/sets/pop/np.ts
@@ -22,8 +22,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pop/np/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pop/np/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pop/np/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pop/np/logo.png"
 	}
 }
 
diff --git a/sets/pop/pop1.ts b/sets/pop/pop1.ts
index 9697e8f7e..153ba36f6 100644
--- a/sets/pop/pop1.ts
+++ b/sets/pop/pop1.ts
@@ -20,8 +20,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pop/pop1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pop/pop1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pop/pop1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pop/pop1/logo.png"
 	}
 }
 
diff --git a/sets/pop/pop2.ts b/sets/pop/pop2.ts
index f41c85096..81be06590 100644
--- a/sets/pop/pop2.ts
+++ b/sets/pop/pop2.ts
@@ -20,8 +20,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pop/pop2/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pop/pop2/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pop/pop2/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pop/pop2/logo.png"
 	}
 }
 
diff --git a/sets/pop/pop3.ts b/sets/pop/pop3.ts
index 3f91dd50d..043f0c2ec 100644
--- a/sets/pop/pop3.ts
+++ b/sets/pop/pop3.ts
@@ -20,8 +20,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pop/pop3/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pop/pop3/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pop/pop3/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pop/pop3/logo.png"
 	}
 }
 
diff --git a/sets/pop/pop4.ts b/sets/pop/pop4.ts
index 604c4d0c8..26f39bdf3 100644
--- a/sets/pop/pop4.ts
+++ b/sets/pop/pop4.ts
@@ -20,8 +20,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pop/pop4/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pop/pop4/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pop/pop4/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pop/pop4/logo.png"
 	}
 }
 
diff --git a/sets/pop/pop5.ts b/sets/pop/pop5.ts
index 93d72512a..2e9558231 100644
--- a/sets/pop/pop5.ts
+++ b/sets/pop/pop5.ts
@@ -20,8 +20,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pop/pop5/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pop/pop5/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pop/pop5/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pop/pop5/logo.png"
 	}
 }
 
diff --git a/sets/pop/pop6.ts b/sets/pop/pop6.ts
index eed0a874e..3fac00f0d 100644
--- a/sets/pop/pop6.ts
+++ b/sets/pop/pop6.ts
@@ -20,8 +20,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pop/pop6/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pop/pop6/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pop/pop6/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pop/pop6/logo.png"
 	}
 }
 
diff --git a/sets/pop/pop7.ts b/sets/pop/pop7.ts
index 07430e93d..eee14c837 100644
--- a/sets/pop/pop7.ts
+++ b/sets/pop/pop7.ts
@@ -20,8 +20,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pop/pop7/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pop/pop7/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pop/pop7/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pop/pop7/logo.png"
 	}
 }
 
diff --git a/sets/pop/pop8.ts b/sets/pop/pop8.ts
index 9580de1db..a132c8779 100644
--- a/sets/pop/pop8.ts
+++ b/sets/pop/pop8.ts
@@ -20,8 +20,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pop/pop8/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pop/pop8/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pop/pop8/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pop/pop8/logo.png"
 	}
 }
 
diff --git a/sets/pop/pop9.ts b/sets/pop/pop9.ts
index db937efd1..576329d07 100644
--- a/sets/pop/pop9.ts
+++ b/sets/pop/pop9.ts
@@ -20,8 +20,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/pop/pop9/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/pop/pop9/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/pop/pop9/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/pop/pop9/logo.png"
 	}
 }
 
diff --git a/sets/sm/det1.ts b/sets/sm/det1.ts
index d78fe0c57..5c4aa3171 100644
--- a/sets/sm/det1.ts
+++ b/sets/sm/det1.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/det1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/det1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/det1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/det1/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm1.ts b/sets/sm/sm1.ts
index f51ad2ef5..694b70c00 100644
--- a/sets/sm/sm1.ts
+++ b/sets/sm/sm1.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm1/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm10.ts b/sets/sm/sm10.ts
index b61bd87a2..8749ba6e1 100644
--- a/sets/sm/sm10.ts
+++ b/sets/sm/sm10.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm10/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm10/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm10/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm10/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm11.ts b/sets/sm/sm11.ts
index ad111ecfc..4fc8f0494 100644
--- a/sets/sm/sm11.ts
+++ b/sets/sm/sm11.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm11/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm11/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm11/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm11/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm115.ts b/sets/sm/sm115.ts
index 98cd31573..22ff0b318 100644
--- a/sets/sm/sm115.ts
+++ b/sets/sm/sm115.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm115/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm115/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm115/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm115/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm12.ts b/sets/sm/sm12.ts
index 5dd231994..1be53c4b0 100644
--- a/sets/sm/sm12.ts
+++ b/sets/sm/sm12.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm12/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm12/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm12/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm12/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm2.ts b/sets/sm/sm2.ts
index 1ec5fd8dd..0a96cdca7 100644
--- a/sets/sm/sm2.ts
+++ b/sets/sm/sm2.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm2/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm2/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm2/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm2/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm3.ts b/sets/sm/sm3.ts
index 65e1d57e0..482b48306 100644
--- a/sets/sm/sm3.ts
+++ b/sets/sm/sm3.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm3/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm3/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm3/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm3/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm35.ts b/sets/sm/sm35.ts
index f15f1b975..aae5440ed 100644
--- a/sets/sm/sm35.ts
+++ b/sets/sm/sm35.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm35/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm35/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm35/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm35/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm4.ts b/sets/sm/sm4.ts
index c6306a487..255aaf028 100644
--- a/sets/sm/sm4.ts
+++ b/sets/sm/sm4.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm4/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm4/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm4/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm4/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm5.ts b/sets/sm/sm5.ts
index fc87723b5..9b7046aff 100644
--- a/sets/sm/sm5.ts
+++ b/sets/sm/sm5.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm5/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm5/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm5/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm5/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm6.ts b/sets/sm/sm6.ts
index 08182342a..811a83533 100644
--- a/sets/sm/sm6.ts
+++ b/sets/sm/sm6.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm6/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm6/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm6/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm6/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm7.ts b/sets/sm/sm7.ts
index 27917212c..9d90febdf 100644
--- a/sets/sm/sm7.ts
+++ b/sets/sm/sm7.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm7/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm7/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm7/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm7/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm75.ts b/sets/sm/sm75.ts
index c0b247168..15c869279 100644
--- a/sets/sm/sm75.ts
+++ b/sets/sm/sm75.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm75/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm75/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm75/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm75/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm8.ts b/sets/sm/sm8.ts
index 40e432909..688e690b5 100644
--- a/sets/sm/sm8.ts
+++ b/sets/sm/sm8.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm8/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm8/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm8/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm8/logo.png"
 	}
 }
 
diff --git a/sets/sm/sm9.ts b/sets/sm/sm9.ts
index b25204501..0e9458a6f 100644
--- a/sets/sm/sm9.ts
+++ b/sets/sm/sm9.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sm8/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sm8/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sm8/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sm8/logo.png"
 	}
 }
 
diff --git a/sets/sm/sma.ts b/sets/sm/sma.ts
index 27f1356a9..5b0d84bf3 100644
--- a/sets/sm/sma.ts
+++ b/sets/sm/sma.ts
@@ -23,8 +23,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/sma/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/sma/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/sma/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/sma/logo.png"
 	}
 }
 
diff --git a/sets/sm/smp.ts b/sets/sm/smp.ts
index ce34439c5..36bffb5a2 100644
--- a/sets/sm/smp.ts
+++ b/sets/sm/smp.ts
@@ -25,8 +25,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/sm/smp/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/sm/smp/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/sm/smp/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/sm/smp/logo.png"
 	}
 }
 
diff --git a/sets/swsh/swsh1.ts b/sets/swsh/swsh1.ts
index 210675cc3..8a125f263 100644
--- a/sets/swsh/swsh1.ts
+++ b/sets/swsh/swsh1.ts
@@ -26,8 +26,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/swsh/swsh1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/swsh/swsh1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/swsh/swsh1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/swsh/swsh1/logo.png"
 	}
 }
 
diff --git a/sets/swsh/swsh2.ts b/sets/swsh/swsh2.ts
new file mode 100644
index 000000000..f9f26c500
--- /dev/null
+++ b/sets/swsh/swsh2.ts
@@ -0,0 +1,32 @@
+import Set from '../../interfaces/Set'
+import swsh from '../../expansions/swsh'
+const swsh2: Set = {
+	name: {
+		en: "Sword & Shield"
+	},
+
+	expansion: swsh,
+	expansionCode: "swsh",
+
+	code: "swsh1",
+	// tcgoCode
+
+	cardCount: {
+		total: 192, //unknown
+		official: 192
+	},
+
+	releaseDate: "2020-06-01",
+
+	legal: {
+		standard: true,
+		expanded: true
+	},
+
+	images: {
+		symbol: "https://assets.tcgdex.net/univ/sets/swsh/swsh1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/swsh/swsh1/logo.png"
+	}
+}
+
+export default swsh2
diff --git a/sets/tk/tk-bw-e.ts b/sets/tk/tk-bw-e.ts
new file mode 100644
index 000000000..dfa3c4e5b
--- /dev/null
+++ b/sets/tk/tk-bw-e.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `HS trainer Kit (Excadrill)`,
+		fr: `HS Kit du dresseur (Minitaupe)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2011-09-01`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-bw-z.ts b/sets/tk/tk-bw-z.ts
new file mode 100644
index 000000000..04d1c2f83
--- /dev/null
+++ b/sets/tk/tk-bw-z.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `HS trainer Kit (Zoroark)`,
+		fr: `HS Kit du dresseur (Zoroark)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2011-09-01`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-dp-l.ts b/sets/tk/tk-dp-l.ts
new file mode 100644
index 000000000..70043fb36
--- /dev/null
+++ b/sets/tk/tk-dp-l.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `DP trainer Kit (Lucario)`,
+		fr: `DP Kit dresseur (Lucario)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 12,
+		official: 12
+	},
+
+	releaseDate: `2007-09-01`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-dp-m.ts b/sets/tk/tk-dp-m.ts
new file mode 100644
index 000000000..f31c14c1f
--- /dev/null
+++ b/sets/tk/tk-dp-m.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `DP trainer Kit (Manaphy)`,
+		fr: `DP Kit dresseur (Manaphy)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 12,
+		official: 12
+	},
+
+	releaseDate: `2007-09-01`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-ex-latia.ts b/sets/tk/tk-ex-latia.ts
new file mode 100644
index 000000000..8cd9096db
--- /dev/null
+++ b/sets/tk/tk-ex-latia.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `EX trainer Kit (Latias)`,
+		fr: `EX Kit dresseur (Latias)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 10,
+		official: 10
+	},
+
+	releaseDate: `2004-07-01`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-ex-latio.ts b/sets/tk/tk-ex-latio.ts
new file mode 100644
index 000000000..85f6a923a
--- /dev/null
+++ b/sets/tk/tk-ex-latio.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `EX trainer Kit (Latios)`,
+		fr: `EX Kit dresseur (Latios)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 10,
+		official: 10
+	},
+
+	releaseDate: `2004-07-01`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-ex-n.ts b/sets/tk/tk-ex-n.ts
new file mode 100644
index 000000000..69a2b7e86
--- /dev/null
+++ b/sets/tk/tk-ex-n.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `EX trainer Kit 2 (Ninun)`,
+		fr: `EX Kit dresseur (Négapi)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 12,
+		official: 12
+	},
+
+	releaseDate: `2006-03-01`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-ex-p.ts b/sets/tk/tk-ex-p.ts
new file mode 100644
index 000000000..46c34cd10
--- /dev/null
+++ b/sets/tk/tk-ex-p.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `EX trainer Kit 2 (Plusle)`,
+		fr: `EX Kit dresseur 2 (Positi)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 12,
+		official: 12
+	},
+
+	releaseDate: `2006-03-01`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-hs-g.ts b/sets/tk/tk-hs-g.ts
new file mode 100644
index 000000000..881bc5d86
--- /dev/null
+++ b/sets/tk/tk-hs-g.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `HS trainer Kit (Gyarados)`,
+		fr: `HS Kit du dresseur (Léviator)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2010-05-01`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-hs-r.ts b/sets/tk/tk-hs-r.ts
new file mode 100644
index 000000000..e1b63f210
--- /dev/null
+++ b/sets/tk/tk-hs-r.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `HS trainer Kit (Raichu)`,
+		fr: `HS Kit du dresseur (Raichu)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2010-05-01`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-sm-l.ts b/sets/tk/tk-sm-l.ts
new file mode 100644
index 000000000..bdfd913f9
--- /dev/null
+++ b/sets/tk/tk-sm-l.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `SM trainer Kit (Lycanroc)`,
+		fr: `SM Kit du dresseur (Lougarox)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2017-04-21`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-sm-r.ts b/sets/tk/tk-sm-r.ts
new file mode 100644
index 000000000..734b7e6d4
--- /dev/null
+++ b/sets/tk/tk-sm-r.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `SM trainer Kit (Alolan Raichu)`,
+		fr: `SM Kit du dresseur (Raichu d'Alola)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2017-04-21`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-xy-b.ts b/sets/tk/tk-xy-b.ts
new file mode 100644
index 000000000..b0edc030b
--- /dev/null
+++ b/sets/tk/tk-xy-b.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `XY trainer Kit (Bisharp)`,
+		fr: `XY Kit du dresseur (Scalproie)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2014-11-01`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	availability: {
+		fr: false
+	}
+}
+
+export default set
diff --git a/sets/tk/tk-xy-latia.ts b/sets/tk/tk-xy-latia.ts
new file mode 100644
index 000000000..55ef58b1f
--- /dev/null
+++ b/sets/tk/tk-xy-latia.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `XY trainer Kit (Latias)`,
+		fr: `XY Kit du dresseur (Latias)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2015-04-29`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-xy-latio.ts b/sets/tk/tk-xy-latio.ts
new file mode 100644
index 000000000..b3034832e
--- /dev/null
+++ b/sets/tk/tk-xy-latio.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `XY trainer Kit (Latios)`,
+		fr: `XY Kit du dresseur (Latios)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2015-04-29`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-xy-n.ts b/sets/tk/tk-xy-n.ts
new file mode 100644
index 000000000..542044d9a
--- /dev/null
+++ b/sets/tk/tk-xy-n.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `XY trainer Kit (Noivern)`,
+		fr: `XY Kit du dresseur (Bruyverne)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2014-03-12`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-xy-p.ts b/sets/tk/tk-xy-p.ts
new file mode 100644
index 000000000..3dee80f80
--- /dev/null
+++ b/sets/tk/tk-xy-p.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `XY trainer Kit (Pikachu Libre)`,
+		fr: `XY Kit du dresseur (Pikachu Libre)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2016-04-27`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-xy-su.ts b/sets/tk/tk-xy-su.ts
new file mode 100644
index 000000000..86e360972
--- /dev/null
+++ b/sets/tk/tk-xy-su.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `XY trainer Kit (Suicune)`,
+		fr: `XY Kit du dresseur (Suicune)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2016-04-27`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-xy-sy.ts b/sets/tk/tk-xy-sy.ts
new file mode 100644
index 000000000..df1cd7b3c
--- /dev/null
+++ b/sets/tk/tk-xy-sy.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `XY trainer Kit (Sylveon)`,
+		fr: `XY Kit du dresseur (Nymphali)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2014-03-12`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	images: {
+		symbol: `https://assets.tcgdex.net/univ/tk/${code}/symbol`
+	},
+}
+
+export default set
diff --git a/sets/tk/tk-xy-w.ts b/sets/tk/tk-xy-w.ts
new file mode 100644
index 000000000..327b3fb65
--- /dev/null
+++ b/sets/tk/tk-xy-w.ts
@@ -0,0 +1,34 @@
+import Set from '../../interfaces/Set'
+import tk from '../../expansions/tk'
+
+import path from 'path'
+// Card in maxi sizes
+
+const code = path.basename(__filename).split(".")[0]
+
+const set: Set = {
+	name: {
+		en: `XY trainer Kit (Wigglytuff)`,
+		fr: `XY Kit du dresseur (Grodoudou)`,
+	},
+	expansion: tk,
+	code: code,
+
+	cardCount: {
+		total: 30,
+		official: 30
+	},
+
+	releaseDate: `2014-11-01`,
+
+	legal: {
+		standard: false,
+		expanded: false,
+	},
+
+	availability: {
+		fr: false
+	}
+}
+
+export default set
diff --git a/sets/xy/dc1.ts b/sets/xy/dc1.ts
index 47425dab1..464b7a0e2 100644
--- a/sets/xy/dc1.ts
+++ b/sets/xy/dc1.ts
@@ -25,8 +25,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/dc1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/dc1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/dc1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/dc1/logo.png"
 	}
 }
 
diff --git a/sets/xy/g1.ts b/sets/xy/g1.ts
index 28a98fec3..2ab32fe94 100644
--- a/sets/xy/g1.ts
+++ b/sets/xy/g1.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/g1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/g1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/g1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/g1/logo.png"
 	}
 }
 
diff --git a/sets/xy/xy0.ts b/sets/xy/xy0.ts
index b5740b6b7..070fdd071 100644
--- a/sets/xy/xy0.ts
+++ b/sets/xy/xy0.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xy0/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xy0/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xy0/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xy0/logo.png"
 	}
 }
 
diff --git a/sets/xy/xy1.ts b/sets/xy/xy1.ts
index 5b16d7568..9d37bb217 100644
--- a/sets/xy/xy1.ts
+++ b/sets/xy/xy1.ts
@@ -22,8 +22,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xy1/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xy1/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xy1/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xy1/logo.png"
 	}
 }
 
diff --git a/sets/xy/xy10.ts b/sets/xy/xy10.ts
index 65d68ce6d..4bc47ec62 100644
--- a/sets/xy/xy10.ts
+++ b/sets/xy/xy10.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xy10/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xy10/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xy10/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xy10/logo.png"
 	}
 }
 
diff --git a/sets/xy/xy11.ts b/sets/xy/xy11.ts
index c4e1cc6a3..b6689df3d 100644
--- a/sets/xy/xy11.ts
+++ b/sets/xy/xy11.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xy11/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xy11/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xy11/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xy11/logo.png"
 	}
 }
 
diff --git a/sets/xy/xy12.ts b/sets/xy/xy12.ts
index 5a0154095..e50c8c2d7 100644
--- a/sets/xy/xy12.ts
+++ b/sets/xy/xy12.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xy12/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xy12/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xy12/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xy12/logo.png"
 	}
 }
 
diff --git a/sets/xy/xy2.ts b/sets/xy/xy2.ts
index c5c062674..ffe9b034f 100644
--- a/sets/xy/xy2.ts
+++ b/sets/xy/xy2.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xy2/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xy2/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xy2/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xy2/logo.png"
 	}
 }
 
diff --git a/sets/xy/xy3.ts b/sets/xy/xy3.ts
index 9a879e17d..b31e1d533 100644
--- a/sets/xy/xy3.ts
+++ b/sets/xy/xy3.ts
@@ -25,8 +25,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xy3/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xy3/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xy3/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xy3/logo.png"
 	}
 }
 
diff --git a/sets/xy/xy4.ts b/sets/xy/xy4.ts
index 89567361f..d2f9368eb 100644
--- a/sets/xy/xy4.ts
+++ b/sets/xy/xy4.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xy4/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xy4/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xy4/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xy4/logo.png"
 	}
 }
 
diff --git a/sets/xy/xy5.ts b/sets/xy/xy5.ts
index 3b1c923d6..e11d1d5af 100644
--- a/sets/xy/xy5.ts
+++ b/sets/xy/xy5.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xy5/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xy5/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xy5/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xy5/logo.png"
 	}
 }
 
diff --git a/sets/xy/xy6.ts b/sets/xy/xy6.ts
index 53eddd6b3..1e2dd91b6 100644
--- a/sets/xy/xy6.ts
+++ b/sets/xy/xy6.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xy6/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xy6/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xy6/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xy6/logo.png"
 	}
 }
 
diff --git a/sets/xy/xy7.ts b/sets/xy/xy7.ts
index f2b088efb..9dcd44956 100644
--- a/sets/xy/xy7.ts
+++ b/sets/xy/xy7.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xy7/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xy7/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xy7/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xy7/logo.png"
 	}
 }
 
diff --git a/sets/xy/xy8.ts b/sets/xy/xy8.ts
index ba81a543f..437e421a4 100644
--- a/sets/xy/xy8.ts
+++ b/sets/xy/xy8.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/hgss/hgss4/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/hgss/hgss4/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/hgss/hgss4/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/hgss/hgss4/logo.png"
 	}
 }
 
diff --git a/sets/xy/xy9.ts b/sets/xy/xy9.ts
index 08f4fa170..b885c36bd 100644
--- a/sets/xy/xy9.ts
+++ b/sets/xy/xy9.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xy9/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xy9/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xy9/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xy9/logo.png"
 	}
 }
 
diff --git a/sets/xy/xya.ts b/sets/xy/xya.ts
index 0dda663ae..e084f72ef 100644
--- a/sets/xy/xya.ts
+++ b/sets/xy/xya.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xya/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xya/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xya/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xya/logo.png"
 	}
 }
 
diff --git a/sets/xy/xyp.ts b/sets/xy/xyp.ts
index 6d4a82f73..d2ca6b248 100644
--- a/sets/xy/xyp.ts
+++ b/sets/xy/xyp.ts
@@ -24,8 +24,8 @@ const set: Set = {
 	},
 
 	images: {
-		symbol: "https://assets.tcgdex.net/sets/xy/xyp/symbol.png",
-		logo: "https://assets.tcgdex.net/sets/xy/xyp/logo.png"
+		symbol: "https://assets.tcgdex.net/univ/sets/xy/xyp/symbol.png",
+		logo: "https://assets.tcgdex.net/en/sets/xy/xyp/logo.png"
 	}
 }