diff --git a/.gitattributes b/.gitattributes
index 34b10eee061..64b50379283 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4022,6 +4022,7 @@ res/cardsfolder/j/jesters_cap.txt svneol=native#text/plain
 res/cardsfolder/j/jesters_mask.txt svneol=native#text/plain
 res/cardsfolder/j/jet_medallion.txt svneol=native#text/plain
 res/cardsfolder/j/jeweled_spirit.txt svneol=native#text/plain
+res/cardsfolder/j/jeweled_torque.txt -text
 res/cardsfolder/j/jhessian_balmgiver.txt -text
 res/cardsfolder/j/jhessian_infiltrator.txt svneol=native#text/plain
 res/cardsfolder/j/jhessian_lookout.txt svneol=native#text/plain
diff --git a/res/cardsfolder/c/chromatic_armor.txt b/res/cardsfolder/c/chromatic_armor.txt
index fb01be8535a..90fc77144af 100644
--- a/res/cardsfolder/c/chromatic_armor.txt
+++ b/res/cardsfolder/c/chromatic_armor.txt
@@ -1,16 +1,18 @@
-Name:Chromatic Armor
-ManaCost:1 W U
-Types:Enchantment Aura
-Text:no text
-K:Enchant creature
-A:SP$ Attach | Cost$ 1 W U | ValidTgts$ Creature | AILogic$ Pump
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseColor | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose a color.
-SVar:ChooseColor:DB$ ChooseColor | Defined$ You
-K:etbCounter:SLEIGHT:1
-S:Mode$ PreventDamage | Target$ Creature.EnchantedBy | Source$ Card.ChosenColor | Description$ Prevent all damage that would be dealt to enchanted creature by a source of the last chosen color.
-A:AB$ PutCounter | Cost$ X | Defined$ Self | CounterType$ SLEIGHT | CounterNum$ 1 | SubAbility$ ChooseColor | SpellDescription$ Put a sleight counter on CARDNAME and choose a color. X is the number of sleight counters on CARDNAME.
-SVar:X:Count$CardCounters.SLEIGHT
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/chromatic_armor.jpg
+Name:Chromatic Armor
+ManaCost:1 W U
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+A:SP$ Attach | Cost$ 1 W U | ValidTgts$ Creature | AILogic$ Pump
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseColor | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, choose a color.
+SVar:ChooseColor:DB$ ChooseColor | Defined$ You
+K:etbCounter:SLEIGHT:1
+S:Mode$ PreventDamage | Target$ Creature.EnchantedBy | Source$ Card.ChosenColor | Description$ Prevent all damage that would be dealt to enchanted creature by a source of the last chosen color.
+A:AB$ PutCounter | Cost$ X | Defined$ Self | CounterType$ SLEIGHT | CounterNum$ 1 | SubAbility$ ChooseColor | SpellDescription$ Put a sleight counter on CARDNAME and choose a color. X is the number of sleight counters on CARDNAME.
+SVar:X:Count$CardCounters.SLEIGHT
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/chromatic_armor.jpg
+SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/361.jpg
+Oracle:Enchant creature\nAs Chromatic Armor enters the battlefield, choose a color.\nChromatic Armor enters the battlefield with a sleight counter on it.\nPrevent all damage that would be dealt to enchanted creature by a source of the last chosen color.\n{X}: Put a sleight counter on Chromatic Armor and choose a color. X is the number of sleight counters on Chromatic Armor.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/c/creature_bond.txt b/res/cardsfolder/c/creature_bond.txt
index 5c4d6052164..ba164dbf6ae 100644
--- a/res/cardsfolder/c/creature_bond.txt
+++ b/res/cardsfolder/c/creature_bond.txt
@@ -9,4 +9,10 @@ SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredCardController | Nu
 SVar:Y:TriggeredCard$CardToughness
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/creature_bond.jpg
+SetInfo:LEA|Common|http://magiccards.info/scans/en/al/56.jpg
+SetInfo:LEB|Common|http://magiccards.info/scans/en/be/56.jpg
+SetInfo:3ED|Common|http://magiccards.info/scans/en/rv/55.jpg
+SetInfo:4ED|Common|http://magiccards.info/scans/en/4e/66.jpg
+SetInfo:2ED|Common|http://magiccards.info/scans/en/un/56.jpg
+Oracle:Enchant creature\nWhen enchanted creature dies, Creature Bond deals damage equal to that creature's toughness to the creature's controller.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/i/infinite_hourglass.txt b/res/cardsfolder/i/infinite_hourglass.txt
index a82bdfd336d..a2fbeb2a549 100644
--- a/res/cardsfolder/i/infinite_hourglass.txt
+++ b/res/cardsfolder/i/infinite_hourglass.txt
@@ -1,13 +1,16 @@
-Name:Infinite Hourglass
-ManaCost:4
-Types:Artifact
-Text:no text
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a time counter on CARDNAME.
-SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ TIME | CounterNum$ 1
-S:Mode$ Continuous | Affected$ Creature | AddPower$ +X | Description$ All creatures get +1/+0 for each time counter on CARDNAME.
-SVar:X:Count$CardCounters.TIME
-A:AB$ RemoveCounter | Cost$ 3 | CounterType$ TIME | CounterNum$ 1 | ActivationPhases$ Upkeep | AnyPlayer$ True | SpellDescription$ Remove a time counter from CARDNAME. Any player may activate this ability but only during any upkeep step.
-SVar:RemRandomDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/infinite_hourglass.jpg
+Name:Infinite Hourglass
+ManaCost:4
+Types:Artifact
+Text:no text
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a time counter on CARDNAME.
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ TIME | CounterNum$ 1
+S:Mode$ Continuous | Affected$ Creature | AddPower$ +X | Description$ All creatures get +1/+0 for each time counter on CARDNAME.
+SVar:X:Count$CardCounters.TIME
+A:AB$ RemoveCounter | Cost$ 3 | CounterType$ TIME | CounterNum$ 1 | ActivationPhases$ Upkeep | AnyPlayer$ True | SpellDescription$ Remove a time counter from CARDNAME. Any player may activate this ability but only during any upkeep step.
+SVar:RemRandomDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/infinite_hourglass.jpg
+SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/378.jpg
+SetInfo:ICE|Rare|http://magiccards.info/scans/en/ia/298.jpg
+Oracle:At the beginning of your upkeep, put a time counter on Infinite Hourglass.\nAll creatures get +1/+0 for each time counter on Infinite Hourglass.\n{3}: Remove a time counter from Infinite Hourglass. Any player may activate this ability but only during any upkeep step.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/j/jeweled_torque.txt b/res/cardsfolder/j/jeweled_torque.txt
new file mode 100644
index 00000000000..77d4fcf7eed
--- /dev/null
+++ b/res/cardsfolder/j/jeweled_torque.txt
@@ -0,0 +1,13 @@
+Name:Jeweled Torque
+ManaCost:2
+Types:Artifact
+Text:no text
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ ChooseColor | Static$ True| TriggerDescription$ As CARDNAME enters the battlefield, choose a color.
+SVar:ChooseColor:AB$ ChooseColor | Cost$ 0 | Defined$ You | AILogic$ MostProminentInGame
+T:Mode$ SpellCast | ValidCard$ Card.ChosenColor | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a player casts a spell of the chosen color, you may pay 2. If you do, you gain 2 life.
+SVar:TrigGainLife:AB$GainLife | Cost$ 2 | Defined$ You | LifeAmount$ 2
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/jeweled_torque.jpg
+SetInfo:MMQ|Uncommon|http://magiccards.info/scans/en/mm/301.jpg
+Oracle:As Jeweled Torque enters the battlefield, choose a color.\nWhenever a player casts a spell of the chosen color, you may pay {2}. If you do, you gain 2 life.
+End
\ No newline at end of file
diff --git a/res/cardsfolder/s/song_of_blood.txt b/res/cardsfolder/s/song_of_blood.txt
index 166153cc248..997a5f3c43b 100644
--- a/res/cardsfolder/s/song_of_blood.txt
+++ b/res/cardsfolder/s/song_of_blood.txt
@@ -1,13 +1,15 @@
-Name:Song of Blood
-ManaCost:1 R
-Types:Sorcery
-Text:no text
-A:SP$ Mill | Cost$ 1 R | NumCards$ 4 | Defined$ You | RememberMilled$ True | SubAbility$ DBEffect | SpellDescription$ Put the top four cards of your library into your graveyard. Whenever a creature attacks this turn, it gets +1/+0 until end of turn for each creature card put into your graveyard this way.
-SVar:DBEffect:DB$ Effect | Cost$ 0 | Name$ Song of Blood Effect | Triggers$ TrigAttacks | SVars$ Pump,X | RememberCard$ Remembered
-SVar:TrigAttacks:Mode$ Attacks | ValidCard$ Creature.YouCtrl | Execute$ Pump | TriggerDescription$ Whenever a creature attacks this turn, it gets +1/+0 until end of turn for each creature card put into your graveyard this way. 
-SVar:Pump:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ +X
-SVar:X:Remembered$Valid Creature
-SVar:RemRandomDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/song_of_blood.jpg
+Name:Song of Blood
+ManaCost:1 R
+Types:Sorcery
+Text:no text
+A:SP$ Mill | Cost$ 1 R | NumCards$ 4 | Defined$ You | RememberMilled$ True | SubAbility$ DBEffect | SpellDescription$ Put the top four cards of your library into your graveyard. Whenever a creature attacks this turn, it gets +1/+0 until end of turn for each creature card put into your graveyard this way.
+SVar:DBEffect:DB$ Effect | Cost$ 0 | Name$ Song of Blood Effect | Triggers$ TrigAttacks | SVars$ Pump,X | RememberCard$ Remembered
+SVar:TrigAttacks:Mode$ Attacks | ValidCard$ Creature.YouCtrl | Execute$ Pump | TriggerDescription$ Whenever a creature attacks this turn, it gets +1/+0 until end of turn for each creature card put into your graveyard this way.
+SVar:Pump:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ +X
+SVar:X:Remembered$Valid Creature
+SVar:RemRandomDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/song_of_blood.jpg
+SetInfo:VIS|Common|http://magiccards.info/scans/en/vi/94.jpg
+Oracle:Put the top four cards of your library into your graveyard.\nWhenever a creature attacks this turn, it gets +1/+0 until end of turn for each creature card put into your graveyard this way.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/w/whiteout.txt b/res/cardsfolder/w/whiteout.txt
index da9fea769eb..d23a3aa5274 100644
--- a/res/cardsfolder/w/whiteout.txt
+++ b/res/cardsfolder/w/whiteout.txt
@@ -1,10 +1,12 @@
-Name:Whiteout
-ManaCost:1 G
-Types:Instant
-Text:no text
-A:SP$ DebuffAll | Cost$ 1 G | ValidCards$ Creature | Keywords$ Flying | SpellDescription$ All creatures lose flying until end of turn.
-A:AB$ ChangeZone | Cost$ Sac<1/Land.Snow/snow land> | ActivationZone$ Graveyard | Defined$ Self | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return CARDNAME from your graveyard to your hand.
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/whiteout.jpg
+Name:Whiteout
+ManaCost:1 G
+Types:Instant
+Text:no text
+A:SP$ DebuffAll | Cost$ 1 G | ValidCards$ Creature | Keywords$ Flying | SpellDescription$ All creatures lose flying until end of turn.
+A:AB$ ChangeZone | Cost$ Sac<1/Land.Snow/snow land> | ActivationZone$ Graveyard | Defined$ Self | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return CARDNAME from your graveyard to your hand.
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/whiteout.jpg
+SetInfo:ICE|Uncommon|http://magiccards.info/scans/en/ia/163.jpg
+Oracle:All creatures lose flying until end of turn.\nSacrifice a snow land: Return Whiteout from your graveyard to your hand.
 End
\ No newline at end of file
diff --git a/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java b/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java
index cd490355bee..af79f060680 100644
--- a/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java
+++ b/src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java
@@ -585,6 +585,9 @@ public class AbilityFactory_Choose {
                             chosen = CardFactoryUtil.getMostProminentColor(
                                     AllZoneUtil.getCardsInGame().getController(AllZone.getHumanPlayer()));
                         }
+                        if (logic.equals("MostProminentInGame")) {
+                            chosen = CardFactoryUtil.getMostProminentColor(AllZoneUtil.getCardsInGame());
+                        }
                     }
                     if (chosen.equals("")) {
                         chosen = Constant.Color.Green;