diff --git a/objects/TokenSource.124381.json b/objects/TokenSource.124381.json
index 5a785ce5..0f953b34 100644
--- a/objects/TokenSource.124381.json
+++ b/objects/TokenSource.124381.json
@@ -14,11 +14,11 @@
     "r": 0.15842
   },
   "ContainedObjects_order": [
-    "Custom_Token.00d19a",
-    "Custom_Tile.a3fb6c",
+    "ClueDoom.a40a48",
+    "Damage.cd2a02",
     "Horror.36be72",
-    "Custom_Token.cd2a02",
-    "Custom_Tile.a40a48"
+    "ClueDoom.a3fb6c",
+    "Reesource.00d19a"
   ],
   "ContainedObjects_path": "TokenSource.124381",
   "Description": "",
diff --git a/objects/TokenSource.124381/Custom_Tile.a3fb6c.json b/objects/TokenSource.124381/ClueDoom.a3fb6c.json
similarity index 89%
rename from objects/TokenSource.124381/Custom_Tile.a3fb6c.json
rename to objects/TokenSource.124381/ClueDoom.a3fb6c.json
index f702a73a..48b61ac0 100644
--- a/objects/TokenSource.124381/Custom_Tile.a3fb6c.json
+++ b/objects/TokenSource.124381/ClueDoom.a3fb6c.json
@@ -37,15 +37,15 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Tile",
-  "Nickname": "",
+  "Nickname": "ClueDoom",
   "Snap": false,
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
-    "posX": -26.665,
-    "posY": 2.687,
-    "posZ": -7.238,
-    "rotX": 9,
+    "posX": 78.661,
+    "posY": 2.398,
+    "posZ": -1.064,
+    "rotX": 8,
     "rotY": 90,
     "rotZ": 178,
     "scaleX": 0.25,
diff --git a/objects/TokenSource.124381/Custom_Tile.a40a48.json b/objects/TokenSource.124381/ClueDoom.a40a48.json
similarity index 88%
rename from objects/TokenSource.124381/Custom_Tile.a40a48.json
rename to objects/TokenSource.124381/ClueDoom.a40a48.json
index c455e2a3..9720c15b 100644
--- a/objects/TokenSource.124381/Custom_Tile.a40a48.json
+++ b/objects/TokenSource.124381/ClueDoom.a40a48.json
@@ -37,17 +37,17 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Tile",
-  "Nickname": "",
+  "Nickname": "ClueDoom",
   "Snap": false,
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
-    "posX": -26.764,
-    "posY": 2.57,
-    "posZ": -7.529,
-    "rotX": 358,
+    "posX": 78.738,
+    "posY": 2.287,
+    "posZ": -1.272,
+    "rotX": 356,
     "rotY": 270,
-    "rotZ": 8,
+    "rotZ": 4,
     "scaleX": 0.25,
     "scaleY": 1,
     "scaleZ": 0.25
diff --git a/objects/TokenSource.124381/Custom_Token.cd2a02.json b/objects/TokenSource.124381/Damage.cd2a02.json
similarity index 99%
rename from objects/TokenSource.124381/Custom_Token.cd2a02.json
rename to objects/TokenSource.124381/Damage.cd2a02.json
index b062f0f3..972c01da 100644
--- a/objects/TokenSource.124381/Custom_Token.cd2a02.json
+++ b/objects/TokenSource.124381/Damage.cd2a02.json
@@ -37,7 +37,7 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Token",
-  "Nickname": "",
+  "Nickname": "Damage",
   "Snap": false,
   "States": {
     "10": {
@@ -2835,14 +2835,14 @@
     }
   },
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
-    "posX": -26.815,
-    "posY": 2.636,
-    "posZ": -7.441,
-    "rotX": 0,
+    "posX": 78.665,
+    "posY": 2.351,
+    "posZ": -1.205,
+    "rotX": 357,
     "rotY": 270,
-    "rotZ": 7,
+    "rotZ": 5,
     "scaleX": 0.24,
     "scaleY": 1,
     "scaleZ": 0.24
diff --git a/objects/TokenSource.124381/Horror.36be72.json b/objects/TokenSource.124381/Horror.36be72.json
index 0aef1c63..1f970ec8 100644
--- a/objects/TokenSource.124381/Horror.36be72.json
+++ b/objects/TokenSource.124381/Horror.36be72.json
@@ -498,14 +498,14 @@
     }
   },
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
-    "posX": -26.765,
-    "posY": 2.646,
-    "posZ": -7.393,
-    "rotX": 357,
+    "posX": 79.031,
+    "posY": 2.307,
+    "posZ": -1.38,
+    "rotX": 358,
     "rotY": 270,
-    "rotZ": 4,
+    "rotZ": 1,
     "scaleX": 0.25,
     "scaleY": 1,
     "scaleZ": 0.25
diff --git a/objects/TokenSource.124381/Custom_Token.00d19a.json b/objects/TokenSource.124381/Reesource.00d19a.json
similarity index 88%
rename from objects/TokenSource.124381/Custom_Token.00d19a.json
rename to objects/TokenSource.124381/Reesource.00d19a.json
index 45d940cb..74817ed2 100644
--- a/objects/TokenSource.124381/Custom_Token.00d19a.json
+++ b/objects/TokenSource.124381/Reesource.00d19a.json
@@ -37,17 +37,17 @@
   "LuaScriptState": "",
   "MeasureMovement": false,
   "Name": "Custom_Token",
-  "Nickname": "",
+  "Nickname": "Reesource",
   "Snap": false,
   "Sticky": true,
-  "Tooltip": true,
+  "Tooltip": false,
   "Transform": {
-    "posX": -26.965,
-    "posY": 2.608,
-    "posZ": -7.37,
-    "rotX": 5,
+    "posX": 78.848,
+    "posY": 2.273,
+    "posZ": -1.469,
+    "rotX": 0,
     "rotY": 270,
-    "rotZ": 6,
+    "rotZ": 0,
     "scaleX": 0.17,
     "scaleY": 0.17,
     "scaleZ": 0.17
diff --git a/src/core/token/TokenManager.ttslua b/src/core/token/TokenManager.ttslua
index fa76d6eb..e5c62cb4 100644
--- a/src/core/token/TokenManager.ttslua
+++ b/src/core/token/TokenManager.ttslua
@@ -107,16 +107,12 @@ do
     }
   }
 
+  -- Source for tokens
   local TOKEN_SOURCE_GUID = "124381"
-  local tokenTemplates
 
-  local SOURCE_BAG_GUIDS = {
-    damage = "480bda",
-    horror = "c3ecf4",
-    resource = "9fadf9",
-    doom = "47ffc3",
-    clue = "31fa39",
-  }
+  -- Table of data extracted from the token source bag, keyed by the GMNotes on each token which
+  -- should match the token type keys ("resource", "clue", etc)
+  local tokenTemplates
 
   local DATA_HELPER_GUID = "708279"