Typeline adjustment in magic-new.

Fixed hybrid sorting.
Fixed part of hybrid futureshift p/t colors.

data/magic-future-textless.mse-style/style

@@ -318,14 +318,16 @@ card style:
 					   not contains(card.card_color, match:"multicolor") then rgb(0,0,0)
 					else if contains(card.card_color, match:"land") and
 					   contains(card.card_color, match:"multicolor") then rgb(0,0,0)
-					else if styling.grey_hybrid_name and contains(card.card_color, match:"hybrid") then rgb(0,0,0)
 					else if contains(card.card_color, match:"artifact") then (
 						if contains(card.card_color, match:"blue") or
 						   contains(card.card_color, match:"black") or
 						   contains(card.card_color, match:"red") or
 						   contains(card.card_color, match:"green") then rgb(255,255,255)
 						else rgb(0,0,0)
-					) else font_color(card.card_color)
+					) else if contains(card.card_color, match:"hybrid") and contains(card.card_color, match:"white") and
+					   not contains(card.card_color, match:"red") and not contains(card.card_color, match:"green") then rgb(255,255,255)
+					else if contains(card.card_color, match:"hybrid") and contains(card.card_color, match:"white") then rgb(0,0,0)
+					else font_color(card.card_color)
 			separator color: rgb(200,0,0)
 	############################# Card sorting / numbering
 	############################# Copyright stuff

data/magic-future.mse-style/style

@@ -420,14 +420,16 @@ card style:
 					   not contains(card.card_color, match:"multicolor") then rgb(0,0,0)
 					else if contains(card.card_color, match:"land") and
 					   contains(card.card_color, match:"multicolor") then rgb(0,0,0)
-					else if styling.grey_hybrid_name and contains(card.card_color, match:"hybrid") then rgb(0,0,0)
 					else if contains(card.card_color, match:"artifact") then (
 						if contains(card.card_color, match:"blue") or
 						   contains(card.card_color, match:"black") or
 						   contains(card.card_color, match:"red") or
 						   contains(card.card_color, match:"green") then rgb(255,255,255)
 						else rgb(0,0,0)
-					) else font_color(card.card_color)
+					) else if contains(card.card_color, match:"hybrid") and contains(card.card_color, match:"white") and
+					   not contains(card.card_color, match:"red") and not contains(card.card_color, match:"green") then rgb(255,255,255)
+					else if contains(card.card_color, match:"hybrid") and contains(card.card_color, match:"white") then rgb(0,0,0)
+					else font_color(card.card_color)
 			separator color: rgb(200,0,0)
 	############################# Card sorting / numbering
 	############################# Copyright stuff

data/magic-new.mse-style/style

@@ -224,7 +224,7 @@ card style:
 
 	type:
 		left: 35
-		top : 298
+		top : 299
 		width: { 308 - max(22,card_style.rarity.content_width) }
 		height: 20
 		alignment: top shrink-overflow

data/magic.mse-game/game

@@ -214,6 +214,7 @@ init script:
 			else if colors == "B" then "C"                       # Black
 			else if colors == "R" then "D"                       # Red
 			else if colors == "G" then "E"                       # Green
+			else if contains(casting_cost, match:"/") then "G"  #Hybrid
 			else                       "F"                       # Multicolor
 		)
 	}