diff --git a/changelog.md b/changelog.md
index 61ac903..4bb73d8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog Material Deck Module
-### v1.4.0
+### v1.4.1 - 21-04-2021
+Fixes:
+<ul>
+<li>Last update broke the combat tracker, should now be fixed</li>
+</ul>
+
+### v1.4.0 - 21-04-2021
 Additions:
 <ul>
 <li>Support for connecting multiple Stream Decks at the same time. Please note that performance decreases with each extra Stream Deck</li>
@@ -22,7 +28,8 @@ Fixes:
 Material Server v1.0.2 (unchanged): https://github.com/CDeenen/MaterialServer/releases <br>
 SD plugin v1.4.0 (<b>must be updated!</b>): https://github.com/CDeenen/MaterialDeck_SD/releases<br>
 
-### v1.3.3
+
+### v1.3.3 - 12-04-2021
 Additions:
 <ul>
 <li>Other Actions => Open Sidebar Tab: Action now indicates which sidebar tab is open (only works on Foundry 0.8.x)</li>
diff --git a/img/other/.thumb/d20.png.jpg b/img/other/.thumb/d20.png.jpg
deleted file mode 100644
index 8a07cfb..0000000
Binary files a/img/other/.thumb/d20.png.jpg and /dev/null differ
diff --git a/img/token/.thumb/temp_hp_empty.png.jpg b/img/token/.thumb/temp_hp_empty.png.jpg
deleted file mode 100644
index 94323a3..0000000
Binary files a/img/token/.thumb/temp_hp_empty.png.jpg and /dev/null differ
diff --git a/img/token/abilities/.thumb/cha.png.jpg b/img/token/abilities/.thumb/cha.png.jpg
deleted file mode 100644
index 0fe0835..0000000
Binary files a/img/token/abilities/.thumb/cha.png.jpg and /dev/null differ
diff --git a/img/token/abilities/.thumb/cons.png.jpg b/img/token/abilities/.thumb/cons.png.jpg
deleted file mode 100644
index aec6541..0000000
Binary files a/img/token/abilities/.thumb/cons.png.jpg and /dev/null differ
diff --git a/img/token/abilities/.thumb/dex.png.jpg b/img/token/abilities/.thumb/dex.png.jpg
deleted file mode 100644
index 716d8f7..0000000
Binary files a/img/token/abilities/.thumb/dex.png.jpg and /dev/null differ
diff --git a/img/token/abilities/.thumb/int.png.jpg b/img/token/abilities/.thumb/int.png.jpg
deleted file mode 100644
index 4b1787c..0000000
Binary files a/img/token/abilities/.thumb/int.png.jpg and /dev/null differ
diff --git a/img/token/abilities/.thumb/str.png.jpg b/img/token/abilities/.thumb/str.png.jpg
deleted file mode 100644
index b3bb184..0000000
Binary files a/img/token/abilities/.thumb/str.png.jpg and /dev/null differ
diff --git a/img/token/abilities/.thumb/wis.png.jpg b/img/token/abilities/.thumb/wis.png.jpg
deleted file mode 100644
index 7ce2396..0000000
Binary files a/img/token/abilities/.thumb/wis.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/acr.png.jpg b/img/token/skills/.thumb/acr.png.jpg
deleted file mode 100644
index 2322149..0000000
Binary files a/img/token/skills/.thumb/acr.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/ani.png.jpg b/img/token/skills/.thumb/ani.png.jpg
deleted file mode 100644
index 8eac9af..0000000
Binary files a/img/token/skills/.thumb/ani.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/arc.png.jpg b/img/token/skills/.thumb/arc.png.jpg
deleted file mode 100644
index fd06c23..0000000
Binary files a/img/token/skills/.thumb/arc.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/ath.png.jpg b/img/token/skills/.thumb/ath.png.jpg
deleted file mode 100644
index 695e260..0000000
Binary files a/img/token/skills/.thumb/ath.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/dec.png.jpg b/img/token/skills/.thumb/dec.png.jpg
deleted file mode 100644
index bf18c75..0000000
Binary files a/img/token/skills/.thumb/dec.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/his.png.jpg b/img/token/skills/.thumb/his.png.jpg
deleted file mode 100644
index 1bde4d1..0000000
Binary files a/img/token/skills/.thumb/his.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/ins.png.jpg b/img/token/skills/.thumb/ins.png.jpg
deleted file mode 100644
index 40c8965..0000000
Binary files a/img/token/skills/.thumb/ins.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/inv.png.jpg b/img/token/skills/.thumb/inv.png.jpg
deleted file mode 100644
index 2009316..0000000
Binary files a/img/token/skills/.thumb/inv.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/itm.png.jpg b/img/token/skills/.thumb/itm.png.jpg
deleted file mode 100644
index 444585c..0000000
Binary files a/img/token/skills/.thumb/itm.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/med.png.jpg b/img/token/skills/.thumb/med.png.jpg
deleted file mode 100644
index a9277b8..0000000
Binary files a/img/token/skills/.thumb/med.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/nat.png.jpg b/img/token/skills/.thumb/nat.png.jpg
deleted file mode 100644
index c2f6fe6..0000000
Binary files a/img/token/skills/.thumb/nat.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/per.png.jpg b/img/token/skills/.thumb/per.png.jpg
deleted file mode 100644
index 18816fa..0000000
Binary files a/img/token/skills/.thumb/per.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/prc.png.jpg b/img/token/skills/.thumb/prc.png.jpg
deleted file mode 100644
index 41f5756..0000000
Binary files a/img/token/skills/.thumb/prc.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/prf.png.jpg b/img/token/skills/.thumb/prf.png.jpg
deleted file mode 100644
index 4913f95..0000000
Binary files a/img/token/skills/.thumb/prf.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/rel.png.jpg b/img/token/skills/.thumb/rel.png.jpg
deleted file mode 100644
index b9b450a..0000000
Binary files a/img/token/skills/.thumb/rel.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/slt.png.jpg b/img/token/skills/.thumb/slt.png.jpg
deleted file mode 100644
index 8fc6eaa..0000000
Binary files a/img/token/skills/.thumb/slt.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/ste.png.jpg b/img/token/skills/.thumb/ste.png.jpg
deleted file mode 100644
index 8773530..0000000
Binary files a/img/token/skills/.thumb/ste.png.jpg and /dev/null differ
diff --git a/img/token/skills/.thumb/sur.png.jpg b/img/token/skills/.thumb/sur.png.jpg
deleted file mode 100644
index af23858..0000000
Binary files a/img/token/skills/.thumb/sur.png.jpg and /dev/null differ
diff --git a/module.json b/module.json
index 233b252..3b4f159 100644
--- a/module.json
+++ b/module.json
@@ -2,7 +2,7 @@
     "name": "MaterialDeck",
     "title": "Material Deck",
     "description": "Material Deck allows you to control Foundry using an Elgato Stream Deck",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "minimumSDversion": "1.4.0",
     "minimumMSversion": "1.0.2",
     "author": "CDeenen",
diff --git a/src/token.js b/src/token.js
index c8f4881..719e155 100644
--- a/src/token.js
+++ b/src/token.js
@@ -30,7 +30,8 @@ export class TokenControl{
     
         let validToken = false;
         let token;
-        if (selection == 'selected') token = canvas.tokens.controlled[0];
+        if (tokenId != undefined && tokenId != null) token = canvas.tokens.children[0].children.find(p => p.id == tokenId);
+        else if (selection == 'selected') token = canvas.tokens.controlled[0];
         else if (selection != 'selected' && tokenIdentifier == '') {}
         else if (selection == 'tokenName') token = canvas.tokens.children[0].children.find(p => p.name == tokenIdentifier);
         else if (selection == 'actorName') token = canvas.tokens.children[0].children.find(p => p.actor.name == tokenIdentifier);