diff --git a/forge-gui/res/cardsfolder/a/an_offer_you_cant_refuse.txt b/forge-gui/res/cardsfolder/a/an_offer_you_cant_refuse.txt
index 032e945f1fc..45b4f3569e0 100644
--- a/forge-gui/res/cardsfolder/a/an_offer_you_cant_refuse.txt
+++ b/forge-gui/res/cardsfolder/a/an_offer_you_cant_refuse.txt
@@ -3,5 +3,5 @@ ManaCost:U
 Types:Instant
 A:SP$ Counter | Cost$ U | TargetType$ Spell | ValidTgts$ Card.nonCreature | TgtPrompt$ Select target noncreature spell | SubAbility$ DBToken | SpellDescription$ Counter target noncreature spell.
 SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ TargetedController | StackDescription$ SpellDescription | SpellDescription$ Its controller creates two Treasure tokens. (They're artifacts with "{T}, Sacrifice this artifact: Add one mana of any color.")
-DeckHas:Ability$Token|Sacrifice & Type$Treasure
+DeckHas:Ability$Token|Sacrifice & Type$Treasure|Artifact
 Oracle:Counter target noncreature spell. Its controller creates two Treasure tokens. (They're artifacts with "{T}, Sacrifice this artifact: Add one mana of any color.")
diff --git a/forge-gui/res/cardsfolder/a/atsushi_the_blazing_sky.txt b/forge-gui/res/cardsfolder/a/atsushi_the_blazing_sky.txt
index 57c08ad39c8..aa43c728bde 100644
--- a/forge-gui/res/cardsfolder/a/atsushi_the_blazing_sky.txt
+++ b/forge-gui/res/cardsfolder/a/atsushi_the_blazing_sky.txt
@@ -11,5 +11,5 @@ SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ ST
 SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ Until the end of your next turn, you may play the exiled cards.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:CreateTreasure:DB$ Token | TokenAmount$ 3 | TokenScript$ c_a_treasure_sac | SpellDescription$ Create three Treasure tokens.
-DeckHas:Ability$Token|Sacrifice & Type$Treasure
+DeckHas:Ability$Token|Sacrifice & Type$Treasure|Artifact
 Oracle:Flying, trample\nWhen Atsushi, the Blazing Sky dies, choose one —\n• Exile the top two cards of your library. Until the end of your next turn, you may play those cards.\n• Create three Treasure tokens.
diff --git a/forge-gui/res/cardsfolder/c/currency_converter.txt b/forge-gui/res/cardsfolder/c/currency_converter.txt
index e60fc22e5c5..805288f0c84 100644
--- a/forge-gui/res/cardsfolder/c/currency_converter.txt
+++ b/forge-gui/res/cardsfolder/c/currency_converter.txt
@@ -13,6 +13,6 @@ A:AB$ ChangeZone | Cost$ T | Mandatory$ True | Hidden$ True | Origin$ Exile | De
 SVar:DBTreasure:DB$ Token | TokenScript$ c_a_treasure_sac | ConditionDefined$ Imprinted | ConditionPresent$ Land | SubAbility$ DBRogue | SpellDescription$ If it's a land card, create a Treasure token.
 SVar:DBRogue:DB$ Token | TokenScript$ b_2_2_rogue | ConditionDefined$ Imprinted | ConditionPresent$ Card.nonLand | SubAbility$ DBUnimprint | SpellDescription$ If it's a nonland card, create a 2/2 black Rogue creature token.
 SVar:DBUnimprint:DB$ Cleanup | ClearImprinted$ True
-DeckHas:Ability$Discard|Token|Sacrifice & Type$Treasure|Rogue
+DeckHas:Ability$Discard|Token|Sacrifice & Type$Treasure|Artifact|Rogue
 DeckHints:Ability$Discard
 Oracle:Whenever you discard a card, you may exile that card from your graveyard.\n{2}, {T}: Draw a card, then discard a card.\n{T}: Put a card exiled with Currency Converter into your graveyard. If it's a land card, create a Treasure token. If it's a nonland card, create a 2/2 black Rogue creature token.
diff --git a/forge-gui/res/cardsfolder/g/gala_greeters.txt b/forge-gui/res/cardsfolder/g/gala_greeters.txt
index 498e7f5bbe8..3c9146dc2e4 100644
--- a/forge-gui/res/cardsfolder/g/gala_greeters.txt
+++ b/forge-gui/res/cardsfolder/g/gala_greeters.txt
@@ -8,5 +8,5 @@ SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNu
 SVar:DBToken:DB$ Token | TokenScript$ c_a_treasure_sac | TokenTapped$ True | SpellDescription$ Create a tapped Treasure token.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2 | SpellDescription$ You gain 2 life.
 SVar:BuffedBy:Creature
-DeckHas:Ability$Counters|Token|LifeGain|Sacrifice & Type$Treasure
+DeckHas:Ability$Counters|Token|LifeGain|Sacrifice & Type$Treasure|Artifact
 Oracle:Alliance — Whenever another creature enters the battlefield under your control, choose one that hasn't been chosen this turn —\n• Put a +1/+1 counter on Gala Greeters.\n• Create a tapped Treasure token.\n• You gain 2 life.
diff --git a/forge-gui/res/cardsfolder/p/professional_face_breaker.txt b/forge-gui/res/cardsfolder/p/professional_face_breaker.txt
index 120fe934c68..ccd773a82c1 100644
--- a/forge-gui/res/cardsfolder/p/professional_face_breaker.txt
+++ b/forge-gui/res/cardsfolder/p/professional_face_breaker.txt
@@ -9,5 +9,5 @@ A:AB$ Dig | Cost$ Sac<1/Treasure> | Defined$ You | DigNum$ 1 | ChangeNum$ All |
 SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | RememberObjects$ Remembered | ForgetOnMoved$ Exile | SubAbility$ DBCleanup
 SVar:STPlay:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Exile | Affected$ Card.IsRemembered | MayPlay$ True | Description$ You may play that card this turn.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Token|Sacrifice & Type$Treasure
+DeckHas:Ability$Token|Sacrifice & Type$Treasure|Artifact
 Oracle:Menace\nWhenever one or more creatures you control deal combat damage to a player, create a Treasure token.\nSacrifice a Treasure: Exile the top card of your library. You may play that card this turn.
diff --git a/forge-gui/res/cardsfolder/u/undercity_scrounger.txt b/forge-gui/res/cardsfolder/u/undercity_scrounger.txt
index 633a67a18d7..faa64df6639 100644
--- a/forge-gui/res/cardsfolder/u/undercity_scrounger.txt
+++ b/forge-gui/res/cardsfolder/u/undercity_scrounger.txt
@@ -4,5 +4,5 @@ Types:Artifact Creature Human Rogue
 PT:1/4
 A:AB$ Token | Cost$ T | TokenScript$ c_a_treasure_sac | CheckSVar$ X | SVarCompare$ GE1 | SpellDescription$ Create a Treasure token. Activate only if a creature died this turn. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
 SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature
-DeckHas:Ability$Token|Sacrifice & Type$Treasure
+DeckHas:Ability$Token|Sacrifice & Type$Treasure|Artifact
 Oracle:{T}: Create a Treasure token. Activate only if a creature died this turn. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
diff --git a/forge-gui/res/cardsfolder/upcoming/dungeoneers_pack.txt b/forge-gui/res/cardsfolder/upcoming/dungeoneers_pack.txt
index 506ab5a7578..3bf65f7a036 100644
--- a/forge-gui/res/cardsfolder/upcoming/dungeoneers_pack.txt
+++ b/forge-gui/res/cardsfolder/upcoming/dungeoneers_pack.txt
@@ -6,5 +6,5 @@ A:AB$ TakeInitiative | Cost$ 2 T Sac<1/CARDNAME> | SubAbility$ DBGainLife | Spel
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 3 | SubAbility$ DBDraw | SpellDescription$ gain 3 life,
 SVar:DBDraw:DB$ Draw | SubAbility$ DBTreasure | SpellDescription$ draw a card, and
 SVar:DBTreasure:DB$ Token | TokenScript$ c_a_treasure_sac | SpellDescription$ create a Treasure token. Activate only as a sorcery. (A Treasure token is an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
-DeckHas:Ability$Sacrifice|LifeGain|Token & Type$Treasure
+DeckHas:Ability$Sacrifice|LifeGain|Token & Type$Treasure|Artifact
 Oracle:Dungeoneer's Pack enters the battlefield tapped.\n{2}, {T}, Sacrifice Dungeoneer's Pack: You take the initiative, gain 3 life, draw a card, and create a Treasure token. Activate only as a sorcery. (A Treasure token is an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
diff --git a/forge-gui/res/cardsfolder/upcoming/scouting_hawk.txt b/forge-gui/res/cardsfolder/upcoming/scouting_hawk.txt
index 0496b1c4c49..f6c1e6afe78 100644
--- a/forge-gui/res/cardsfolder/upcoming/scouting_hawk.txt
+++ b/forge-gui/res/cardsfolder/upcoming/scouting_hawk.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Bird
 PT:1/1
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | CheckSVar$ Y | SVarCompare$ GTX | TriggerDescription$ When CARDNAME enters the battlefield, if an opponent controls more lands than you, search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | CheckSVar$ Y | SVarCompare$ GTX | TriggerDescription$ Keen Sight — When CARDNAME enters the battlefield, if an opponent controls more lands than you, search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle.
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Plains.Basic | ChangeNum$ 1
 SVar:X:Count$Valid Land.YouCtrl
 SVar:Y:PlayerCountOpponents$HighestValid Land.YouCtrl
diff --git a/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt b/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
index dbf2fa25702..11514de4922 100644
--- a/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
+++ b/forge-gui/res/cardsfolder/upcoming/swashbuckler_extraordinaire.txt
@@ -11,6 +11,6 @@ SVar:DBPump:DB$ Pump | ValidTgts$ Creature | KW$ Double Strike | TargetMin$ 0 |
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:DBSize:Count$RememberedSize
 SVar:X:Count$Valid Treasure.YouCtrl
-DeckHas:Ability$Token|Sacrifice & Type$Treasure
+DeckHas:Ability$Token|Sacrifice & Type$Treasure|Artifact
 AI:RemoveDeck:All
 Oracle:When Swashbuckler Extraordinaire enters the battlefield, create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")\nWhenever you attack, you may sacrifice one or more Treasures. When you do, up to that many target creatures gain double strike until end of turn.