diff --git a/forge-gui/res/cardsfolder/m/mahadi_emporium_master.txt b/forge-gui/res/cardsfolder/m/mahadi_emporium_master.txt
index e486e74a7c9..53d68317a75 100644
--- a/forge-gui/res/cardsfolder/m/mahadi_emporium_master.txt
+++ b/forge-gui/res/cardsfolder/m/mahadi_emporium_master.txt
@@ -1,6 +1,6 @@
 Name:Mahadi, Emporium Master
 ManaCost:1 B R
-Types:Legendary Creature Cat Devil
+Types:Legendary Creature Devil
 PT:3/3
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, create a Treasure token for each creature that died this turn.
 SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ c_a_treasure_sac | TokenOwner$ You
diff --git a/forge-gui/res/cardsfolder/r/rakshasa_deathdealer.txt b/forge-gui/res/cardsfolder/r/rakshasa_deathdealer.txt
index 47a3b1ed1da..a9453883d4c 100644
--- a/forge-gui/res/cardsfolder/r/rakshasa_deathdealer.txt
+++ b/forge-gui/res/cardsfolder/r/rakshasa_deathdealer.txt
@@ -1,6 +1,6 @@
 Name:Rakshasa Deathdealer
 ManaCost:B G
-Types:Creature Cat Demon
+Types:Creature Demon
 PT:2/2
 A:AB$ Pump | Cost$ B G | Defined$ Self | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn.
 A:AB$ Regenerate | Cost$ B G | SpellDescription$ Regenerate CARDNAME.
diff --git a/forge-gui/res/cardsfolder/r/rakshasa_debaser.txt b/forge-gui/res/cardsfolder/r/rakshasa_debaser.txt
index b29145b4a62..35ec2523427 100644
--- a/forge-gui/res/cardsfolder/r/rakshasa_debaser.txt
+++ b/forge-gui/res/cardsfolder/r/rakshasa_debaser.txt
@@ -1,6 +1,6 @@
 Name:Rakshasa Debaser
 ManaCost:4 B B
-Types:Creature Cat Demon
+Types:Creature Demon
 PT:6/6
 K:Encore:6 B B
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME attacks, put target creature card from defending player's graveyard onto the battlefield under your control.
diff --git a/forge-gui/res/cardsfolder/r/rakshasa_gravecaller.txt b/forge-gui/res/cardsfolder/r/rakshasa_gravecaller.txt
index ae28560b41d..b9bd9ba0726 100644
--- a/forge-gui/res/cardsfolder/r/rakshasa_gravecaller.txt
+++ b/forge-gui/res/cardsfolder/r/rakshasa_gravecaller.txt
@@ -1,6 +1,6 @@
 Name:Rakshasa Gravecaller
 ManaCost:4 B
-Types:Creature Cat Demon
+Types:Creature Demon
 PT:3/6
 K:Exploit
 T:Mode$ Exploited | ValidCard$ Creature | ValidSource$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME exploits a creature, create two 2/2 black Zombie creature tokens.
diff --git a/forge-gui/res/cardsfolder/r/rakshasa_vizier.txt b/forge-gui/res/cardsfolder/r/rakshasa_vizier.txt
index 3a20368f480..be1ac83fccb 100644
--- a/forge-gui/res/cardsfolder/r/rakshasa_vizier.txt
+++ b/forge-gui/res/cardsfolder/r/rakshasa_vizier.txt
@@ -1,6 +1,6 @@
 Name:Rakshasa Vizier
 ManaCost:2 B G U
-Types:Creature Cat Demon
+Types:Creature Demon
 PT:4/4
 T:Mode$ ChangesZoneAll | ValidCards$ Card.YouOwn | Origin$ Graveyard | Destination$ Exile | TriggerZones$ Battlefield | Execute$ TrigPutcounter | TriggerDescription$ Whenever one or more cards are put into exile from your graveyard, put that many +1/+1 counters on CARDNAME.
 SVar:TrigPutcounter:DB$ PutCounter | CounterType$ P1P1 | Defined$ Self | CounterNum$ X
diff --git a/forge-gui/res/cardsfolder/s/soulhunter_rakshasa.txt b/forge-gui/res/cardsfolder/s/soulhunter_rakshasa.txt
index df21eb3b0ae..261fc608a77 100644
--- a/forge-gui/res/cardsfolder/s/soulhunter_rakshasa.txt
+++ b/forge-gui/res/cardsfolder/s/soulhunter_rakshasa.txt
@@ -1,8 +1,8 @@
 Name:Soulhunter Rakshasa
 ManaCost:3 B B
-Types:Creature Cat Demon
+Types:Creature Demon
 PT:5/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDmg | TriggerDescription$ When CARDNAME enters the battlefield, it deals 5 damage to target opponent.
-SVar:TrigDmg:DB$ DealDamage | Cost$ 3 B B | NumDmg$ 5 | ValidTgts$ Opponent | TgtPrompt$ Choose target opponent. | SpellDescription$ CARDNAME deals 5 damage to target opponent.
 K:CARDNAME can't block.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.wasCastFromYourHandByYou+Self | Execute$ TrigDmg | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it from your hand, it deals 1 damage to target opponent for each Swamp you control.
+SVar:TrigDmg:DB$ DealDamage | ValidTgts$ Opponent | NumDmg$ Count$Valid Swamp.YouCtrl
 Oracle:Soulhunter Rakshasa can't block.\nWhen Soulhunter Rakshasa enters the battlefield, if you cast it from your hand, it deals 1 damage to target opponent for each Swamp you control.