diff --git a/archetype_setcode_constants.lua b/archetype_setcode_constants.lua
index 5611c509fe..0e64340528 100644
--- a/archetype_setcode_constants.lua
+++ b/archetype_setcode_constants.lua
@@ -608,13 +608,13 @@ SET_CLOWN_CREW                    = 0x1d3
 SET_BLITZCLIQUE                   = 0x1d6
 SET_THEOREALIZE                   = 0x1d7
 SET_ALEISTER                      = 0x1d8
+SET_ANGELECHY                     = 0x1dc
 --Released but the official English name is unconfirmed
 SET_DARK_TUNER                    = 0x1d5
 --Pre-release archetypes
 SET_WHITE_KNIGHT_NIGHT            = 0x1d9
 SET_DAEDALUS                      = 0x1da
 SET_ASUTRA                        = 0x1db
-SET_ANGELECHY                     = 0x1dc
 SET_ARS_MAGNA                     = 0x1dd
 SET_DIACTORUS                     = 0x1de
 SET_MEDIUS                        = 0x1df
diff --git a/pre-release/c101305089.lua b/official/c15415552.lua
similarity index 100%
rename from pre-release/c101305089.lua
rename to official/c15415552.lua
diff --git a/pre-release/c101305086.lua b/official/c16237004.lua
similarity index 100%
rename from pre-release/c101305086.lua
rename to official/c16237004.lua
diff --git a/pre-release/c101305083.lua b/official/c17350692.lua
similarity index 100%
rename from pre-release/c101305083.lua
rename to official/c17350692.lua
diff --git a/pre-release/c101305094.lua b/official/c17782288.lua
similarity index 100%
rename from pre-release/c101305094.lua
rename to official/c17782288.lua
diff --git a/pre-release/c101305091.lua b/official/c28904860.lua
similarity index 95%
rename from pre-release/c101305091.lua
rename to official/c28904860.lua
index 7256bf4fef..80e633c311 100644
--- a/pre-release/c101305091.lua
+++ b/official/c28904860.lua
@@ -2,6 +2,7 @@
 --Angelechy Bastion
 --Scripted by Hatter
 local s,id=GetID()
+local CARD_ANGELECHY_SHATRANGA=42410161
 function s.initial_effect(c)
 	c:EnableReviveLimit()
 	--Synchro Summon procedure: 1 Tuner + 1+ non-Tuners
@@ -39,7 +40,7 @@ function s.initial_effect(c)
 	e3:SetValue(aux.indoval)
 	c:RegisterEffect(e3)
 end
-s.listed_names={101305090} --"Angelechy Shatranga"
+s.listed_names={CARD_ANGELECHY_SHATRANGA}
 s.listed_series={SET_ANGELECHY}
 function s.bantg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
@@ -62,7 +63,7 @@ function s.plcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsContains(c) and not c:IsPreviousLocation(LOCATION_SZONE)
 end
 function s.plfilter(c)
-	return c:IsCode(101305090) and not c:IsForbidden()
+	return c:IsCode(CARD_ANGELECHY_SHATRANGA) and not c:IsForbidden()
 end
 function s.pltg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsContinuousSpell()
diff --git a/pre-release/c101305090.lua b/official/c42410161.lua
similarity index 100%
rename from pre-release/c101305090.lua
rename to official/c42410161.lua
diff --git a/pre-release/c101305087.lua b/official/c43632709.lua
similarity index 100%
rename from pre-release/c101305087.lua
rename to official/c43632709.lua
diff --git a/pre-release/c101305084.lua b/official/c53754391.lua
similarity index 100%
rename from pre-release/c101305084.lua
rename to official/c53754391.lua
diff --git a/pre-release/c101305095.lua b/official/c54171327.lua
similarity index 100%
rename from pre-release/c101305095.lua
rename to official/c54171327.lua
diff --git a/pre-release/c101305081.lua b/official/c54577949.lua
similarity index 99%
rename from pre-release/c101305081.lua
rename to official/c54577949.lua
index dee1a2a065..780b1a049c 100644
--- a/pre-release/c101305081.lua
+++ b/official/c54577949.lua
@@ -2,7 +2,7 @@
 --Witness of the Ancient
 --Scripted by The Razgriz
 local s,id=GetID()
-local TOKEN_ARC=id+100
+local TOKEN_ARC=id+1
 function s.initial_effect(c)
 	--If you have a Synchro Monster in your field or GY: You can Special Summon this card from your hand
 	local e1=Effect.CreateEffect(c)
diff --git a/pre-release/c101305092.lua b/official/c55393975.lua
similarity index 100%
rename from pre-release/c101305092.lua
rename to official/c55393975.lua
diff --git a/pre-release/c101305096.lua b/official/c80565021.lua
similarity index 100%
rename from pre-release/c101305096.lua
rename to official/c80565021.lua
diff --git a/pre-release/c101305085.lua b/official/c80843006.lua
similarity index 100%
rename from pre-release/c101305085.lua
rename to official/c80843006.lua
diff --git a/pre-release/c101305093.lua b/official/c81797573.lua
similarity index 100%
rename from pre-release/c101305093.lua
rename to official/c81797573.lua
diff --git a/pre-release/c101305082.lua b/official/c81965543.lua
similarity index 100%
rename from pre-release/c101305082.lua
rename to official/c81965543.lua
diff --git a/pre-release/c101305088.lua b/official/c89027418.lua
similarity index 99%
rename from pre-release/c101305088.lua
rename to official/c89027418.lua
index fcc6f75d21..79808bf079 100644
--- a/pre-release/c101305088.lua
+++ b/official/c89027418.lua
@@ -2,7 +2,7 @@
 --Imposter Shift
 --scripted by pyrQ
 local s,id=GetID()
-local TOKEN_IMPOSTER=id+100
+local TOKEN_IMPOSTER=id+1
 function s.initial_effect(c)
 	--Activate
 	local e0=Effect.CreateEffect(c)