[required] card fields

data/magic-blends.mse-include/new-blends

@@ -830,12 +830,13 @@ stamp_hybrid := [
 ########################################################################
 blend_colors := {
 	colors := sort_text( order: if card_is_wedge(input) then "(wbguro)" else "(wubrgo)"
-					, (if chosen(choice:"white"		)	then "w")
-					+ (if chosen(choice:"blue"		)	then "u")
-					+ (if chosen(choice:"black"		)	then "b")
-					+ (if chosen(choice:"red"		)	then "r")
-					+ (if chosen(choice:"green"		)	then "g")
-					+ (if chosen(choice:"orange"	)	then "o"))
+					, (if chosen(choice:"white"	)	then "w")
+					+ (if chosen(choice:"blue"	)	then "u")
+					+ (if chosen(choice:"black"	)	then "b")
+					+ (if chosen(choice:"red"	)	then "r")
+					+ (if chosen(choice:"green"	)	then "g")
+					+ (if chosen(choice:"orange")	then "o")
+	)
 	if multi and (hybrid or colors == "") then (
 		colors := colors + "m"
 	)
@@ -1121,8 +1122,8 @@ font_white	:= {
 				+	(if chosen(choice:"black"	)	then "b")
 				+	(if chosen(choice:"red"		)	then "r")
 				+	(if chosen(choice:"green"	)	then "g")
-				+	(if chosen(choice:"orange"	)	then "o"))
-				+	(if artifact					then "a")
+				+	(if chosen(choice:"orange"	)	then "o")
+	)			+	(if artifact					then "a")
 	font_colors_white(
 		if		chosen(choice:"land")			then "l"
 		else if	input == "artifact, multicolor"	then "a"

data/magic-mana-large.mse-symbol-font/symbol-font

@@ -806,7 +806,7 @@ symbol:
 	text margin right:  .21
 	text margin top:    -.15
 	text margin bottom: -.06
-	code: [0-9](?!/[WUBRGCSTQ2])|.
+	code: [0-9](?!/[WUBRGOCSTQ2])|.
 	regex: yes
 	draw text: 0
 	text font:

data/magic-modules.mse-include/symbols/choices

@@ -12,7 +12,6 @@ choice:
 	choice: black
 	choice: red
 	choice: green
-	choice: orange
 	choice: multicolor
 	choice: colorless
 	choice: artifact
@@ -48,7 +47,6 @@ choice:
 	choice: black
 	choice: red
 	choice: green
-	choice: orange
 	choice: multicolor
 	choice: colorless
 	choice: artifact
@@ -61,7 +59,6 @@ choice:
 	choice: black
 	choice: red
 	choice: green
-	choice: orange
 	choice: multicolor
 	choice: colorless
 	choice: artifact

data/magic-modules.mse-include/watermarks/choices

@@ -11,7 +11,6 @@ choice:
 	choice: black
 	choice: red
 	choice: green
-	choice: orange
 	choice: colorless
 	choice:
 		name: snow
@@ -23,7 +22,6 @@ choice:
 		choice: black
 		choice: red
 		choice: green
-		choice: orange
 		choice: colorless
 	choice:
 		name: hi res
@@ -32,7 +30,6 @@ choice:
 		choice: black
 		choice: red
 		choice: green
-		choice: orange
 		choice: colorless
 	choice:
 		name: double
@@ -53,7 +50,6 @@ choice:
 	choice: black
 	choice: red
 	choice: green
-	choice: orange
 	choice:
 		name: colorless
 		line below: true
@@ -64,7 +60,6 @@ choice:
 		choice: black
 		choice: red
 		choice: green
-		choice: orange
 		choice: colorless
 	choice:
 		name: hi res
@@ -73,7 +68,6 @@ choice:
 		choice: black
 		choice: red
 		choice: green
-		choice: orange
 		choice: colorless
 	choice:
 		name: double

data/magic.mse-game/add_cards_scripts

@@ -10,7 +10,6 @@ add cards script:
 		, new_card([name: "Swamp",    super_type: "Basic Land", sub_type: "Swamp",    rarity: "basic land", watermark: "mana symbol black"])
 		, new_card([name: "Mountain", super_type: "Basic Land", sub_type: "Mountain", rarity: "basic land", watermark: "mana symbol red"])
 		, new_card([name: "Forest",   super_type: "Basic Land", sub_type: "Forest",   rarity: "basic land", watermark: "mana symbol green"])
-		, new_card([name: "Desert",   super_type: "Basic Land", sub_type: "Desert",   rarity: "basic land", watermark: "mana symbol orange"])
 		]
 
 add cards script:
@@ -24,7 +23,6 @@ add cards script:
 		, new_card([name: "Snow-Covered Swamp",    super_type: "Basic Snow Land", sub_type: "Swamp",    rarity: "common", watermark: "mana symbol black"])
 		, new_card([name: "Snow-Covered Mountain", super_type: "Basic Snow Land", sub_type: "Mountain", rarity: "common", watermark: "mana symbol red"])
 		, new_card([name: "Snow-Covered Forest",   super_type: "Basic Snow Land", sub_type: "Forest",   rarity: "common", watermark: "mana symbol green"])
-		, new_card([name: "Snow-Covered Desert",   super_type: "Basic Snow Land", sub_type: "Desert",   rarity: "common", watermark: "mana symbol orange"])
 		]
 
 #add cards script:
