diff --git a/objects/Resourcetokens.0168ae/Resource.4cd3f6.json b/objects/Resourcetokens.0168ae/Resource.4cd3f6.json
index a5c29f91..0af4b62e 100644
--- a/objects/Resourcetokens.0168ae/Resource.4cd3f6.json
+++ b/objects/Resourcetokens.0168ae/Resource.4cd3f6.json
@@ -25,7 +25,7 @@
   "Description": "",
   "DragSelectable": true,
   "GMNotes": "",
-  "GUID": "4cd3f6",
+  "GUID": "910e09",
   "Grid": true,
   "GridProjection": false,
   "Hands": false,
@@ -100,6 +100,64 @@
       "XmlUI": ""
     },
     "3": {
+      "AltLookAngle": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "Autoraise": true,
+      "ColorDiffuse": {
+        "b": 1,
+        "g": 1,
+        "r": 1
+      },
+      "CustomImage": {
+        "CustomToken": {
+          "MergeDistancePixels": 10,
+          "Stackable": true,
+          "StandUp": false,
+          "Thickness": 0.3
+        },
+        "ImageScalar": 1,
+        "ImageSecondaryURL": "",
+        "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808233/22B6C4A9FEE0814E6A9BDB2C833C79D66F8100B8/",
+        "WidthScale": 0
+      },
+      "Description": "",
+      "DragSelectable": true,
+      "GMNotes": "",
+      "GUID": "a5ce94",
+      "Grid": true,
+      "GridProjection": false,
+      "Hands": false,
+      "HideWhenFaceDown": false,
+      "IgnoreFoW": false,
+      "LayoutGroupSortIndex": 0,
+      "Locked": false,
+      "LuaScript": "",
+      "LuaScriptState": "",
+      "MeasureMovement": false,
+      "Memo": "bounty",
+      "Name": "Custom_Token",
+      "Nickname": "Bounty",
+      "Snap": false,
+      "Sticky": true,
+      "Tooltip": true,
+      "Transform": {
+        "posX": 44,
+        "posY": 1.5,
+        "posZ": 8,
+        "rotX": 0,
+        "rotY": 270,
+        "rotZ": 0,
+        "scaleX": 0.17,
+        "scaleY": 0.17,
+        "scaleZ": 0.17
+      },
+      "Value": 0,
+      "XmlUI": ""
+    },
+    "4": {
       "AltLookAngle": {
         "x": 0,
         "y": 0,
@@ -157,7 +215,65 @@
       "Value": 0,
       "XmlUI": ""
     },
-    "4": {
+    "5": {
+      "AltLookAngle": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "Autoraise": true,
+      "ColorDiffuse": {
+        "b": 1,
+        "g": 1,
+        "r": 1
+      },
+      "CustomImage": {
+        "CustomToken": {
+          "MergeDistancePixels": 10,
+          "Stackable": true,
+          "StandUp": false,
+          "Thickness": 0.3
+        },
+        "ImageScalar": 1,
+        "ImageSecondaryURL": "",
+        "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808359/FA36A27E47F940D14B4C45809BF1A0CD7783C8EB/",
+        "WidthScale": 0
+      },
+      "Description": "",
+      "DragSelectable": true,
+      "GMNotes": "",
+      "GUID": "a5ce94",
+      "Grid": true,
+      "GridProjection": false,
+      "Hands": false,
+      "HideWhenFaceDown": false,
+      "IgnoreFoW": false,
+      "LayoutGroupSortIndex": 0,
+      "Locked": false,
+      "LuaScript": "",
+      "LuaScriptState": "",
+      "MeasureMovement": false,
+      "Memo": "evidence",
+      "Name": "Custom_Token",
+      "Nickname": "Evidence",
+      "Snap": false,
+      "Sticky": true,
+      "Tooltip": true,
+      "Transform": {
+        "posX": 44,
+        "posY": 1.5,
+        "posZ": 8,
+        "rotX": 0,
+        "rotY": 270,
+        "rotZ": 0,
+        "scaleX": 0.17,
+        "scaleY": 0.17,
+        "scaleZ": 0.17
+      },
+      "Value": 0,
+      "XmlUI": ""
+    },
+    "6": {
       "AltLookAngle": {
         "x": 0,
         "y": 0,
@@ -215,7 +331,7 @@
       "Value": 0,
       "XmlUI": ""
     },
-    "5": {
+    "7": {
       "AltLookAngle": {
         "x": 0,
         "y": 0,
diff --git a/objects/Resourcetokens.9fadf9/Resource.4cd3f6.json b/objects/Resourcetokens.9fadf9/Resource.4cd3f6.json
index a5c29f91..0af4b62e 100644
--- a/objects/Resourcetokens.9fadf9/Resource.4cd3f6.json
+++ b/objects/Resourcetokens.9fadf9/Resource.4cd3f6.json
@@ -25,7 +25,7 @@
   "Description": "",
   "DragSelectable": true,
   "GMNotes": "",
-  "GUID": "4cd3f6",
+  "GUID": "910e09",
   "Grid": true,
   "GridProjection": false,
   "Hands": false,
@@ -100,6 +100,64 @@
       "XmlUI": ""
     },
     "3": {
+      "AltLookAngle": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "Autoraise": true,
+      "ColorDiffuse": {
+        "b": 1,
+        "g": 1,
+        "r": 1
+      },
+      "CustomImage": {
+        "CustomToken": {
+          "MergeDistancePixels": 10,
+          "Stackable": true,
+          "StandUp": false,
+          "Thickness": 0.3
+        },
+        "ImageScalar": 1,
+        "ImageSecondaryURL": "",
+        "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808233/22B6C4A9FEE0814E6A9BDB2C833C79D66F8100B8/",
+        "WidthScale": 0
+      },
+      "Description": "",
+      "DragSelectable": true,
+      "GMNotes": "",
+      "GUID": "a5ce94",
+      "Grid": true,
+      "GridProjection": false,
+      "Hands": false,
+      "HideWhenFaceDown": false,
+      "IgnoreFoW": false,
+      "LayoutGroupSortIndex": 0,
+      "Locked": false,
+      "LuaScript": "",
+      "LuaScriptState": "",
+      "MeasureMovement": false,
+      "Memo": "bounty",
+      "Name": "Custom_Token",
+      "Nickname": "Bounty",
+      "Snap": false,
+      "Sticky": true,
+      "Tooltip": true,
+      "Transform": {
+        "posX": 44,
+        "posY": 1.5,
+        "posZ": 8,
+        "rotX": 0,
+        "rotY": 270,
+        "rotZ": 0,
+        "scaleX": 0.17,
+        "scaleY": 0.17,
+        "scaleZ": 0.17
+      },
+      "Value": 0,
+      "XmlUI": ""
+    },
+    "4": {
       "AltLookAngle": {
         "x": 0,
         "y": 0,
@@ -157,7 +215,65 @@
       "Value": 0,
       "XmlUI": ""
     },
-    "4": {
+    "5": {
+      "AltLookAngle": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "Autoraise": true,
+      "ColorDiffuse": {
+        "b": 1,
+        "g": 1,
+        "r": 1
+      },
+      "CustomImage": {
+        "CustomToken": {
+          "MergeDistancePixels": 10,
+          "Stackable": true,
+          "StandUp": false,
+          "Thickness": 0.3
+        },
+        "ImageScalar": 1,
+        "ImageSecondaryURL": "",
+        "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808359/FA36A27E47F940D14B4C45809BF1A0CD7783C8EB/",
+        "WidthScale": 0
+      },
+      "Description": "",
+      "DragSelectable": true,
+      "GMNotes": "",
+      "GUID": "a5ce94",
+      "Grid": true,
+      "GridProjection": false,
+      "Hands": false,
+      "HideWhenFaceDown": false,
+      "IgnoreFoW": false,
+      "LayoutGroupSortIndex": 0,
+      "Locked": false,
+      "LuaScript": "",
+      "LuaScriptState": "",
+      "MeasureMovement": false,
+      "Memo": "evidence",
+      "Name": "Custom_Token",
+      "Nickname": "Evidence",
+      "Snap": false,
+      "Sticky": true,
+      "Tooltip": true,
+      "Transform": {
+        "posX": 44,
+        "posY": 1.5,
+        "posZ": 8,
+        "rotX": 0,
+        "rotY": 270,
+        "rotZ": 0,
+        "scaleX": 0.17,
+        "scaleY": 0.17,
+        "scaleZ": 0.17
+      },
+      "Value": 0,
+      "XmlUI": ""
+    },
+    "6": {
       "AltLookAngle": {
         "x": 0,
         "y": 0,
@@ -215,7 +331,7 @@
       "Value": 0,
       "XmlUI": ""
     },
-    "5": {
+    "7": {
       "AltLookAngle": {
         "x": 0,
         "y": 0,
diff --git a/objects/Resourcetokens.fd617a/Resource.4cd3f6.json b/objects/Resourcetokens.fd617a/Resource.4cd3f6.json
index 114d7942..852012b0 100644
--- a/objects/Resourcetokens.fd617a/Resource.4cd3f6.json
+++ b/objects/Resourcetokens.fd617a/Resource.4cd3f6.json
@@ -25,7 +25,7 @@
   "Description": "",
   "DragSelectable": true,
   "GMNotes": "",
-  "GUID": "4cd3f6",
+  "GUID": "910e09",
   "Grid": true,
   "GridProjection": false,
   "Hands": false,
@@ -100,6 +100,64 @@
       "XmlUI": ""
     },
     "3": {
+      "AltLookAngle": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "Autoraise": true,
+      "ColorDiffuse": {
+        "b": 1,
+        "g": 1,
+        "r": 1
+      },
+      "CustomImage": {
+        "CustomToken": {
+          "MergeDistancePixels": 10,
+          "Stackable": true,
+          "StandUp": false,
+          "Thickness": 0.3
+        },
+        "ImageScalar": 1,
+        "ImageSecondaryURL": "",
+        "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808233/22B6C4A9FEE0814E6A9BDB2C833C79D66F8100B8/",
+        "WidthScale": 0
+      },
+      "Description": "",
+      "DragSelectable": true,
+      "GMNotes": "",
+      "GUID": "a5ce94",
+      "Grid": true,
+      "GridProjection": false,
+      "Hands": false,
+      "HideWhenFaceDown": false,
+      "IgnoreFoW": false,
+      "LayoutGroupSortIndex": 0,
+      "Locked": false,
+      "LuaScript": "",
+      "LuaScriptState": "",
+      "MeasureMovement": false,
+      "Memo": "bounty",
+      "Name": "Custom_Token",
+      "Nickname": "Bounty",
+      "Snap": false,
+      "Sticky": true,
+      "Tooltip": true,
+      "Transform": {
+        "posX": 44,
+        "posY": 1.5,
+        "posZ": 8,
+        "rotX": 0,
+        "rotY": 270,
+        "rotZ": 0,
+        "scaleX": 0.17,
+        "scaleY": 0.17,
+        "scaleZ": 0.17
+      },
+      "Value": 0,
+      "XmlUI": ""
+    },
+    "4": {
       "AltLookAngle": {
         "x": 0,
         "y": 0,
@@ -157,7 +215,65 @@
       "Value": 0,
       "XmlUI": ""
     },
-    "4": {
+    "5": {
+      "AltLookAngle": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "Autoraise": true,
+      "ColorDiffuse": {
+        "b": 1,
+        "g": 1,
+        "r": 1
+      },
+      "CustomImage": {
+        "CustomToken": {
+          "MergeDistancePixels": 10,
+          "Stackable": true,
+          "StandUp": false,
+          "Thickness": 0.3
+        },
+        "ImageScalar": 1,
+        "ImageSecondaryURL": "",
+        "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808359/FA36A27E47F940D14B4C45809BF1A0CD7783C8EB/",
+        "WidthScale": 0
+      },
+      "Description": "",
+      "DragSelectable": true,
+      "GMNotes": "",
+      "GUID": "a5ce94",
+      "Grid": true,
+      "GridProjection": false,
+      "Hands": false,
+      "HideWhenFaceDown": false,
+      "IgnoreFoW": false,
+      "LayoutGroupSortIndex": 0,
+      "Locked": false,
+      "LuaScript": "",
+      "LuaScriptState": "",
+      "MeasureMovement": false,
+      "Memo": "evidence",
+      "Name": "Custom_Token",
+      "Nickname": "Evidence",
+      "Snap": false,
+      "Sticky": true,
+      "Tooltip": true,
+      "Transform": {
+        "posX": 44,
+        "posY": 1.5,
+        "posZ": 8,
+        "rotX": 0,
+        "rotY": 270,
+        "rotZ": 0,
+        "scaleX": 0.17,
+        "scaleY": 0.17,
+        "scaleZ": 0.17
+      },
+      "Value": 0,
+      "XmlUI": ""
+    },
+    "6": {
       "AltLookAngle": {
         "x": 0,
         "y": 0,
@@ -215,7 +331,7 @@
       "Value": 0,
       "XmlUI": ""
     },
-    "5": {
+    "7": {
       "AltLookAngle": {
         "x": 0,
         "y": 0,
diff --git a/objects/TokenSource.124381/Resource.910e09.json b/objects/TokenSource.124381/Resource.910e09.json
index 1ad43c58..e1584e01 100644
--- a/objects/TokenSource.124381/Resource.910e09.json
+++ b/objects/TokenSource.124381/Resource.910e09.json
@@ -100,6 +100,64 @@
       "XmlUI": ""
     },
     "3": {
+      "AltLookAngle": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "Autoraise": true,
+      "ColorDiffuse": {
+        "b": 1,
+        "g": 1,
+        "r": 1
+      },
+      "CustomImage": {
+        "CustomToken": {
+          "MergeDistancePixels": 10,
+          "Stackable": true,
+          "StandUp": false,
+          "Thickness": 0.3
+        },
+        "ImageScalar": 1,
+        "ImageSecondaryURL": "",
+        "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808233/22B6C4A9FEE0814E6A9BDB2C833C79D66F8100B8/",
+        "WidthScale": 0
+      },
+      "Description": "",
+      "DragSelectable": true,
+      "GMNotes": "",
+      "GUID": "a5ce94",
+      "Grid": true,
+      "GridProjection": false,
+      "Hands": false,
+      "HideWhenFaceDown": false,
+      "IgnoreFoW": false,
+      "LayoutGroupSortIndex": 0,
+      "Locked": false,
+      "LuaScript": "",
+      "LuaScriptState": "",
+      "MeasureMovement": false,
+      "Memo": "bounty",
+      "Name": "Custom_Token",
+      "Nickname": "Bounty",
+      "Snap": false,
+      "Sticky": true,
+      "Tooltip": true,
+      "Transform": {
+        "posX": 44,
+        "posY": 1.5,
+        "posZ": 8,
+        "rotX": 0,
+        "rotY": 270,
+        "rotZ": 0,
+        "scaleX": 0.17,
+        "scaleY": 0.17,
+        "scaleZ": 0.17
+      },
+      "Value": 0,
+      "XmlUI": ""
+    },
+    "4": {
       "AltLookAngle": {
         "x": 0,
         "y": 0,
@@ -157,7 +215,65 @@
       "Value": 0,
       "XmlUI": ""
     },
-    "4": {
+    "5": {
+      "AltLookAngle": {
+        "x": 0,
+        "y": 0,
+        "z": 0
+      },
+      "Autoraise": true,
+      "ColorDiffuse": {
+        "b": 1,
+        "g": 1,
+        "r": 1
+      },
+      "CustomImage": {
+        "CustomToken": {
+          "MergeDistancePixels": 10,
+          "Stackable": true,
+          "StandUp": false,
+          "Thickness": 0.3
+        },
+        "ImageScalar": 1,
+        "ImageSecondaryURL": "",
+        "ImageURL": "http://cloud-3.steamusercontent.com/ugc/2021604000335808359/FA36A27E47F940D14B4C45809BF1A0CD7783C8EB/",
+        "WidthScale": 0
+      },
+      "Description": "",
+      "DragSelectable": true,
+      "GMNotes": "",
+      "GUID": "a5ce94",
+      "Grid": true,
+      "GridProjection": false,
+      "Hands": false,
+      "HideWhenFaceDown": false,
+      "IgnoreFoW": false,
+      "LayoutGroupSortIndex": 0,
+      "Locked": false,
+      "LuaScript": "",
+      "LuaScriptState": "",
+      "MeasureMovement": false,
+      "Memo": "evidence",
+      "Name": "Custom_Token",
+      "Nickname": "Evidence",
+      "Snap": false,
+      "Sticky": true,
+      "Tooltip": true,
+      "Transform": {
+        "posX": 44,
+        "posY": 1.5,
+        "posZ": 8,
+        "rotX": 0,
+        "rotY": 270,
+        "rotZ": 0,
+        "scaleX": 0.17,
+        "scaleY": 0.17,
+        "scaleZ": 0.17
+      },
+      "Value": 0,
+      "XmlUI": ""
+    },
+    "6": {
       "AltLookAngle": {
         "x": 0,
         "y": 0,
@@ -215,7 +331,7 @@
       "Value": 0,
       "XmlUI": ""
     },
-    "5": {
+    "7": {
       "AltLookAngle": {
         "x": 0,
         "y": 0,
diff --git a/src/core/token/TokenManager.ttslua b/src/core/token/TokenManager.ttslua
index 0358b65e..0b1b12ec 100644
--- a/src/core/token/TokenManager.ttslua
+++ b/src/core/token/TokenManager.ttslua
@@ -111,9 +111,11 @@ do
   local stateTable = {
     ["resource"] = 1,
     ["ammo"] = 2,
-    ["charge"] = 3,
-    ["secret"] = 4,
-    ["supply"] = 5
+    ["bounty"] = 3,
+    ["charge"] = 4,
+    ["evidence"] = 5,
+    ["secret"] = 6,
+    ["supply"] = 7
   }
 
   -- Source for tokens