diff --git a/forge-gui/res/cardsfolder/upcoming/davriel_soul_broker.txt b/forge-gui/res/cardsfolder/upcoming/davriel_soul_broker.txt
index a82fdd34ee6..86838b44ace 100644
--- a/forge-gui/res/cardsfolder/upcoming/davriel_soul_broker.txt
+++ b/forge-gui/res/cardsfolder/upcoming/davriel_soul_broker.txt
@@ -10,18 +10,18 @@ A:AB$ GenericChoice | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ChoiceP
 SVar:Draw3:DB$ Draw | NumCards$ 3 | SpellDescription$ Draw three cards.
 SVar:Conjure:DB$ MakeCard | Name$ Manor Guardian | Zone$ Hand | SpellDescription$ Conjure a Manor Guardian card into your hand.
 SVar:Return2:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | ChangeType$ Creature.YouOwn | ChangeNum$ 2 | RememberChanged$ True | Hidden$ True | Mandatory$ True | AtRandom$ True | SubAbility$ DBEffect | SpellDescription$ Return two random creature cards from your graveyard to your hand. They perpetually gain +1/+1.
-SVar:DBEffect:DB$ Effect | StaticAbilities$ PerpetualBuff | RememberObjects$ Remembered | Duration$ Permanent | SubAbility$ DBCleanup
+SVar:DBEffect:DB$ Effect | Name$ Davriel, Soul Broker's -2 Effect (Offer 4) | StaticAbilities$ PerpetualBuff | RememberObjects$ Remembered | Duration$ Permanent | SubAbility$ DBCleanup
 SVar:PerpetualBuff:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library | Description$ These cards perpetually gain +1/+1.
 SVar:ReturnBig:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.cmcEQV | ChangeNum$ 1 | Hidden$ True | Mandatory$ True | AtRandom$ True | SpellDescription$ Return a random creature card with the highest mana value from among cards in your graveyard to the battlefield.
 SVar:V:Count$HighestCMC_Creature.YouOwn+inZoneGraveyard
-SVar:EmblemBuff:DB$ Effect | Name$ Emblem - Davriel, Soul Broker | StaticAbilities$ YoursP2Pow | Duration$ Permanent | SpellDescription$ You get an emblem with "Creatures you control get +2/+0."
+SVar:EmblemBuff:DB$ Effect | Name$ Emblem - Davriel, Soul Broker (Offer 5) | StaticAbilities$ YoursP2Pow | Duration$ Permanent | SpellDescription$ You get an emblem with "Creatures you control get +2/+0."
 SVar:YoursP2Pow:Mode$ Continuous | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield | AddPower$ 2 | EffectZone$ Command | AffectedZone$ Battlefield | Description$ Creatures you control get +2/+0.
-SVar:EmblemReduceCost:DB$ Effect | Name$ Emblem - Davriel, Soul Broker | StaticAbilities$ CostBLess | Duration$ Permanent | SpellDescription$ You get an emblem with "Spells you cast cost {B} less to cast."
+SVar:EmblemReduceCost:DB$ Effect | Name$ Emblem - Davriel, Soul Broker (Offer 6) | StaticAbilities$ CostBLess | Duration$ Permanent | SpellDescription$ You get an emblem with "Spells you cast cost {B} less to cast."
 SVar:CostBLess:Mode$ ReduceCost | ValidCard$ Card | Activator$ You | Type$ Spell | Amount$ 1 | Color$ B | Description$ Spells you cast cost {B} less to cast.
-SVar:EmblemDavrielPW:DB$ Effect | Name$ Emblem - Davriel, Soul Broker | StaticAbilities$ AddP2Ab | Duration$ Permanent | SpellDescription$ You get an emblem with "Davriel planeswalkers you control have '[+2]: Draw a card.'"
+SVar:EmblemDavrielPW:DB$ Effect | Name$ Emblem - Davriel, Soul Broker (Offer 7) | StaticAbilities$ AddP2Ab | Duration$ Permanent | SpellDescription$ You get an emblem with "Davriel planeswalkers you control have '[+2]: Draw a card.'"
 SVar:AddP2Ab:Mode$ Continuous | Affected$ Planeswalker.Davriel+YouCtrl | AddAbility$ ABDraw | Description$ Davriel planeswalkers you control have "[+2]: Draw a card."
 SVar:ABDraw:AB$ Draw | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | NumCards$ 1 | SpellDescription$ Draw a card.