@@ -46,7 +44,6 @@ add cards script:
 		, new_card([casting_cost: "B"])
 		, new_card([casting_cost: "R"])
 		, new_card([casting_cost: "G"])
-		, new_card([casting_cost: "O"])
 		]
 add cards script:
 	name: &Uncommon Cycle
@@ -57,13 +54,12 @@ add cards script:
 		, new_card([casting_cost: "B",   rarity: "uncommon"])
 		, new_card([casting_cost: "R",   rarity: "uncommon"])
 		, new_card([casting_cost: "G",   rarity: "uncommon"])
-		, new_card([casting_cost: "O",   rarity: "uncommon"])
 		]
 add cards script:
 	name: &Rare Cycle
 	description: Adds a rare card of each color to the set
 	script:
-		[ new_card([casting_cost: "W",   rarity: "rare"]) , new_card([casting_cost: "U",   rarity: "rare"]) , new_card([casting_cost: "B",   rarity: "rare"]) , new_card([casting_cost: "R",   rarity: "rare"]) , new_card([casting_cost: "G",   rarity: "rare"]) , new_card([casting_cost: "O",   rarity: "rare"]) ]
+		[ new_card([casting_cost: "W",   rarity: "rare"]) , new_card([casting_cost: "U",   rarity: "rare"]) , new_card([casting_cost: "B",   rarity: "rare"]) , new_card([casting_cost: "R",   rarity: "rare"]) , new_card([casting_cost: "G",   rarity: "rare"]) ]
 add cards script:
 	name: &Design Skeleton Full
 	description: Basic skeleton of 19C,11U,7R,2M/color, 1U,1R/color pair, 6C,15U,8R,5M/colorless. Type "skeleton_info()" in console tab/help

data/magic.mse-game/card_fields

@@ -114,7 +114,9 @@ card field:
 	choice: blue
 	choice: black
 	choice: red
-	choice: green
+	choice:
+		name: green
+		line below: true
 	choice:
 		name: orange
 		line below: true
@@ -160,7 +162,9 @@ card field:
 	choice: blue
 	choice: black
 	choice: red
-	choice: green
+	choice:
+		name: green
+		line below: true
 	choice:
 		name: orange
 		line below: true
@@ -206,7 +210,9 @@ card field:
 	choice: blue
 	choice: black
 	choice: red
-	choice: green
+	choice:
+		name: green
+		line below: true
 	choice:
 		name: orange
 		line below: true
@@ -252,7 +258,9 @@ card field:
 	choice: blue
 	choice: black
 	choice: red
-	choice: green
+	choice:
+		name: green
+		line below: true
 	choice:
 		name: orange
 		line below: true
@@ -742,7 +750,9 @@ card field:
 	choice: blue
 	choice: black
 	choice: red
-	choice: green
+	choice:
+		name: green
+		line below: true
 	choice:
 		name: orange
 		line below: true
@@ -789,7 +799,9 @@ card field:
 	choice: blue
 	choice: black
 	choice: red
-	choice: green
+	choice:
+		name: green
+		line below: true
 	choice:
 		name: orange
 		line below: true
@@ -836,7 +848,9 @@ card field:
 	choice: blue
 	choice: black
 	choice: red
-	choice: green
+	choice:
+		name: green
+		line below: true
 	choice:
 		name: orange
 		line below: true

data/magic.mse-game/keywords_ch-t

@@ -40,7 +40,7 @@ keyword mode:
 
 keyword parameter type:
 	name: 費用
