[required] card fields

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/game_script

@@ -7,11 +7,11 @@ card list color script:
 	else if input == "black"  then rgb(0,0,0)
 	else if input == "red"    then rgb(168,0,0)
 	else if input == "green"  then rgb(0,168,0)
-	else if input == "orange" then rgb(253,196,41)
 	else if input == "pink"   then rgb(210,60,140)
 	else if input == "purple" then rgb(150,100,160)
 	else if input == "yellow" then rgb(190,200,50)
 	else if input == "brown"  then rgb(51, 10, 0)
+	else if input == "orange" then rgb(255, 51, 0)
 	else (
 		artifact := chosen(choice:"artifact")
 		land     := chosen(choice:"land")

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,6 @@ languages := [
 		is_swamp          : match@(match: "(?i)Swamp")
 		is_mountain       : match@(match: "(?i)Mountain")
 		is_forest         : match@(match: "(?i)Forest")
-		is_desert         : match@(match: "(?i)Desert")
 		is_wastes         : match@(match: "(?i)Wastes")
 
 		is_class		  : match@(match: "(?i)Class")
@@ -859,10 +858,10 @@ languages := [
 		black             : "Black"
 		red               : "Red"
 		green             : "Green"
-		orange            : "Orange"
 		purple            : "Purple"
 		pink              : "Pink"
 		yellow            : "Yellow"
+		orange            : "Orange"
 		brown             : "Brown"
 		multicolor        : "Multicolor"
 		hybrid            : "Hybrid"

data/magic.mse-game/script

@@ -832,32 +832,30 @@ color_of_card := {
 	#type := card.super_type
 	artifact := chosen(card_color, choice:"artifact")
 	if	contains(card.shape, match: "split") and
-		card_color != card.card_color_2 then "K"                         #### Diff Color Splits
+		card_color != card.card_color_2 then "I"                         #### Diff Color Splits
 	else if chosen(choice: "land", card_color) then (                    #### Lands
-		if card.rarity != "basic land" then "M"                          #### Nonbasic Land
+		if card.rarity != "basic land" then "L"                          #### Nonbasic Land
 		else basic_land_sort()                                           #### Basic Land
 	) else if is_null_cost(casting_cost) then (                          #### Non-Land Cards with no or zero costs.
 		if chosen(choice: "colorless", card_color) then "A"              #### Clear Colorless
-		else if chosen(choice: "hybrid", card_color)    then "IL"        #### Hybrids
-		else if is_multicolor(card_color)          then "HL"             #### Multicolor
+		else if chosen(choice: "hybrid", card_color)    then "HK"        #### Hybrids
+		else if is_multicolor(card_color)          then "GK"             #### Multicolor
 		else if chosen(choice:"white", card_color) then "B"              #### White
 		else if chosen(choice:"blue", card_color)  then "C"              #### Blue
 		else if chosen(choice:"black", card_color) then "D"              #### Black
 		else if chosen(choice:"red", card_color)   then "E"              #### Red
 		else if chosen(choice:"green", card_color) then "F"              #### Green
-		else if chosen(choice:"orange", card_color) then "G"              #### Orange
-		else                                            "K"              #### Artifact
+		else                                            "J"              #### Artifact
 	) else (
 		                                                                 #### Cards with costs.
-		colors := sort_text(casting_cost, order: "<WUBRGO>")
-		if colors == "" and artifact then "K"    						#### Artifact
+		colors := sort_text(casting_cost, order: "<WUBRG>")
+		if colors == "" and artifact then "J"    						#### Artifact
 		else if colors == ""  then "A"                                   #### Clear Colorless
 		else if colors == "W" then "B"                                   #### White
 		else if colors == "U" then "C"                                   #### Blue
 		else if colors == "B" then "D"                                   #### Black
 		else if colors == "R" then "E"                                   #### Red
 		else if colors == "G" then "F"                                   #### Green
-		else if colors == "O" then "G"                                   #### Orange
 		else if is_hybrid_cost() then hybrid_color_pair_sort()           #### Hybrid (by pairs)
 		else if contains(casting_cost, match:"/") and artifact then "I"  #### Hybrid Artifacts
 		else                       multi_color_pair_sort()               #### Multicolor (by pairs)
@@ -876,7 +874,6 @@ basic_land_sort := {
 	else if contains(name, match:"Swamp")    then "MD"      #### Swamps
 	else if contains(name, match:"Mountain") then "ME"      #### Mountains
 	else if contains(name, match:"Forest")   then "MF"      #### Forests
-	else if contains(name, match:"Desert")   then "MG"      #### Desert
 	else                                               "MA"      #### other basic lands
 }
 hybrid_color_pair_sort := {
@@ -892,12 +889,7 @@ hybrid_color_pair_sort := {
 	else if colors == "BG" then "HH"
 	else if colors == "WR" then "HI"
 	else if colors == "UG" then "HJ"
-	else if colors == "WO" then "HK"
-	else if colors == "UO" then "HL"
-	else if colors == "BO" then "HM"
-	else if colors == "RO" then "HN"
-	else if colors == "GO" then "HO"
-	else "HP"
+	else "HK"
 }
 multi_color_pair_sort := {
 	colors := sort_text(casting_cost, order: "<WUBRGO>")
@@ -912,13 +904,8 @@ multi_color_pair_sort := {
 	else if colors == "BG" then "GH"
 	else if colors == "WR" then "GI"
 	else if colors == "UG" then "GJ"
-	else if colors == "WO" then "GK"
-	else if colors == "UO" then "GL"
-	else if colors == "BO" then "GM"
-	else if colors == "RO" then "GN"
-	else if colors == "GO" then "GO"
-	else if contains(card.casting_cost, match:"/") then "GQ"
-	else "GP"
+	else if contains(card.casting_cost, match:"/") then "GL"
+	else "GK"
 }
 
 #### Sort the card into its rarity tier
@@ -5805,10 +5792,10 @@ apply_index := {
 			           ,[lang_setting("black")]
 			           ,[lang_setting("red")]
 			           ,[lang_setting("green")]
-			           ,[lang_setting("orange")]
 			           ,[lang_setting("purple")]
 			           ,[lang_setting("pink")]
 			           ,[lang_setting("yellow")]
+			           ,[lang_setting("orange")]
 			           ,[lang_setting("brown")]
 			           ,[lang_setting("multicolor")]
 			           ,[lang_setting("hybrid")]
@@ -5938,10 +5925,10 @@ skeleton_runner := {
 #### outside to make singleton scripts easier
 blank_list_5 := ["","","","",""]
 blank_list_10 := ["","","","","","","","","",""]
-mana_list_ally := ["WU","UB","BR","RG","GW","GO","OW"]
-mana_list_enemy := ["WB","UR","BG","RW","GU","UO","BO","RO"]
-mana_list_shard := ["WUB","UBR","BRG","RGW","GWU"] # TODO: Add shard triplets for orange
-mana_list_wedge := ["WBG","URW","BGU","RWB","GUR"] # TODO: Add wedge triples for orange
+mana_list_ally := ["WU","UB","BR","RG","GW"]
+mana_list_enemy := ["WB","UR","BG","RW","GU"]
+mana_list_shard := ["WUB","UBR","BRG","RGW","GWU"]
+mana_list_wedge := ["WBG","URW","BGU","RWB","GUR"]
 skeleton_script := {
 	cards := [];
 	cards := cards + skeleton_runner(count:skeleton_commons);

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
@@ -1441,10 +1322,10 @@ statistics dimension:
 	group: Black
 	group: Red
 	group: Green
-	group: Orange
 	group: Purple
 	group: Pink
 	group: Yellow
+	group: Orange
 	group: Brown
 	group: Multicolor
 	group: Hybrid
@@ -1454,10 +1335,10 @@ statistics dimension:
 		Black		: rgb(33,33,33)
 		Red		: rgb(156,15,15)
 		Green		: rgb(68,144,15)
-		Orange		: rgb(253,196,41)
 		Purple		: rgb(150,100,160)
 		Pink		: rgb(255,175,200)
 		Yellow		: rgb(242,247,94)
+		Orange		: rgb(255,181,121)
 		Brown		: rgb(191,171,144)
 		Colorless	: rgb(101,104,94)
 		Artifact	: rgb(109,132,158)

data/magic.mse-game/statistics_script

@@ -263,7 +263,7 @@ face_omniverse_color_statistic :=
 {
 	if		chosen(choice: "land")											then	all_en_space_statistic(lang_setting("land"))
 	else if chosen(choice: "multicolor")									then	all_en_space_statistic(lang_setting("multicolor"))
-	else if count_chosen(choices: "white, blue, black, red, green, orange, pink, purple, yellow, brown") == 2
+	else if count_chosen(choices: "white, blue, black, red, green, pink, purple, yellow, orange, brown") == 2
 		and	chosen(choice: "artifact")										then	all_en_space_statistic(lang_setting("hybrid"))		##hybrid artifacts would show as their first color
 	else if chosen(choice: "hybrid")										then	all_en_space_statistic(lang_setting("hybrid"))
 	else if (chosen(choice: "artifact")
@@ -272,20 +272,20 @@ face_omniverse_color_statistic :=
 					or	chosen(choice: "black")
 					or	chosen(choice: "red")
 					or	chosen(choice: "green")
-					or	chosen(choice: "orange")
 					or	chosen(choice: "pink")
 					or	chosen(choice: "purple")
 					or	chosen(choice: "yellow")
+					or	chosen(choice: "orange")
 					or	chosen(choice: "brown")))							then	all_en_space_statistic(lang_setting("artifact"))
 	else if chosen(choice: "white")											then	all_en_space_statistic(lang_setting("white"))
 	else if chosen(choice: "blue")											then	all_en_space_statistic(lang_setting("blue"))
 	else if chosen(choice: "black")											then	all_en_space_statistic(lang_setting("black"))
 	else if chosen(choice: "red")											then	all_en_space_statistic(lang_setting("red"))
 	else if chosen(choice: "green")											then	all_en_space_statistic(lang_setting("green"))
-	else if chosen(choice: "orange")										then	all_en_space_statistic(lang_setting("orange"))
 	else if chosen(choice: "pink")											then	all_en_space_statistic(lang_setting("pink"))
 	else if chosen(choice: "purple")										then	all_en_space_statistic(lang_setting("purple"))
 	else if chosen(choice: "yellow")										then	all_en_space_statistic(lang_setting("yellow"))
+	else if chosen(choice: "orange")										then	all_en_space_statistic(lang_setting("orange"))
 	else if chosen(choice: "brown")											then	all_en_space_statistic(lang_setting("brown"))
 	else																			input
 }
@@ -481,7 +481,6 @@ face_mana_production_list_statistic :=
 	(if lang_setting("is_swamp")(sub)		or contains_element(produced_symbols, element:"B")	then ",B" else "") +
 	(if lang_setting("is_mountain")(sub)	or contains_element(produced_symbols, element:"R")	then ",R" else "") +
 	(if lang_setting("is_forest")(sub)		or contains_element(produced_symbols, element:"G")	then ",G" else "") +
-	(if lang_setting("is_desert")(sub)		or contains_element(produced_symbols, element:"O")	then ",O" else "") +
 	(if lang_setting("is_wastes")(name)		or contains_element(produced_symbols, element:"C")	then ",C" else "") +
 	(if can_Any																					then ","+all_en_space_statistic(lang_setting("mana_any")) else "") +
 	(if can_Chosen																				then ","+all_en_space_statistic(lang_setting("mana_chosen")) 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