diff --git a/data/yugioh-standard.mse-style/blank2.png b/data/yugioh-standard.mse-style/blank2.png
new file mode 100644
index 00000000..de98a2db
Binary files /dev/null and b/data/yugioh-standard.mse-style/blank2.png differ
diff --git a/data/yugioh-standard.mse-style/goldfoil.png b/data/yugioh-standard.mse-style/goldfoil.png
new file mode 100644
index 00000000..a50ece90
Binary files /dev/null and b/data/yugioh-standard.mse-style/goldfoil.png differ
diff --git a/data/yugioh-standard.mse-style/style b/data/yugioh-standard.mse-style/style
index da40dd80..27d0d133 100644
--- a/data/yugioh-standard.mse-style/style
+++ b/data/yugioh-standard.mse-style/style
@@ -23,23 +23,6 @@ card dpi: 152.6265
 
 ############################################################## Extra scripts
 ############################################################## Extra style
-styling field:
-	type: choice
-	name: foil image
-	description: What foil should be on the cards?
-	initial: none
-	choice: none
-	choice: holo image
-	choice: secret holo image
-	choice: parallel holo image
-styling field:
-	type: choice
-	name: foil name
-	description: What color foil should be used on the name?
-	initial: normal
-	choice: normal
-	choice: silver
-	choice: gold
 styling field:
 	type: boolean
 	name: corner stamp
@@ -82,17 +65,21 @@ card style:
 			spell card: card-spell.jpg
 			trap card: card-trap.jpg
 	foils:
-		left: { if styling.foil_image=="parallel holo image" then 0 else 51}
-		top: { if styling.foil_image=="parallel holo image" then 0 else 114}
-		width: { if styling.foil_image=="parallel holo image" then 361 else 259}
-		height: { if styling.foil_image=="parallel holo image" then 523 else 259}
+		left: { if card.rarity=="parallel rare" then 0 else if card.rarity=="gold tech" then 0 else 51 }
+		top: { if card.rarity=="parallel rare" then 0 else if card.rarity=="gold tech" then 0 else 114 }
+		width: { if card.rarity=="parallel rare" then 361 else if card.rarity=="gold tech" then 361 else 259 }
+		height: { if card.rarity=="parallel rare" then 523 else if card.rarity=="gold tech" then 523 else 259 }
 		z index: 5
-		visible: { styling.foil_image!="none" }
 		render style: image
 		popup style: in place
 		image:
-			script:	if styling.foil_image=="parallel holo image" then "parallelfoil.png" else
-				if styling.foil_image=="secret holo image" then "secretfoil.png" else "superfoil.png"
+			script:	if card.rarity=="super rare" then "superfoil.png" else
+				if card.rarity=="ultra rare" then "superfoil.png" else
+				if card.rarity=="secret rare" then "secretfoil.png" else
+				if card.rarity=="ultimate rare" then "superfoil.png" else
+				if card.rarity=="parallel rare" then "parallelfoil.png" else
+				if card.rarity=="gold tech" then "goldfoil.png" else
+				if card.rarity=="promo" then "superfoil.png" else "blank2.png"
 	############################# Name line
 	name:
 		left: 34
@@ -106,8 +93,13 @@ card style:
 			name: MatrixRegularSmallCaps
 			size: 26
 			color:
-				script: if styling.foil_name=="silver" then rgb(230,230,230)
-				else if styling.foil_name=="gold" then rgb(216,199,53)
+				script: if card.rarity=="rare" then rgb(230,230,230)
+				else if card.rarity=="secret rare" then rgb(230,230,230)
+				else if card.rarity=="promo" then rgb(230,230,230)
+				else if card.rarity=="ultra rare" then rgb(216,199,53)
+				else if card.rarity=="ultimate rare" then rgb(60,0,0)
+				else if card.rarity=="parallel rare" then rgb(216,199,53)
+				else if card.rarity=="gold tech" then rgb(216,199,53)
 				else if is_nmonster() then rgb(255,255,255)
 				else rgb(0,0,0)
 	attribute:
@@ -269,6 +261,24 @@ card style:
 			name: Palatino Linotype
 			size: 8
 			color: rgb(0,0,0)
+	rarity:
+		left: 112
+		top: 494
+		width: 18
+		height: 18
+		z index: 2
+		render style: image
+		popup style: in place
+		choice images:
+			common: blank2.png
+			rare: blank2.png
+			super rare: blank2.png
+			ultra rare: blank2.png
+			secret rare: blank2.png
+			ultimate rare: blank2.png
+			parallel rare: blank2.png
+			gold tech: blank2.png
+			promo: blank2.png
 	copyright:
 		left: { if styling.corner_stamp=="no" then 202 else 180 }
 		top : 495
diff --git a/data/yugioh.mse-game/game b/data/yugioh.mse-game/game
index 405e463b..a7c06f65 100644
--- a/data/yugioh.mse-game/game
+++ b/data/yugioh.mse-game/game
@@ -111,6 +111,17 @@ init script:
 		else if is_trap_card()  then "Trap"
 		else                         "none"
 	}
+	# Default foil for a card
+	foil := {
+		if	card.rarity == "super rare"	then "holo image"
+		else if card.rarity == "ultra rare"	then "holo image"
+		else if card.rarity == "secret rare"	then "secret holo image"
+		else if card.rarity == "ultimate rare"	then "holo image"
+		else if card.rarity == "parallel rare"	then "parallel holo image"
+		else if card.rarity == "gold tech"	then "gold tech holo image"
+		else if card.rarity == "promo"		then "secret holo image"
+		else					     "none"
+	}
 	
 	############### Type of card
 	
@@ -260,7 +271,9 @@ card field:
 	choice: none
 	choice: holo image
 	choice: secret holo image
-	choice: parallel holo card
+	choice: parallel holo image
+	choice: gold tech holo image
+	default: foil()
 ############################# Name line
 card field:
 	type: text
@@ -395,6 +408,21 @@ card field:
 	type: text
 	name: gamecode
 	show statistics: false
+card field:
+	type: choice
+	name: rarity
+	show statistics: true
+	choice: common
+	choice: rare
+	choice: super rare
+	choice: ultra rare
+	choice: secret rare
+	choice: ultimate rare
+	choice: parallel rare
+	choice: gold tech
+	choice: promo
+	card list visible: true
+	card list column: 7
 card field:
 	type: text
 	name: copyright
@@ -438,16 +466,56 @@ word list:
 	word: Toon
 	word: Union
 ############################################################## Card pack items
+pack item:
+	name: rare
+	filter: card.rarity != "common"
+pack item:
+	name: common
+	filter: card.rarity == "common"
 pack item:
 	name: card
-	filter: card.foils == "none"
+	filter: card.number != ""
+
 ############################################################## Card packs
 pack type:
 	name: booster pack
 	item:
-		name: card
-		amount: 9
+		name: rare
+		amount: 1
+	item:
+		name: common
+		amount: 8
 pack type:
-	name: additional card
+	name: champion pack
+	item:
+		name: rare
+		amount: 1
+	item:
+		name: common
+		amount: 2
+pack type:
+	name: duelist pack
+	item:
+		name: rare
+		amount: 1
+	item:
+		name: common
+		amount: 5
+pack type:
+	name: movie pack
+	item:
+		name: rare
+		amount: 3
+	item:
+		name: common
+		amount: 5
+pack type:
+	name: premium pack
+	item:
+		name: rare
+		amount: 5
+pack type:
+	name: tournament pack
 	item:
 		name: card
+		amount: 3
\ No newline at end of file