-	match: [ ]?[HSVECTQXYZI0-9WUBRGO/|]+|[-—―～][^(\r\n\.。:：]*
+	match: [ ]?[HSVECTQXYZI0-9WUBRG/|]+|[-—―～][^(\r\n\.。:：]*
 	optional: true
 	script: cost_parameter_script_nonspace()
 	reminder script: cost_parameter_script_nonspace()

data/magic.mse-game/keywords_da

@@ -29,7 +29,7 @@ keyword mode:
 
 keyword parameter type:
 	name: mana
-	match: [HSVCTQXYZI0-9WUBRGO/|]+
+	match: [HSVCTQXYZI0-9WUBRG/|]+
 	refer script:
 		name: normal
 		description: No changes made
@@ -48,7 +48,7 @@ keyword parameter type:
 # By pichoro and bunnierein
 keyword parameter type:
 	name: cost
-	match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—][^(\r\n]*
+	match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—][^(\r\n]*
 	separator before is: [ —-]
 	separator after is: [.]
 	optional: false

data/magic.mse-game/keywords_de

@@ -40,7 +40,7 @@ keyword mode:
 
 keyword parameter type:
 	name: Kosten
-	match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
+	match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
 	optional: false
 	script: cost_parameter_script()
 	reminder script: cost_parameter_script()

data/magic.mse-game/keywords_es

@@ -40,7 +40,7 @@ keyword mode:
 
 keyword parameter type:
 	name: coste
-	match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
+	match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
 	optional: false
 	script: cost_parameter_script()
 	reminder script: cost_parameter_script()

data/magic.mse-game/keywords_fr

@@ -40,7 +40,7 @@ keyword mode:
 
 keyword parameter type:
 	name: coût
-	match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
+	match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
 	script: cost_parameter_script()
 	reminder script: cost_parameter_script()
 	separator before is: ( |- ?|— ?|― ?|～)

data/magic.mse-game/keywords_it

@@ -40,7 +40,7 @@ keyword mode:
 
 keyword parameter type:
 	name: costo
-	match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
+	match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
 	optional: false
 	script: cost_parameter_script()
 	reminder script: cost_parameter_script()

data/magic.mse-game/keywords_jp

@@ -40,7 +40,7 @@ keyword mode:
 
 keyword parameter type:
 	name: コスト
-	match: [ ]?[HSVECTQXYZI0-9WUBRGO/|]+|[-—―～][^(\r\n\.。:：]*
+	match: [ ]?[HSVECTQXYZI0-9WUBRG/|]+|[-—―～][^(\r\n\.。:：]*
 	optional: true
 	script: cost_parameter_script_nonspace()
 	reminder script: cost_parameter_script_nonspace()

data/magic.mse-game/keywords_ko

@@ -40,7 +40,7 @@ keyword mode:
 
 keyword parameter type:
 	name: 비용
-	match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
+	match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
 	optional: false
 	script: cost_parameter_script()
 	reminder script: cost_parameter_script()

data/magic.mse-game/keywords_pl

@@ -29,7 +29,7 @@ keyword mode:
 
 keyword parameter type:
 	name: mana
-	match: [HSVCTQXYZI0-9WUBRGO/|]+
+	match: [HSVCTQXYZI0-9WUBRG/|]+
 	refer script:
 		name: normal
 		description: No changes made
@@ -48,7 +48,7 @@ keyword parameter type:
 # By pichoro and bunnierein
 keyword parameter type:
 	name: cost
-	match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—][^(\r\n]*
+	match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—][^(\r\n]*
 	separator before is: [ —-]
 	separator after is: [.]
 	optional: false

data/magic.mse-game/keywords_pt-br

@@ -40,7 +40,7 @@ keyword mode:
 
 keyword parameter type:
 	name: custo
-	match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
+	match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
 	optional: false
 	script: cost_parameter_script()
 	reminder script: cost_parameter_script()

data/magic.mse-game/keywords_ru

@@ -40,7 +40,7 @@ keyword mode:
 
 keyword parameter type:
 	name: стоимость
-	match: [ ][HSVECTQXYZI0-9WUBRGO/|]*|[-—―～][^(\r\n\.。:：]*
+	match: [ ][HSVECTQXYZI0-9WUBRG/|]*|[-—―～][^(\r\n\.。:：]*
 	optional: false
 	script: cost_parameter_script()
 	reminder script: cost_parameter_script()

data/magic.mse-game/language_map

@@ -819,7 +819,7 @@ languages := [
 		is_swamp          : match@(match: "(?i)Swamp")
 		is_mountain       : match@(match: "(?i)Mountain")
 		is_forest         : match@(match: "(?i)Forest")
-		is_derast         : match@(match: "(?i)Desert")
+		is_desert         : match@(match: "(?i)Desert")
 		is_wastes         : match@(match: "(?i)Wastes")
 
 		is_class		  : match@(match: "(?i)Class")

data/magic.mse-game/script

@@ -1074,13 +1074,12 @@ remove_type := replace@(match: "(Artifact|Creature|Enchantment|Instant|Land|Plan
 	replace@(match: "[ ]+", in_context: "^<match>", replace: "")+
 	replace@(match: "[ ]+", in_context: "<match>$", replace: "")
 
-write_wubrg := {
-	(if match(input, match:"white") then "W" else "")+
-	(if match(input, match:"blue") then "U" else "")+
-	(if match(input, match:"black") then "B" else "")+
-	(if match(input, match:"red") then "R" else "")+
-	(if match(input, match:"green") then "G" else "")+
-	(if match(input, match:"orange") then "O" else "")
+write_wubrg := {(if match(input, match:"white") then "W" else "")
+	+			(if match(input, match:"blue") then "U" else "")
+	+			(if match(input, match:"black") then "B" else "")
+	+			(if match(input, match:"red") then "R" else "")
+	+			(if match(input, match:"green") then "G" else "")
+	+			(if match(input, match:"orange") then "O" else "")
 }
 colored_mana := {to_number(
 	for each sym in cmc_split(to_text()) do (
@@ -1100,7 +1099,14 @@ generic_mana := {to_number(
 }
 
 primary_card_color := {
-	artifact :=    chosen(choice:"artifact") and not (chosen(choice:"white") or chosen(choice:"blue") or chosen(choice:"black") or chosen(choice:"red") or chosen(choice:"green") or chosen(choice:"orange"))
+	artifact :=    chosen(choice:"artifact")
+		and not (	chosen(choice:"white")
+			or		chosen(choice:"blue")
+			or		chosen(choice:"black")
+			or		chosen(choice:"red")
+			or		chosen(choice:"green")
+			or		chosen(choice:"orange")
+		)
 	land :=        chosen(choice:"land")
 	multi :=       chosen(choice:"multicolor")
 	hybrid :=      chosen(choice:"hybrid")
@@ -1125,7 +1131,14 @@ primary_card_color := {
 	else                                                        input
 }
 sparker_card_color := {
-	artifact :=    chosen(choice:"artifact") and not (chosen(choice:"white") or chosen(choice:"blue") or chosen(choice:"black") or chosen(choice:"red") or chosen(choice:"green") or chosen(choice:"orange"))
+	artifact :=    chosen(choice:"artifact")
+		and not (	chosen(choice:"white")
+			or		chosen(choice:"blue")
+			or		chosen(choice:"black")
+			or		chosen(choice:"red")
+			or		chosen(choice:"green")
+			or		chosen(choice:"orange")
+		)
 	land :=        chosen(choice:"land")
 	multi :=       chosen(choice:"multicolor")
 	hybrid :=      chosen(choice:"hybrid")
@@ -1162,12 +1175,12 @@ contains_target := match@(match:"(?i)([^a-z]|^)targets?([^a-z]|$)")
 is_targeted :=     { contains_target(card.rule_text) }
 
 #### convert color word to mana symbol
-color_to_mana := replace@(match: "white", replace: "[W]")+
-	replace@(match: "blue", 	replace: "[U]")+
-	replace@(match: "black", 	replace: "[B]")+
-	replace@(match: "red", 		replace: "[R]")+
-	replace@(match: "green", 	replace: "[G]")+
-	replace@(match: "orange", 	replace: "[O]")
+color_to_mana :=	replace@(match: "white", replace: "[W]")
+	+				replace@(match: "blue", 	replace: "[U]")
+	+				replace@(match: "black", 	replace: "[B]")
+	+				replace@(match: "red", 		replace: "[R]")
+	+				replace@(match: "green", 	replace: "[G]")
+	+				replace@(match: "orange", 	replace: "[O]")
 
 #### convert number word to digit
 digital_number := {
@@ -5786,7 +5799,20 @@ apply_index := {
 		}
 		color: {fill_len(color_of_card(), lead:"A")},
 		"color category": {
-			indexes := [[lang_setting("colorless")], [lang_setting("white")], [lang_setting("blue")], [lang_setting("black")], [lang_setting("red")], [lang_setting("green")], [lang_setting("orange")], [lang_setting("purple")], [lang_setting("pink")], [lang_setting("yellow")], [lang_setting("brown")], [lang_setting("multicolor")], [lang_setting("hybrid")]]
+			indexes := [[lang_setting("colorless")]
+			           ,[lang_setting("white")]
+			           ,[lang_setting("blue")]
+			           ,[lang_setting("black")]
+			           ,[lang_setting("red")]
+			           ,[lang_setting("green")]
+			           ,[lang_setting("orange")]
+			           ,[lang_setting("purple")]
+			           ,[lang_setting("pink")]
+			           ,[lang_setting("yellow")]
+			           ,[lang_setting("brown")]
+			           ,[lang_setting("multicolor")]
+			           ,[lang_setting("hybrid")]
+			]
 			fill_len(position(of:[card.color_category], in:indexes, lead:"0", fill_to:2))
 		},
 		"exact color": {
@@ -5888,7 +5914,27 @@ skeleton_runner := {
 				(cards := cards + [new_card([name:prefix+letter_list[x]+fill_len(y, lead:"0"), rarity:rarity, super_type:super_type, casting_cost:mana_list[x]])];)
 	)
 	cards
-}@(count:1, rarity:"common", type:"", prefix:"C", super_type:"", color_list:["white", "blue", "black", "red", "green", "orange"], letter_list:["W", "U", "B", "R", "G", "O"], mana_list:"nope")
+}@(count:1
+  ,rarity:"common"
+  ,type:""
+  ,prefix:"C"
+  ,super_type:""
+  ,color_list:["white"
+              ,"blue"
+              ,"black"
+              ,"red"
+              ,"green"
+              ,"orange"
+   ]
+  ,letter_list:["W"
+               ,"U"
+               ,"B"
+               ,"R"
+               ,"G"
+               ,"O"
+   ]
+  ,mana_list:"nope"
+)
 #### outside to make singleton scripts easier
 blank_list_5 := ["","","","",""]
 blank_list_10 := ["","","","","","","","","",""]

data/magic.mse-game/statistics_en

@@ -20,7 +20,6 @@ statistics dimension:
 	group: Black
 	group: Red
 	group: Green
-	group: Orange
 	group: Multicolor
 	group: Hybrid
 	colors:
@@ -29,7 +28,6 @@ statistics dimension:
 		Black		: rgb(33,33,33)
 		Red		: rgb(156,15,15)
 		Green		: rgb(68,144,15)
-		Orange		: rgb(253,196,41)
 		Colorless	: rgb(101,104,94)
 		Artifact	: rgb(109,132,158)
 		Multicolor	: rgb(244,177,10)
@@ -50,33 +48,32 @@ statistics dimension:
 		​​​​B		: rgb(22,22,22)
 		​​​​​R		: rgb(156,15,15)
 		​​​​​​G		: rgb(68,144,15)
-		​​​​​​​O		: rgb(253,196,41)
-		​​​​​​​​WU		: rgb(254,192,80)
-		​​​​​​​​​WB		: rgb(254,192,80)
-		​​​​​​​​​​WR		: rgb(254,192,80)
-		​​​​​​​​​​​WG		: rgb(254,192,80)
-		​​​​​​​​​​​​UB		: rgb(254,192,80)
-		​​​​​​​​​​​​​UR		: rgb(254,192,80)
-		​​​​​​​​​​​​​​UG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​BR		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​BG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​RG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​WUB		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​WUR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​WUG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​WBR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​WBG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​WRG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​UBR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​UBG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​URG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​BRG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBR	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRG	: rgb(224,133,8)
+		​​​​​​​WU		: rgb(254,192,80)
+		​​​​​​​​WB		: rgb(254,192,80)
+		​​​​​​​​​WR		: rgb(254,192,80)
+		​​​​​​​​​​WG		: rgb(254,192,80)
+		​​​​​​​​​​​UB		: rgb(254,192,80)
+		​​​​​​​​​​​​UR		: rgb(254,192,80)
+		​​​​​​​​​​​​​UG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​BR		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​BG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​​RG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​​​WUB		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​WUR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​WUG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​WBR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​WBG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​WRG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​UBR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​UBG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​URG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​BRG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBR	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRG	: rgb(224,133,8)
 
 statistics dimension:
 	name: color identity
@@ -92,33 +89,32 @@ statistics dimension:
 		​​​​B		: rgb(22,22,22)
 		​​​​​R		: rgb(156,15,15)
 		​​​​​​G		: rgb(68,144,15)
-		​​​​​​​O		: rgb(253,196,41)
-		​​​​​​​​WU		: rgb(254,192,80)
-		​​​​​​​​​WB		: rgb(254,192,80)
-		​​​​​​​​​​WR		: rgb(254,192,80)
-		​​​​​​​​​​​WG		: rgb(254,192,80)
-		​​​​​​​​​​​​UB		: rgb(254,192,80)
-		​​​​​​​​​​​​​UR		: rgb(254,192,80)
-		​​​​​​​​​​​​​​UG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​BR		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​BG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​RG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​WUB		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​WUR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​WUG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​WBR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​WBG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​WRG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​UBR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​UBG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​URG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​BRG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBR	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRG	: rgb(224,133,8)
+		​​​​​​​WU		: rgb(254,192,80)
+		​​​​​​​​WB		: rgb(254,192,80)
+		​​​​​​​​​WR		: rgb(254,192,80)
+		​​​​​​​​​​WG		: rgb(254,192,80)
+		​​​​​​​​​​​UB		: rgb(254,192,80)
+		​​​​​​​​​​​​UR		: rgb(254,192,80)
+		​​​​​​​​​​​​​UG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​BR		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​BG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​​RG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​​​WUB		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​WUR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​WUG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​WBR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​WBG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​WRG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​UBR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​UBG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​URG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​BRG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBR	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRG	: rgb(224,133,8)
 
 statistics dimension:
 	name: casting cost
@@ -717,7 +713,6 @@ statistics dimension:
 		B			: rgb(33,33,33)
 		R			: rgb(156,15,15)
 		G			: rgb(68,144,15)
-		O			: rgb(253,196,41)
 		Any	: rgb(112,38,128)
 		Chosen		: rgb(112,38,128)
 
@@ -735,7 +730,6 @@ statistics dimension:
 	group: B
 	group: R
 	group: G
-	group: O
 	group: Any
 	group: Chosen
 	colors:
@@ -745,7 +739,6 @@ statistics dimension:
 		B			: rgb(33,33,33)
 		R			: rgb(156,15,15)
 		G			: rgb(68,144,15)
-		O			: rgb(253,196,41)
 		Any	: rgb(112,38,128)
 		Chosen		: rgb(112,38,128)
 
@@ -772,7 +765,6 @@ statistics dimension:
 		B			: rgb(33,33,33)
 		R			: rgb(156,15,15)
 		G			: rgb(68,144,15)
-		O			: rgb(253,196,41)
 		Any	: rgb(112,38,128)
 		Chosen		: rgb(112,38,128)
 
@@ -837,10 +829,6 @@ statistics dimension:
 		​​​​​​GG		: rgb(63,139,10)
 		​​​​​​GGG		: rgb(46,123,0)
 		​​​​​​GGGG+	: rgb(18,102,0)
-		​​​​​​​O		: rgb(253,196,41)
-		​​​​​​​OO		: rgb(180,162,31)
-		​​​​​​​OOO		: rgb(112,128,21)
-		​​​​​​​OOOO+	: rgb(80,90,14)
 
 statistics dimension:
 	name: total pips (Casting Costs)
@@ -856,7 +844,6 @@ statistics dimension:
 	group: B
 	group: R
 	group: G
-	group: O
 	colors:
 		C	: rgb(101,104,94)
 		W	: rgb(255,231,185)
@@ -864,7 +851,6 @@ statistics dimension:
 		B	: rgb(33,33,33)
 		R	: rgb(156,15,15)
 		G	: rgb(68,144,15)
-		O	: rgb(253,196,41)
 
 statistics dimension:
 	name: pip count (Ability Costs)
@@ -927,10 +913,6 @@ statistics dimension:
 		​​​​​​GG		: rgb(63,139,10)
 		​​​​​​GGG		: rgb(46,123,0)
 		​​​​​​GGGG+	: rgb(18,102,0)
-		​​​​​​​O		: rgb(253,196,41)
-		​​​​​​​OO		: rgb(180,162,31)
-		​​​​​​​OOO		: rgb(112,128,21)
-		​​​​​​​OOOO+	: rgb(80,90,14)
 
 statistics dimension:
 	name: total pips (Ability Costs)
@@ -946,7 +928,6 @@ statistics dimension:
 	group: B
 	group: R
 	group: G
-	group: O
 	colors:
 		C	: rgb(101,104,94)
 		W	: rgb(255,231,185)
@@ -954,7 +935,6 @@ statistics dimension:
 		B	: rgb(33,33,33)
 		R	: rgb(156,15,15)
 		G	: rgb(68,144,15)
-		O	: rgb(253,196,41)
 
 statistics dimension:
 	name: pip count (All Costs)
@@ -1017,10 +997,6 @@ statistics dimension:
 		​​​​​​GG		: rgb(63,139,10)
 		​​​​​​GGG		: rgb(46,123,0)
 		​​​​​​GGGG+	: rgb(18,102,0)
-		​​​​​​​O		: rgb(253,196,41)
-		​​​​​​​OO		: rgb(180,162,31)
-		​​​​​​​OOO		: rgb(112,128,21)
-		​​​​​​​OOOO+	: rgb(80,90,14)
 
 statistics dimension:
 	name: total pips (All Costs)
@@ -1036,7 +1012,6 @@ statistics dimension:
 	group: B
 	group: R
 	group: G
-	group: O
 	colors:
 		C	: rgb(101,104,94)
 		W	: rgb(255,231,185)
@@ -1044,7 +1019,6 @@ statistics dimension:
 		B	: rgb(33,33,33)
 		R	: rgb(156,15,15)
 		G	: rgb(68,144,15)
-		O	: rgb(253,196,41)
 
 statistics dimension:
 	name: word count
@@ -1223,63 +1197,32 @@ statistics dimension:
 		​​​​B		: rgb(22,22,22)
 		​​​​​R		: rgb(156,15,15)
 		​​​​​​G		: rgb(68,144,15)
-		​​​​​​​O		: rgb(253,196,41)
-		​​​​​​​​WU		: rgb(254,192,80)
-		​​​​​​​​​WB		: rgb(254,192,80)
-		​​​​​​​​​​WR		: rgb(254,192,80)
-		​​​​​​​​​​​WG		: rgb(254,192,80)
-		​​​​​​​​​​​​WO	: rgb(254,192,80)
-		​​​​​​​​​​​​​UB		: rgb(254,192,80)
-		​​​​​​​​​​​​​​UR		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​UG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​UO	: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​BR		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​BG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​BO	: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​​RG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​​​RO	: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​​​​GO	: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​​​​​WUB		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​WUR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​WUG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​WUO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​WBR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WRG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WRO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WGO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​URG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​URO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UGO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​BRG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​BRO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​BGO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​RGO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBR	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WRGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​URGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRG	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBGO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURGO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRGO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRGO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRGO	: rgb(210,122,7)
+		​​​​​​​WU		: rgb(254,192,80)
+		​​​​​​​​WB		: rgb(254,192,80)
+		​​​​​​​​​WR		: rgb(254,192,80)
+		​​​​​​​​​​WG		: rgb(254,192,80)
+		​​​​​​​​​​​UB		: rgb(254,192,80)
+		​​​​​​​​​​​​UR		: rgb(254,192,80)
+		​​​​​​​​​​​​​UG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​BR		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​BG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​​RG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​​​WUB		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​WUR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​WUG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​WBR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​WBG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​WRG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​UBR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​UBG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​URG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​BRG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBR	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRG	: rgb(224,133,8)
 
 statistics dimension:
 	name: color (All Faces)
@@ -1295,63 +1238,32 @@ statistics dimension:
 		​​​​B		: rgb(22,22,22)
 		​​​​​R		: rgb(156,15,15)
 		​​​​​​G		: rgb(68,144,15)
-		​​​​​​​O		: rgb(253,196,41)
-		​​​​​​​​WU		: rgb(254,192,80)
-		​​​​​​​​​WB		: rgb(254,192,80)
-		​​​​​​​​​​WR		: rgb(254,192,80)
-		​​​​​​​​​​​WG		: rgb(254,192,80)
-		​​​​​​​​​​​​WO	: rgb(254,192,80)
-		​​​​​​​​​​​​​UB		: rgb(254,192,80)
-		​​​​​​​​​​​​​​UR		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​UG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​UO	: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​BR		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​BG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​BO	: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​​RG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​​​RO	: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​​​​GO	: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​​​​​WUB		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​WUR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​WUG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​WUO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​WBR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WRG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WRO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WGO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​URG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​URO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UGO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​BRG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​BRO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​BGO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​RGO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBR	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WRGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​URGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRG	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBGO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURGO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRGO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRGO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRGO	: rgb(210,122,7)
+		​​​​​​​WU		: rgb(254,192,80)
+		​​​​​​​​WB		: rgb(254,192,80)
+		​​​​​​​​​WR		: rgb(254,192,80)
+		​​​​​​​​​​WG		: rgb(254,192,80)
+		​​​​​​​​​​​UB		: rgb(254,192,80)
+		​​​​​​​​​​​​UR		: rgb(254,192,80)
+		​​​​​​​​​​​​​UG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​BR		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​BG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​​RG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​​​WUB		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​WUR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​WUG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​WBR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​WBG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​WRG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​UBR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​UBG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​URG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​BRG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBR	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRG	: rgb(224,133,8)
 
 statistics dimension:
 	name: color (Promos)
@@ -1367,63 +1279,32 @@ statistics dimension:
 		​​​​B		: rgb(22,22,22)
 		​​​​​R		: rgb(156,15,15)
 		​​​​​​G		: rgb(68,144,15)
-		​​​​​​​O		: rgb(253,196,41)
-		​​​​​​​​WU		: rgb(254,192,80)
-		​​​​​​​​​WB		: rgb(254,192,80)
-		​​​​​​​​​​WR		: rgb(254,192,80)
-		​​​​​​​​​​​WG		: rgb(254,192,80)
-		​​​​​​​​​​​​WO	: rgb(254,192,80)
-		​​​​​​​​​​​​​UB		: rgb(254,192,80)
-		​​​​​​​​​​​​​​UR		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​UG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​UO	: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​BR		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​BG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​BO	: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​​RG		: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​​​RO	: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​​​​GO	: rgb(254,192,80)
-		​​​​​​​​​​​​​​​​​​​​​​​WUB		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​WUR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​WUG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​WUO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​WBR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WRG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WRO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WGO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBR		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​URG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​URO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UGO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​BRG		: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​BRO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​BGO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​RGO	: rgb(244,177,10)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBR	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WRGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRG	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​URGO	: rgb(232,154,9)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRG	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBGO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURGO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRGO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRGO	: rgb(224,133,8)
-		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRGO	: rgb(210,122,7)
+		​​​​​​​WU		: rgb(254,192,80)
+		​​​​​​​​WB		: rgb(254,192,80)
+		​​​​​​​​​WR		: rgb(254,192,80)
+		​​​​​​​​​​WG		: rgb(254,192,80)
+		​​​​​​​​​​​UB		: rgb(254,192,80)
+		​​​​​​​​​​​​UR		: rgb(254,192,80)
+		​​​​​​​​​​​​​UG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​BR		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​BG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​​RG		: rgb(254,192,80)
+		​​​​​​​​​​​​​​​​​WUB		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​WUR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​WUG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​WBR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​WBG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​WRG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​UBR		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​UBG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​URG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​BRG		: rgb(244,177,10)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBR	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WURG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WBRG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​UBRG	: rgb(232,154,9)
+		​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​​WUBRG	: rgb(224,133,8)
 
 statistics dimension:
 	name: omniverse color

data/magic.mse-game/statistics_script

@@ -219,7 +219,14 @@ color_category_statistic :=
 }
 face_color_category_statistic :=
 {
-	artifact := chosen(choice:"artifact") and not (chosen(choice:"white") or chosen(choice:"blue") or chosen(choice:"black") or chosen(choice:"red") or chosen(choice:"green") or chosen(choice:"orange"))
+	artifact := (chosen(choice:"artifact"))
+		and not (	chosen(choice:"white")
+			or		chosen(choice:"blue")
+			or		chosen(choice:"black")
+			or		chosen(choice:"red")
+			or		chosen(choice:"green")
+			or		chosen(choice:"orange")
+		)
 	land :=			chosen(choice:"land")
 	multi :=		chosen(choice:"multicolor")
 	hybrid :=		chosen(choice:"hybrid")
@@ -311,7 +318,7 @@ cc_colored_pips_totals_statistic :=
 {
 	cc := card.casting_cost + (if check_2_statistic() then " " + card.casting_cost_2 else "")
 	
-	join(wubrgoc_break_statistic(cc), sep:",")
+	join(color_code_break_statistic(cc), sep:",")
 }
 
 # Count how many cards have one white pip in their ability costs. Repeat for two white pips. Repeat for three, then four+, then again for other colors.
@@ -341,7 +348,7 @@ ability_colored_pips_totals_statistic :=
 	count := length(costs) - 1
 	result := for x from 0 to count do
 	(
-		"," + join(wubrgoc_break_statistic(costs[x]), sep:",")
+		"," + join(color_code_break_statistic(costs[x]), sep:",")
 	)
 	substring(result, begin: 1))
 }
@@ -392,7 +399,7 @@ devotion_filters_statistic := [
 	C: filter_text@(match:"C")
 ]
 color_pip_break_statistic := break_text@(match:"([A-Z0-9]/|[|])*[WUBRGO]")
-wubrgoc_break_statistic := break_text@(match:"[WUBRGOC]")
+color_code_break_statistic := break_text@(match:"[WUBRGOC]")
 symbol_aggregate_statistic :=
 {
 	devotion := devotion_filters_statistic[symbol](input)
@@ -467,7 +474,7 @@ face_mana_production_list_statistic :=
 	can_Chosen := lang_setting("chosen_mana_production")(combined_text) != ""
 
 	# the mana symbols we can produce
-	produced_symbols := wubrgoc_break_statistic(lang_setting("mana_symbol_production")(combined_text))
+	produced_symbols := color_code_break_statistic(lang_setting("mana_symbol_production")(combined_text))
 	
 	(if lang_setting("is_plains")(sub)		or contains_element(produced_symbols, element:"W")	then ",W" else "") +
 	(if lang_setting("is_island")(sub)		or contains_element(produced_symbols, element:"U")	then ",U" else "") +

data/magic.mse-game/symbols/menu_choice_images

@@ -22,7 +22,6 @@ choice images:
 	sparker (colored) black:		/magic.mse-game/symbols/sparker/black.png
 	sparker (colored) red:			/magic.mse-game/symbols/sparker/red.png
 	sparker (colored) green:		/magic.mse-game/symbols/sparker/green.png
-	sparker (colored) orange:		/magic.mse-game/symbols/sparker/orange.png
 	sparker (colored) multicolor:	/magic.mse-game/symbols/sparker/multicolor.png
 	sparker (colored) colorless:	/magic.mse-game/symbols/sparker/colorless.png
 	sparker (colored) artifact:		/magic.mse-game/symbols/sparker/artifact.png
@@ -33,7 +32,6 @@ choice images:
 	modal front black:				/magic.mse-game/symbols/modalfront/black.png
 	modal front red:				/magic.mse-game/symbols/modalfront/red.png
 	modal front green:				/magic.mse-game/symbols/modalfront/green.png
-	modal front orange:				/magic.mse-game/symbols/modalfront/orange.png
 	modal front multicolor:			/magic.mse-game/symbols/modalfront/multicolor.png
 	modal front colorless:			/magic.mse-game/symbols/modalfront/colorless.png
 	modal front artifact:			/magic.mse-game/symbols/modalfront/artifact.png
@@ -44,7 +42,6 @@ choice images:
 	modal back black:				/magic.mse-game/symbols/modalback/black.png
 	modal back red:					/magic.mse-game/symbols/modalback/red.png
 	modal back green:				/magic.mse-game/symbols/modalback/green.png
-	modal back orange:				/magic.mse-game/symbols/modalback/orange.png
 	modal back multicolor:			/magic.mse-game/symbols/modalback/multicolor.png
 	modal back colorless:			/magic.mse-game/symbols/modalback/colorless.png
 	modal back artifact:			/magic.mse-game/symbols/modalback/artifact.png

data/magic.mse-game/watermarks/menu_choice_images

@@ -6,7 +6,6 @@ choice images:
 	mana symbol black:                                  /magic.mse-game/watermarks/watermark_b.png
 	mana symbol red:                                    /magic.mse-game/watermarks/watermark_r.png
 	mana symbol green:                                  /magic.mse-game/watermarks/watermark_g.png
-	mana symbol orange:                                 /magic.mse-game/watermarks/watermark_o.png
 	mana symbol colorless:                              /magic.mse-game/watermarks/watermark_c.png
 	mana symbol snow:                                   /magic.mse-game/watermarks/watermark_s.png
 	
@@ -15,7 +14,6 @@ choice images:
 	mana symbol old black:                              /magic.mse-game/watermarks/watermark_b_old.png
 	mana symbol old red:                                /magic.mse-game/watermarks/watermark_r_old.png
 	mana symbol old green:                              /magic.mse-game/watermarks/watermark_g_old.png
-	mana symbol old orange:                             /magic.mse-game/watermarks/watermark_o_old.png
 	mana symbol old colorless:                          /magic.mse-game/watermarks/watermark_c_old.png
 	
 	mana symbol hi res white:                           /magic.mse-game/watermarks/watermark_w_big.png
@@ -23,7 +21,6 @@ choice images:
 	mana symbol hi res black:                           /magic.mse-game/watermarks/watermark_b_big.png
 	mana symbol hi res red:                             /magic.mse-game/watermarks/watermark_r_big.png
 	mana symbol hi res green:                           /magic.mse-game/watermarks/watermark_g_big.png
-	mana symbol hi res orange:                          /magic.mse-game/watermarks/watermark_o_big.png
 	mana symbol hi res colorless:                       /magic.mse-game/watermarks/watermark_c_big.png
 	
 	mana symbol double WU:                              /magic.mse-game/watermarks/mana_wu.png
@@ -42,14 +39,12 @@ choice images:
 	transparent mana symbol black:                      /magic.mse-game/watermarks/watermark_b.png
 	transparent mana symbol red:                        /magic.mse-game/watermarks/watermark_r.png
 	transparent mana symbol green:                      /magic.mse-game/watermarks/watermark_g.png
-	transparent mana symbol orange:                     /magic.mse-game/watermarks/watermark_o.png
 	
 	transparent mana symbol old white:                  /magic.mse-game/watermarks/watermark_w_old.png
 	transparent mana symbol old blue:                   /magic.mse-game/watermarks/watermark_u_old.png
 	transparent mana symbol old black:                  /magic.mse-game/watermarks/watermark_b_old.png
 	transparent mana symbol old red:                    /magic.mse-game/watermarks/watermark_r_old.png
 	transparent mana symbol old green:                  /magic.mse-game/watermarks/watermark_g_old.png
-	transparent mana symbol old orange:                 /magic.mse-game/watermarks/watermark_o_old.png
 	transparent mana symbol old colorless:              /magic.mse-game/watermarks/watermark_c_old.png
 	
 	transparent mana symbol hi res white:               /magic.mse-game/watermarks/watermark_w_big.png
@@ -57,7 +52,6 @@ choice images:
 	transparent mana symbol hi res black:               /magic.mse-game/watermarks/watermark_b_big.png
 	transparent mana symbol hi res red:                 /magic.mse-game/watermarks/watermark_r_big.png
 	transparent mana symbol hi res green:               /magic.mse-game/watermarks/watermark_g_big.png
-	transparent mana symbol hi res orange:              /magic.mse-game/watermarks/watermark_o_big.png
 	transparent mana symbol hi res colorless:           /magic.mse-game/watermarks/watermark_c_big.png
 	
 	transparent mana symbol double WU:                  /magic.mse-game/watermarks/mana_wu_old.png