diff --git a/objects/Horrortokens.7bd2a0/Horror.36be72.json b/objects/Horrortokens.7bd2a0/Horror.36be72.json
index 2d35aafe..0839a4d4 100644
--- a/objects/Horrortokens.7bd2a0/Horror.36be72.json
+++ b/objects/Horrortokens.7bd2a0/Horror.36be72.json
@@ -38,7 +38,7 @@
   "MeasureMovement": false,
   "Memo": "horror",
   "Name": "Custom_Token",
-  "Nickname": "Horror",
+  "Nickname": "",
   "Snap": false,
   "States": {
     "2": {
@@ -81,7 +81,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -139,7 +139,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -197,7 +197,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -255,7 +255,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -313,7 +313,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -371,7 +371,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -429,7 +429,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -487,7 +487,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
diff --git a/objects/Horrortokens.ae1a4e/Horror.36be72.json b/objects/Horrortokens.ae1a4e/Horror.36be72.json
index 2d35aafe..0839a4d4 100644
--- a/objects/Horrortokens.ae1a4e/Horror.36be72.json
+++ b/objects/Horrortokens.ae1a4e/Horror.36be72.json
@@ -38,7 +38,7 @@
   "MeasureMovement": false,
   "Memo": "horror",
   "Name": "Custom_Token",
-  "Nickname": "Horror",
+  "Nickname": "",
   "Snap": false,
   "States": {
     "2": {
@@ -81,7 +81,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -139,7 +139,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -197,7 +197,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -255,7 +255,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -313,7 +313,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -371,7 +371,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -429,7 +429,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -487,7 +487,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
diff --git a/objects/Horrortokens.c3ecf4/Horror.36be72.json b/objects/Horrortokens.c3ecf4/Horror.36be72.json
index 2d35aafe..0839a4d4 100644
--- a/objects/Horrortokens.c3ecf4/Horror.36be72.json
+++ b/objects/Horrortokens.c3ecf4/Horror.36be72.json
@@ -38,7 +38,7 @@
   "MeasureMovement": false,
   "Memo": "horror",
   "Name": "Custom_Token",
-  "Nickname": "Horror",
+  "Nickname": "",
   "Snap": false,
   "States": {
     "2": {
@@ -81,7 +81,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -139,7 +139,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -197,7 +197,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -255,7 +255,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -313,7 +313,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -371,7 +371,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -429,7 +429,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
@@ -487,7 +487,7 @@
       "MeasureMovement": false,
       "Memo": "horror",
       "Name": "Custom_Token",
-      "Nickname": "Horror",
+      "Nickname": "",
       "Snap": false,
       "Sticky": true,
       "Tooltip": true,
diff --git a/src/playermat/Playmat.ttslua b/src/playermat/Playmat.ttslua
index a684188f..bfebb400 100644
--- a/src/playermat/Playmat.ttslua
+++ b/src/playermat/Playmat.ttslua
@@ -689,14 +689,12 @@ end
 function removeTokensFromObject(object)
   for _, v in ipairs(searchArea(object.getPosition(), { 3, 1, 4 })) do
     local obj = v.hit_object
-    local name = obj.getName()
 
     if obj.getGUID() ~= "4ee1f2" and -- table
         obj ~= self and
         obj.type ~= "Deck" and
         obj.type ~= "Card" and
-        name ~= "Horror" and
-        name ~= "Resources" and
+        obj.getLock() == false and
         obj.getDescription() ~= "Action Token" and
         not tokenChecker.isChaosToken(obj) then
       TRASHCAN.putObject(obj)