-SVar:EmblemDrawGain:DB$ Effect | Name$ Emblem - Davriel, Soul Broker | Triggers$ DrawGainTrig | Duration$ Permanent | SpellDescription$ You get an emblem with “Whenever you draw a card, you gain 2 life.”
+SVar:EmblemDrawGain:DB$ Effect | Name$ Emblem - Davriel, Soul Broker (Offer 8) | Triggers$ DrawGainTrig | Duration$ Permanent | SpellDescription$ You get an emblem with “Whenever you draw a card, you gain 2 life.”
 SVar:DrawGainTrig:Mode$ Drawn | ValidCard$ Card.YouOwn | TriggerZones$ Command | Execute$ TrigGainLife | TriggerDescription$ Whenever you draw a card, you gain 2 life.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2
 SVar:DBCondition:DB$ GenericChoice | ChoicePrompt$ Choose a condition | Choices$ Lose6,Exile2,Sac2,PerpetualBuffTheirs,EmblemDebuff,EmblemRaiseCost,EmblemDrawExile,EmblemUpkeepLose | StackDescription$ None
@@ -31,16 +31,16 @@ SVar:DBDraw:DB$ Draw | Defined$ Player.Opponent | ConditionCheckSVar$ X | Condit
 SVar:X:Remembered$Amount
 SVar:Y:Number$2/Minus.X
 SVar:Sac2:DB$ Sacrifice | Amount$ 2 | SacValid$ Permanent | Defined$ You | SpellDescription$ Sacrifice two permanents.
-SVar:PerpetualBuffTheirs:DB$ Effect | StaticAbilities$ PerpetualBuffCreatYouDontCtrl | Duration$ Permanent | SpellDescription$ Each creature you don't control perpetually gains +1/+1.
+SVar:PerpetualBuffTheirs:DB$ Effect | Name$ Davriel, Soul Broker's -2 Effect (Condition 4) | StaticAbilities$ PerpetualBuffCreatYouDontCtrl | Duration$ Permanent | SpellDescription$ Each creature you don't control perpetually gains +1/+1.
 SVar:PerpetualBuffCreatYouDontCtrl:Mode$ Continuous | Affected$ Card.Creature+YouDontCtrl | AddPower$ 1 | AddToughness$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library | Description$ Each creature you don't control perpetually gains +1/+1.
-SVar:EmblemDebuff:DB$ Effect | Name$ Emblem - Davriel, Soul Broker | StaticAbilities$ YoursM1Pow | Duration$ Permanent | SpellDescription$ You get an emblem with "Creatures you control get -1/-0."
+SVar:EmblemDebuff:DB$ Effect | Name$ Emblem - Davriel, Soul Broker (Condition 5) | StaticAbilities$ YoursM1Pow | Duration$ Permanent | SpellDescription$ You get an emblem with "Creatures you control get -1/-0."
 SVar:YoursM1Pow:Mode$ Continuous | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield | AddPower$ -1 | EffectZone$ Command | AffectedZone$ Battlefield | Description$ Creatures you control get -1/-0.
-SVar:EmblemRaiseCost:DB$ Effect | Name$ Emblem - Davriel, Soul Broker | StaticAbilities$ CostBMore | Duration$ Permanent | SpellDescription$ You get an emblem with "Spells you cast cost {B} more to cast."
+SVar:EmblemRaiseCost:DB$ Effect | Name$ Emblem - Davriel, Soul Broker (Condition 6) | StaticAbilities$ CostBMore | Duration$ Permanent | SpellDescription$ You get an emblem with "Spells you cast cost {B} more to cast."
 SVar:CostBMore:Mode$ RaiseCost | ValidCard$ Card | Activator$ You | Type$ Spell | Cost$ B | Description$ Spells you cast cost {B} more to cast.
-SVar:EmblemDrawExile:DB$ Effect | Name$ Emblem - Davriel, Soul Broker | Triggers$ DrawTrig | Duration$ Permanent | SpellDescription$ You get an emblem with "Whenever you draw a card, exile the top two cards of your library."
+SVar:EmblemDrawExile:DB$ Effect | Name$ Emblem - Davriel, Soul Broker (Condition 7) | Triggers$ DrawTrig | Duration$ Permanent | SpellDescription$ You get an emblem with "Whenever you draw a card, exile the top two cards of your library."
 SVar:DrawTrig:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Command | Execute$ TrigDig | TriggerDescription$ Whenever you draw a card, exile the top two cards of your library.
 SVar:TrigDig:DB$ Dig | Defined$ TriggeredPlayer | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile
-SVar:EmblemUpkeepLose:DB$ Effect | Name$ Emblem - Davriel, Soul Broker | Triggers$ UpkeepLoseTrig | Duration$ Permanent | SpellDescription$ You get an emblem with "At the beginning of your upkeep, you lose 1 life for each creature you control."
+SVar:EmblemUpkeepLose:DB$ Effect | Name$ Emblem - Davriel, Soul Broker (Condition 8) | Triggers$ UpkeepLoseTrig | Duration$ Permanent | SpellDescription$ You get an emblem with "At the beginning of your upkeep, you lose 1 life for each creature you control."
 SVar:UpkeepLoseTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigLose | TriggerZones$ Command | TriggerDescription$ At the beginning of your upkeep, you lose 1 life for each creature you control.
 SVar:TrigLose:DB$ LoseLife | Defined$ You | LifeAmount$ Z
 SVar:Z:Count$TypeYouCtrl.Creature