diff --git a/Utils/cardclass.tmpl b/Utils/cardclass.tmpl
index fb7812681d..852d9a4749 100644
--- a/Utils/cardclass.tmpl
+++ b/Utils/cardclass.tmpl
@@ -42,14 +42,13 @@ import mage.cards.CardImpl;
 public class [=$classname=] extends CardImpl<[=$classname=]> {
 
     public [=$classname=] (UUID ownerId) {
-        super(ownerId, [=$collector=], "[=$name=]", Rarity.[=$rarity=], new CardType[]{}, "[=$manacost=]");
+        super(ownerId, [=$collector=], "[=$name=]", Rarity.[=$rarity=], new CardType[]{[=$type=]}, "[=$manacost=]");
         this.expansionSetCode = "[=$setcode=]";
         this.subtype.add("");[= $colors=]        
         [=if (defined($power)) {
-         $OUT .= "this.power = new MageInt($power);"; 
-        }=]
-        [=if (defined($toughness)) {
-         $OUT .= "this.toughness = new MageInt($toughness);";
+         $OUT .= "this.power = new MageInt($power);\n"; 
+        }=][=if (defined($toughness)) {
+         $OUT .= "      this.toughness = new MageInt($toughness);";
         }=]
     }
 
diff --git a/Utils/gen-card.pl b/Utils/gen-card.pl
index fc87e0d1bb..5b732cbd57 100755
--- a/Utils/gen-card.pl
+++ b/Utils/gen-card.pl
@@ -217,6 +217,8 @@ $knownSets{'10E'} = 'tenth';
 $knownSets{'WWK'} = 'worldwake';
 $knownSets{'ZEN'} = 'zendikar';
 $knownSets{'SOM'} = 'scarsofmirrodin';
+$knownSets{'GPT'} = 'guildpact';
+$knownSets{'DIS'} = 'dissension';
 
 my %raritiesConversion;
 $raritiesConversion{'C'} = 'COMMON';
@@ -238,11 +240,11 @@ $mana{'Black or Red'} = 'B\\\\R';
 $mana{'Red or Green'} = 'R\\\\G';
 
 my %manatocolor;
-$manatocolor{'Black'} = "		creature.color.setBlack(true);";
-$manatocolor{'Blue'} = "		creature.color.setBlue(true);"; 
-$manatocolor{'Green'} = "		creature.color.setGreen(true);";
-$manatocolor{'Red'} = "		creature.color.setRed(true);";
-$manatocolor{'White'} = "		creature.color.setWhite(true);";
+$manatocolor{'Black'} = "		this.color.setBlack(true);";
+$manatocolor{'Blue'} = "		this.color.setBlue(true);";
+$manatocolor{'Green'} = "		this.color.setGreen(true);";
+$manatocolor{'Red'} = "		this.color.setRed(true);";
+$manatocolor{'White'} = "		this.color.setWhite(true);";
 
 my %normalid;