diff --git a/res/cards.txt b/res/cards.txt
index acff5aeeb32..ce2661ef6d3 100644
--- a/res/cards.txt
+++ b/res/cards.txt
@@ -8667,7 +8667,7 @@ spDamageTgtCP:3
 Ghostfire
 2 R
 Instant
-no text
+Ghostfire is colorless.
 spDamageTgtCP:3
 Ghostfire is colorless.
 
diff --git a/res/main.properties b/res/main.properties
index c0cf560de78..fc88df26b0c 100644
--- a/res/main.properties
+++ b/res/main.properties
@@ -1,6 +1,6 @@
 program/mail=mtgerror@yahoo.com
 program/forum=http://www.slightlymagic.net/forum/viewforum.php?f=26
-program/version=Forge -- official beta: 09/12/14, SVN revision: 227
+program/version=Forge -- official beta: 09/12/14, SVN revision: 228
 
 tokens--file=AllTokens.txt
 
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 9251d8bfcf4..62da62076f6 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -6489,7 +6489,7 @@ public class CardFactory_Creatures {
 	                if (AllZone.GameAction.isCardInPlay(creature[0]))
 	                {
 	                  creature[0].removeExtrinsicKeyword("Flying");
-	                  creature[0].removeExtrinsicKeyword(tgtName + " is blue.");
+	                  creature[0].removeIntrinsicKeyword(tgtName + " is blue.");
 	                  creature[0].setManaCost(origManaCost);
 	                  for (int i=0; i<6; i++)
 	                  {
@@ -6510,7 +6510,7 @@ public class CardFactory_Creatures {
 	              }
 	            }
 	            creature[0].addExtrinsicKeyword("Flying");
-	            creature[0].addExtrinsicKeyword(tgtName + " is blue.");
+	            creature[0].addIntrinsicKeyword(tgtName + " is blue.");
 	            AllZone.EndOfTurn.addUntil(EOT);
 	          }//if (card is in play)
 	        }//resolve()
diff --git a/src/forge/GuiDisplayUtil.java b/src/forge/GuiDisplayUtil.java
index 30c1574afdf..e6e8c095c73 100644
--- a/src/forge/GuiDisplayUtil.java
+++ b/src/forge/GuiDisplayUtil.java
@@ -92,6 +92,7 @@ public class GuiDisplayUtil implements NewConstants {
     
     public static Border getBorder(Card card) {
         Color color;
+/*
         if(card.isArtifact()) color = Color.gray;
         else if(CardUtil.getColor(card).equals(Constant.Color.Black) || card.getName().equals("Swamp")
                 || card.getName().equals("Bog")) color = Color.black;
@@ -108,8 +109,26 @@ public class GuiDisplayUtil implements NewConstants {
         if(CardUtil.getColors(card).size() != 1) {
             color = Color.orange;
         }
+*/
+        if(CardUtil.getColors(card).size() > 1)
+            color = Color.orange;
+          else if((CardUtil.getColor(card).equals(Constant.Color.Black) && (!card.getKeyword().contains(card.getName() + " is colorless.")))
+              || (card.getIntrinsicKeyword().contains(card.getName() + " is black."))) color = Color.black;
+          else if((CardUtil.getColor(card).equals(Constant.Color.Green) && (!card.getKeyword().contains(card.getName() + " is colorless.")))
+          	|| (card.getIntrinsicKeyword().contains(card.getName() + " is green."))) color = new Color(0, 220, 39);
+          else if((CardUtil.getColor(card).equals(Constant.Color.White) && (!card.getKeyword().contains(card.getName() + " is colorless.")))
+          	|| (card.getIntrinsicKeyword().contains(card.getName() + " is white."))) color = Color.white;
+          else if((CardUtil.getColor(card).equals(Constant.Color.Red) && (!card.getKeyword().contains(card.getName() + " is colorless.")))
+          	|| (card.getIntrinsicKeyword().contains(card.getName() + " is red."))) color = Color.red;
+          else if((CardUtil.getColor(card).equals(Constant.Color.Blue) && (!card.getKeyword().contains(card.getName() + " is colorless.")))
+          	|| (card.getIntrinsicKeyword().contains(card.getName() + " is blue."))) color = Color.blue;
+          else if(CardUtil.getColor(card).equals(Constant.Color.Colorless) || (card.getKeyword().contains(card.getName() + " is colorless.")))
+              color = Color.gray;
+          else color = new Color(200, 0, 230);	// If your card has a violet border, something is wrong
         
-        if(!card.isArtifact()) {
+//      if(!card.isArtifact()) {
+        
+        if(!CardUtil.getColor(card).equals(Constant.Color.Colorless) || (!card.getKeyword().contains(card.getName() + " is colorless."))) {
             int r = color.getRed();
             int g = color.getGreen();
             int b = color.getBlue();