diff --git a/forge-gui/res/cardsfolder/upcoming/lictor.txt b/forge-gui/res/cardsfolder/upcoming/lictor.txt
index 79893cf6f95..6a67f8f1cd3 100644
--- a/forge-gui/res/cardsfolder/upcoming/lictor.txt
+++ b/forge-gui/res/cardsfolder/upcoming/lictor.txt
@@ -4,7 +4,7 @@ Types:Creature Tyranid
 PT:3/3
 K:Flash
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | CheckSVar$ X | SVarCompare$ GE1 | TriggerDescription$ Pheromone Trail — When CARDNAME enters the battlefield, if a creature entered the battlefield under an opponent's control this turn, create a 3/3 green Tyranid Warrior creature token with trample.
-SVar:TrigToken:DB$ Token | TokenScript$ g_3_3_tyranid_warrior
+SVar:TrigToken:DB$ Token | TokenScript$ g_3_3_tyranid_warrior_trample
 SVar:X:Count$ThisTurnEntered_Battlefield_Creature.OppCtrl
 DeckHas:Ability$Token & Type$Warrior
 Oracle:Flash\nPheromone Trail — When Lictor enters the battlefield, if a creature entered the battlefield under an opponent's control this turn, create a 3/3 green Tyranid Warrior creature token with trample.
diff --git a/forge-gui/res/cardsfolder/upcoming/tyranid_invasion.txt b/forge-gui/res/cardsfolder/upcoming/tyranid_invasion.txt
index 29d2ed3e418..9fa9e65e61b 100644
--- a/forge-gui/res/cardsfolder/upcoming/tyranid_invasion.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tyranid_invasion.txt
@@ -1,8 +1,8 @@
 Name:Tyranid Invasion
 ManaCost:3 G
 Types:Sorcery
-A:SP$ Token | TokenOwner$ You | TokenAmount$ X | TokenScript$ g_3_3_tyranid_warrior
+A:SP$ Token | TokenOwner$ You | TokenAmount$ X | TokenScript$ g_3_3_tyranid_warrior_trample
 SVar:X:PlayerCountOpponents$Amount
-DeckHas:Ability$Token
+DeckHas:Ability$Token & Type$Tyranid|Warrior
 AI:RemoveDeck:Random
 Oracle:Create a number of 3/3 green Tyranid Warrior creature tokens with trample equal to the number of opponents you have.
diff --git a/forge-gui/res/editions/Warhammer 40,000.txt b/forge-gui/res/editions/Warhammer 40,000.txt
index bedc5f106b0..b3974d9ea98 100644
--- a/forge-gui/res/editions/Warhammer 40,000.txt	
+++ b/forge-gui/res/editions/Warhammer 40,000.txt	
@@ -327,3 +327,22 @@ ScryfallCode=40K
 319 M Abaddon the Despoiler @Johan Grenier
 320 M Inquisitor Greyfax @Lie Setiawan
 321 M The Swarmlord @Antonio José Manzanedo
+
+[tokens]
+b_2_2_a_necron_warrior
+b_2_2_astartes_warrior_menace
+blue_horror
+c_1_1_a_insect_flying
+c_4_4_a_robot_noblock
+c_a_clue_draw
+cherubael
+g_1_1_tyranid
+g_3_3_tyranid_warrior_trample
+g_5_5_tyranid
+plaguebearer_of_nurgle
+r_3_3_spawn
+u_1_1_tyranid_gargoyle_flying
+w_1_1_soldier
+w_1_1_soldier
+w_1_1_soldier
+w_2_2_astartes_warrior_vigilance
diff --git a/forge-gui/res/tokenscripts/g_3_3_tyranid_warrior.txt b/forge-gui/res/tokenscripts/g_3_3_tyranid_warrior_trample.txt
similarity index 79%
rename from forge-gui/res/tokenscripts/g_3_3_tyranid_warrior.txt
rename to forge-gui/res/tokenscripts/g_3_3_tyranid_warrior_trample.txt
index 89f35d39679..9b40dd714ce 100644
--- a/forge-gui/res/tokenscripts/g_3_3_tyranid_warrior.txt
+++ b/forge-gui/res/tokenscripts/g_3_3_tyranid_warrior_trample.txt
@@ -3,4 +3,5 @@ ManaCost:no cost
 Types:Creature Tyranid Warrior
 Colors:green
 PT:3/3
-Oracle:
+K:Trample
+Oracle:Trample