diff --git a/forge-gui/res/cardsfolder/upcoming/frostpyre_arcanist.txt b/forge-gui/res/cardsfolder/upcoming/frostpyre_arcanist.txt
new file mode 100644
index 00000000000..f5493c2afee
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/frostpyre_arcanist.txt
@@ -0,0 +1,10 @@
+Name:Frostpyre Arcanist
+ManaCost:4 U
+Types:Creature Giant Wizard
+PT:2/5
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | IsPresent$ Giant.YouCtrl, Wizard.YouCtrl | Description$ This spell costs {1} less to cast if you control a Giant or a Wizard.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, search your library for an instant or sorcery card with the same name as a card in your graveyard, reveal it, put it into your hand, then shuffle your library.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Instant.sharesNameWith YourGraveyard,Sorcery.sharesNameWith YourGraveyard | ChangeNum$ 1
+DeckHints:Type$Giant|Wizard
+DeckNeeds:Type$Instant|Sorcery
+Oracle:This spell costs {1} less to cast if you control a Giant or a Wizard.\nWhen Frostpyre Arcanist enters the battlefield, search your library for an instant or sorcery card with the same name as a card in your graveyard, reveal it, put it into your hand, then shuffle your library.
diff --git a/forge-gui/res/cardsfolder/upcoming/glimpse_the_cosmos.txt b/forge-gui/res/cardsfolder/upcoming/glimpse_the_cosmos.txt
new file mode 100644
index 00000000000..9dbbb6e9a92
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/glimpse_the_cosmos.txt
@@ -0,0 +1,10 @@
+Name:Glimpse the Cosmos
+ManaCost:1 U
+Types:Sorcery
+A:SP$ Dig | Cost$ 1 U | DigNum$ 3 | ChangeNum$ 1 | StackDescription$ SpellDescription | SpellDescription$ Look at the top three cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.
+S:Mode$ Continuous | Affected$ Card.Self | EffectZone$ Graveyard | MayPlay$ True | MayPlayAltManaCost$ U | IsPresent$ Giant.YouCtrl | Description$ As long as you control a Giant, you may cast CARDNAME from your graveyard by paying {U} rather than paying its mana cost. If you cast CARDNAME in this way and it would be put into your graveyard, exile it instead.
+R:Event$ Moved | ValidLKI$ Card.CastSa Spell.MayPlaySource | Origin$ Stack | Destination$ Graveyard | ReplaceWith$ MoveExile
+SVar:MoveExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Stack | Destination$ Exile
+DeckHints:Type$Giant
+DeckHas:Ability$Graveyard
+Oracle:Look at the top three cards of your library. Put one of them into your hand and the rest on the bottom of your library in any order.\nAs long as you control a Giant, you may cast Glimpse the Cosmos from your graveyard by paying {U} rather than paying its mana cost. If you cast Glimpse the Cosmos in this way and it would be put into your graveyard, exile it instead.
diff --git a/forge-gui/res/cardsfolder/upcoming/niko_aris.txt b/forge-gui/res/cardsfolder/upcoming/niko_aris.txt
index e2f1c3d11f2..7bcac88fedd 100644
--- a/forge-gui/res/cardsfolder/upcoming/niko_aris.txt
+++ b/forge-gui/res/cardsfolder/upcoming/niko_aris.txt
@@ -2,14 +2,14 @@ Name:Niko Aris
 ManaCost:X W W U
 Types:Legendary Planeswalker Niko
 Loyalty:3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When Niko Aris enters the battlefield, create X Shard tokens. (They’re enchantments with “{2}, Sacrifice this enchantment: Scry 1, then draw a card.”)
-SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ shard | TokenOwner$ You |
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create X Shard tokens. (They're enchantments with "{2}, Sacrifice this enchantment: Scry 1, then draw a card.")
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ shard | TokenOwner$ You
 SVar:X:Count$xPaid
-A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Triggers$ Trig | sVars$ Eff | KW$ HIDDEN Unblockable | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Up to one target creature you control can’t be blocked this turn. Whenever that creature deals damage this turn, return it to its owner’s hand.
+A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Triggers$ Trig | sVars$ Eff | KW$ HIDDEN Unblockable | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Up to one target creature you control can't be blocked this turn. Whenever that creature deals damage this turn, return it to its owner's hand.
 SVar:Trig:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Card.Self | Execute$ Eff | TriggerDescription$ Whenever this creature deals damage to an opponent, return it to its owner's hand.
 SVar:Eff:DB$ ChangeZone | ValidTgts$ Creature | TargetsWithDefinedController$ TriggeredTarget | TgtPrompt$ Select target creature that player controls. | Origin$ Battlefield | Destination$ Hand
-A:AB $ DealDamage | Cost$ SubCounter<1/LOYALTY> | ValidTgts$ Creature.tapped | NumDmg$ Y | References$ Y | TgtPrompt$ Select target tapped creature | SpellDescription$ Niko Aris deals 2 damage to target tapped creature for each card you’ve drawn this turn.
+A:AB$ DealDamage | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.tapped | NumDmg$ Y | References$ Y | TgtPrompt$ Select target tapped creature | SpellDescription$ CARDNAME deals 2 damage to target tapped creature for each card you've drawn this turn.
 SVar:Y:Count$YouDrewThisTurn/Twice
-A:AB$ Token | Cost$ SubCounter<1/LOYALTY> | TokenAmount$ 1 | TokenScript$ shard | TokenOwner$ You | Planeswalker$ True | SpellDescription$ Create a Shard token.
-DeckHas:Ability$Token
-Oracle:When Niko Aris enters the battlefield, create X Shard tokens. (They’re enchantments with “{2}, Sacrifice this enchantment: Scry 1, then draw a card.”)\n[+1]: Up to one target creature you control can’t be blocked this turn. Whenever that creature deals damage this turn, return it to its owner’s hand.\n[−1]: Niko Aris deals 2 damage to target tapped creature for each card you’ve drawn this turn.\n[−1]: Create a Shard token.
\ No newline at end of file
+A:AB$ Token | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenScript$ shard | TokenOwner$ You | SpellDescription$ Create a Shard token.
+DeckHas:Ability$Token & Ability$Sacrifice
+Oracle:When Niko Aris enters the battlefield, create X Shard tokens. (They're enchantments with "{2}, Sacrifice this enchantment: Scry 1, then draw a card.")\n[+1]: Up to one target creature you control can't be blocked this turn. Whenever that creature deals damage this turn, return it to its owner's hand.\n[−1]: Niko Aris deals 2 damage to target tapped creature for each card you've drawn this turn.\n[−1]: Create a Shard token.
diff --git a/forge-gui/res/cardsfolder/upcoming/svella_ice_shaper.txt b/forge-gui/res/cardsfolder/upcoming/svella_ice_shaper.txt
new file mode 100644
index 00000000000..572d37a13d3
--- /dev/null
+++ b/forge-gui/res/cardsfolder/upcoming/svella_ice_shaper.txt
@@ -0,0 +1,10 @@
+Name:Svella, Ice Shaper
+ManaCost:1 R G
+Types:Legendary Snow Creature Troll Warrior
+PT:2/4
+A:AB$ Token | Cost$ 3 T | TokenAmount$ 1 | TokenScript$ icy_manalith | TokenOwner$ You | SpellDescription$ Create a colorless snow artifact token named Icy Manalith with "{T}: Add one mana of any color."
+A:AB$ PeekAndReveal | Cost$ 6 R G T | Defined$ You | PeekAmount$ 4 | NoReveal$ True | RememberPeeked$ True | SubAbility$ DBPlay | SpellDescription$ Look at the top four cards of your library. You may cast a spell from among them without paying its mana cost. Put the rest on the bottom of your library in a random order.
+SVar:DBPlay:DB$ Play | ValidZone$ Library | Valid$ Card.IsRemembered+nonLand | Controller$ You | WithoutManaCost$ True | Optional$ True | Amount$ 1 | ForgetTargetRemembered$ True | SubAbility$ DBRestRandomOrder | StackDescription$ None
+SVar:DBRestRandomOrder:DB$ ChangeZone | Defined$ Remembered | AtRandom$ True | Origin$ Library | Destination$ Library | LibraryPosition$ -1 | Shuffle$ False | SubAbility$ DBCleanup | StackDescription$ None
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:{3}, {T}: Create a colorless snow artifact token named Icy Manalith with "{T}: Add one mana of any color."\n{6}{R}{G}, {T}: Look at the top four cards of your library. You may cast a spell from among them without paying its mana cost. Put the rest on the bottom of your library in a random order.
diff --git a/forge-gui/res/editions/Kaldheim.txt b/forge-gui/res/editions/Kaldheim.txt
index 7de621ccfe9..7a87f7c8b19 100644
--- a/forge-gui/res/editions/Kaldheim.txt
+++ b/forge-gui/res/editions/Kaldheim.txt
@@ -449,13 +449,12 @@ Prerelease=6 Boosters, 1 RareMythic+
 2 Tergrid, God of Fright|KHM
 
 [tokens]
-ce_shard
 w_4_4_angel_warrior_flying_vigilance
 w_1_1_human_warrior
 w_1_1_spirit_flying
 u_1_1_bird_flying
 u_4_4_giant_wizard
-u_3_3_serpent_komas_coil
+komas_coil
 u_2_2_shapeshifter_changeling
 b_2_2_zombie_berserker
 r_2_3_demon_berserker_menace
@@ -465,6 +464,7 @@ g_2_2_bear
 g_2_2_cat
 g_1_1_elf_warrior
 g_4_4_troll_warrior_trample
-csa_icy_manalith
-csa_replicated_ring
-ca_treasure_sac
+c_a_treasure_sac
+icy_manalith
+replicated_ring
+shard
diff --git a/forge-gui/res/tokenscripts/icy_manalith.txt b/forge-gui/res/tokenscripts/icy_manalith.txt
new file mode 100644
index 00000000000..ba8c74c14ae
--- /dev/null
+++ b/forge-gui/res/tokenscripts/icy_manalith.txt
@@ -0,0 +1,6 @@
+Name:Icy Manalith
+ManaCost:no cost
+Types:Snow Artifact
+Colors:colorless
+A:AB$ Mana | Cost$ T | Produced$ Any | SpellDescription$ Add one mana of any color.
+Oracle:{T}: Add one mana of any color.
diff --git a/forge-gui/res/tokenscripts/shard.txt b/forge-gui/res/tokenscripts/shard.txt
index 3f24235f98b..be1c1e47990 100644
--- a/forge-gui/res/tokenscripts/shard.txt
+++ b/forge-gui/res/tokenscripts/shard.txt
@@ -1,6 +1,6 @@
 Name:Shard
 ManaCost:no cost
 Types:Enchantment
-A:AB$ Scry | Cost$ Sac<2/CARDNAME> | ScryNum$ 1 | SubAbility$ DBDraw | SpellDescription$ {2}, Sacrifice this enchantment: Scry 1, then draw a card.
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
-Oracle:{2}, Sacrifice this enchantment: Scry 1, then draw a card.
\ No newline at end of file
+A:AB$ Scry | Cost$ Sac<2/CARDNAME> | CostDesc$ {2}, Sacrifice this enchantment: | ScryNum$ 1 | SubAbility$ DBDraw | StackDescription$ SpellDescription | SpellDescription$ Scry 1, then draw a card.
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | StackDescription$ None
+Oracle:{2}, Sacrifice this enchantment: Scry 1, then draw a card.