diff --git a/.gitignore b/.gitignore
index 35cce91..890a065 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,7 @@
 # IDE
 .idea/
-.vs/
\ No newline at end of file
+.vs/
+node_modules/
+.eslintrc.js
+package.json
+package-lock.json
\ No newline at end of file
diff --git a/fonts/eb-garamond-v14-latin-ext_latin-700.woff b/fonts/eb-garamond-v14-latin-ext_latin-700.woff
new file mode 100644
index 0000000..33be1e8
Binary files /dev/null and b/fonts/eb-garamond-v14-latin-ext_latin-700.woff differ
diff --git a/fonts/eb-garamond-v14-latin-ext_latin-700.woff2 b/fonts/eb-garamond-v14-latin-ext_latin-700.woff2
new file mode 100644
index 0000000..683bf5f
Binary files /dev/null and b/fonts/eb-garamond-v14-latin-ext_latin-700.woff2 differ
diff --git a/fonts/eb-garamond-v14-latin-ext_latin-700italic.woff b/fonts/eb-garamond-v14-latin-ext_latin-700italic.woff
new file mode 100644
index 0000000..541cb48
Binary files /dev/null and b/fonts/eb-garamond-v14-latin-ext_latin-700italic.woff differ
diff --git a/fonts/eb-garamond-v14-latin-ext_latin-700italic.woff2 b/fonts/eb-garamond-v14-latin-ext_latin-700italic.woff2
new file mode 100644
index 0000000..7b8d7d3
Binary files /dev/null and b/fonts/eb-garamond-v14-latin-ext_latin-700italic.woff2 differ
diff --git a/fonts/eb-garamond-v14-latin-ext_latin-italic.woff b/fonts/eb-garamond-v14-latin-ext_latin-italic.woff
new file mode 100644
index 0000000..51fad60
Binary files /dev/null and b/fonts/eb-garamond-v14-latin-ext_latin-italic.woff differ
diff --git a/fonts/eb-garamond-v14-latin-ext_latin-italic.woff2 b/fonts/eb-garamond-v14-latin-ext_latin-italic.woff2
new file mode 100644
index 0000000..1364780
Binary files /dev/null and b/fonts/eb-garamond-v14-latin-ext_latin-italic.woff2 differ
diff --git a/fonts/eb-garamond-v14-latin-ext_latin-regular.woff b/fonts/eb-garamond-v14-latin-ext_latin-regular.woff
new file mode 100644
index 0000000..c157ccd
Binary files /dev/null and b/fonts/eb-garamond-v14-latin-ext_latin-regular.woff differ
diff --git a/fonts/eb-garamond-v14-latin-ext_latin-regular.woff2 b/fonts/eb-garamond-v14-latin-ext_latin-regular.woff2
new file mode 100644
index 0000000..0bb7043
Binary files /dev/null and b/fonts/eb-garamond-v14-latin-ext_latin-regular.woff2 differ
diff --git a/lang/en.json b/lang/en.json
index 29057b3..39fce35 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -2,7 +2,13 @@
     "dishonored.__comment": "The Dishonored System allows for dynamic location of variables. These are indicated via |#|.",
 
 
-    "dishonored.notifications.momentumTrackerPermissions": "The Momentum Tracker User Role does not have permissions to Modify Configuration Settings. Please change one of these in Permission Configuration or System Settings.",
+    "dishonored.notifications.momentum.trackerPermissions1": "The <b>Momentum Tracker User Role</b> does not have permissions to <b>Modify Configuration Settings</b>. Please either change ",
+    "dishonored.notifications.chaos.trackerPermissions1": "The <b>Chaos Tracker User Role</b> does not have permissions to <b>Modify Configuration Settings</b>. Please either change ",
+    "dishonored.notifications.trackerPermissions2": " so that User Role: ",
+    "dishonored.notifications.momentum.trackerPermissions3": " has permission to <b>Modify Configuration Settings</b> or, increase the User Role requirement for <b>Momentum Tracker User Role</b> in ",
+    "dishonored.notifications.chaos.trackerPermissions3": " has permission to <b>Modify Configuration Settings</b> or, increase the User Role requirement for <b>Chaos Tracker User Role</b> in ",
+    "dishonored.notifications.trackerPermissions4": ".",
+    "dishonored.notifications.trackerPermissionsClickHere": "To ignore this message until next update Click Here.",
     "dishonored.notifications.lackPermission": "You do not have permission to view this item!",
     "dishonored.notifications.tooManyBonecharms": "The current actor has 3 equipped bonecharms already! Doing Nothing.",
     "dishonored.notifications.armorAlreadyEquipped": "The current actor has an equipped armor already! Doing Nothing.",
@@ -55,6 +61,12 @@
 
     "dishonored.actor.item.adjectiveNew": "New",
 
+    "dishonored.actor.npc.types": "NPC Type",
+    "dishonored.actor.npc.incidental": "Incidental",
+    "dishonored.actor.npc.notable": "Notable",
+    "dishonored.actor.npc.minor": "Minor",
+    "dishonored.actor.npc.major": "Major",
+
     "dishonored.actor.character.momentum": "Momentum Track",
     "dishonored.actor.character.experience": "Experience Track",
     "dishonored.actor.character.name": "Name",
@@ -67,7 +79,7 @@
     "dishonored.actor.character.outlook": "Outlook",
     "dishonored.actor.character.void": "Void Points Track",
 
-    "dishonored.actor.skisty.mod": "Modifier",
+    "dishonored.actor.skisty.mod": "Mod",
     "dishonored.actor.skisty.check": "Perform Check",
 
     "dishonored.actor.skill.title": "Skills",
@@ -91,16 +103,13 @@
     "dishonored.actor.genericitem.name": "Name",
     "dishonored.actor.genericitem.cost": "Value",
 
-    "dishonored.actor.contact.title": "Contacts",
-    "dishonored.actor.contact.relation": "Relation",
-
-    "dishonored.actor.talent.title": "Talents",
-    "dishonored.actor.talent.type": "Type",
-
     "dishonored.actor.focus.title": "Focuses",
     "dishonored.actor.focus.rating": "Rating",
 
-    "dishonored.actor.note.title": "Notes",
+    "dishonored.actor.abilities.mana": "Mana Points",
+
+    "dishonored.actor.talent.title": "Talents",
+    "dishonored.actor.talent.type": "Type",
 
     "dishonored.actor.power.title": "Powers",
     "dishonored.actor.power.rune": "Rune",
@@ -109,7 +118,8 @@
     "dishonored.actor.belonging.title": "Belongings",
     "dishonored.actor.belonging.collectable.coin": "Coins",
     "dishonored.actor.belonging.collectable.rune": "Runes",
-    "dishonored.actor.belonging.weapon.title": "Weapons",
+    "dishonored.actor.belonging.collectable.bonecharm": "Bonecharms",
+    "dishonored.actor.belonging.weapon.title": "Weapon Name",
     "dishonored.actor.belonging.weapon.dmg": "Dmg",
     "dishonored.actor.belonging.weapon.damage": "Damage",
     "dishonored.actor.belonging.weapon.armorpierce": "Armor Piercing",
@@ -125,14 +135,22 @@
     "dishonored.actor.belonging.weapon.distant": "Distant",
     "dishonored.actor.belonging.weapon.rangednearby": "Ranged (Nearby)",
     "dishonored.actor.belonging.weapon.nearby": "Nearby",
-    "dishonored.actor.belonging.armor.title": "Armor",
+    "dishonored.actor.belonging.armor.title": "Armor Name",
     "dishonored.actor.belonging.armor.protect": "Protect",
     "dishonored.actor.belonging.armor.protection": "Protection",
-    "dishonored.actor.belonging.bonecharm.title": "Bonecharms",
-    "dishonored.actor.belonging.other.title": "Other Items",
+    "dishonored.actor.belonging.bonecharm.title": "Bonecharm Name",
+    "dishonored.actor.belonging.other.title": "Item Name",
     "dishonored.actor.belonging.other.qty": "Qty",
     "dishonored.actor.belonging.other.quantity": "Quantity",
 
+    "dishonored.actor.truth.title": "Truths",
+    "dishonored.actor.truth.content": "Content of Truth",
+
+    "dishonored.actor.contact.title": "Contacts",
+    "dishonored.actor.contact.relation": "Relation",
+    
+    "dishonored.actor.note.title": "Notes",
+
 
     "dishonored.contact.relation.great": "Great",
     "dishonored.contact.relation.fair": "Fair",
@@ -141,6 +159,9 @@
     "dishonored.contact.relation.dire": "Dire",
 
 
+    "dishonored.item.truth": "Truth",
+
+    
     "dishonored.item.armor.helmet": "Is Helmet?",
     "dishonored.item.contact.send2actor": "Send to Actor",
 
@@ -176,5 +197,5 @@
     "dishonored.tracker.momentum": "Momentum",
 
 
-    "dishonored.__eof": "This is an end of file because I'm lazy and keep forgetting commas. This shouldn't be in the final commit (sorry if it is - see previous statement)."
+    "dishonored.__eof": "This is an end of file because I'm lazy and keep forgetting commas. This shouldn't be in the final commit (sorry if it is - see previous sentence)."
 }
\ No newline at end of file
diff --git a/lang/es.json b/lang/es.json
index c0581f4..5f0dc6b 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -17,7 +17,7 @@
     "dishonored.actor.character.archetype": "Arquetipo",
     "dishonored.actor.character.outlook": "Perspectiva",
     "dishonored.actor.character.void": "Puntos de Vacío",
-    "dishonored.actor.skisty.mod": "Modificador",
+    "dishonored.actor.skisty.mod": "Mod",
     "dishonored.actor.skisty.check": "Tirada de Acción",
     "dishonored.actor.skill.title": "Habilidades",
     "dishonored.actor.skill.name": "Habilidades",
diff --git a/module/actors/actor.js b/module/actors/actor.js
index f9c4f5e..e77d016 100644
--- a/module/actors/actor.js
+++ b/module/actors/actor.js
@@ -1,107 +1,90 @@
 import {
     DishonoredRollDialog
-} from '../apps/roll-dialog.js'
+} from "../apps/roll-dialog.js";
 import {
     DishonoredRoll
-} from '../roll.js'
+} from "../roll.js";
 
 export class DishonoredActor extends Actor {
-	prepareData() {
-		this.data.img = '/systems/FVTT-Dishonored/icons/dishonoredlogo.webp';
-		this.data.token.img = '/systems/FVTT-Dishonored/icons/dishonoredlogo.webp';
-		this.data.token.bar1.attribute = "stress";
-		if(this.data.type == "character") {
-			this.data.token.bar2.attribute = "void";
-			this.data.token.actorLink = "true";
-			this.data.token.brightSight = 30;
-			this.data.token.dimSight = 60;
-			this.data.token.displayBars = 50;
-			this.data.token.displayName = 50;
-			this.data.token.disposition = 1;
-			this.data.token.vision = true;
-		}
-		else {
-			this.data.token.displayBars = 40;
-			this.data.token.displayName = 40;
-			this.data.token.disposition = -1;
-		}
-		super.prepareData();
-		// const actorData = this.data;
-	}
+    prepareData() {
+        if (this.data.img == "icons/svg/mystery-man.svg") this.data.img = "/systems/FVTT-Dishonored/icons/dishonoredlogo.webp";
+        if (this.data.token.img == "icons/svg/mystery-man.svg") this.data.token.img = "/systems/FVTT-Dishonored/icons/dishonoredlogo.webp";
+        return this.data;
+    }
 }
 
 export class DishonoredSharedActorFunctions {
 
-	// This function renders all the tracks. This will be used every time the character sheet is loaded. It is a vital element as such it runs before most other code!
-	dishonoredRenderTracks(html, stressTrackMax, voidPointsMax, expPointsMax, momentumMax) {
-		var i;
-		// Checks if details for the Stress Track was included, this should happen in all cases!
-		if (stressTrackMax) {
-			for (i = 0; i < stressTrackMax; i++) {
-				if (i + 1 <= html.find('#total-stress')[0].value) {
-					html.find('[id^="stress"]')[i].setAttribute("data-selected", "true");
-					html.find('[id^="stress"]')[i].style.backgroundColor = "#191813";
-					html.find('[id^="stress"]')[i].style.color = "#ffffff";
-				} else {
-					html.find('[id^="stress"]')[i].removeAttribute("data-selected");
-					html.find('[id^="stress"]')[i].style.backgroundColor = "rgb(255, 255, 255, 0.3)";
-					html.find('[id^="stress"]')[i].style.color = "";
-				}
-			}
-		}
-		// Checks if details for the Void Track was included, this should happen for all Characters!
-		if (voidPointsMax) {
-			for (i = 0; i < voidPointsMax; i++) {
-				if (i + 1 <= html.find('#total-void')[0].value) {
-					html.find('[id^="void"]')[i].setAttribute("data-selected", "true");
-					html.find('[id^="void"]')[i].style.backgroundColor = "#191813";
-					html.find('[id^="void"]')[i].style.color = "#ffffff";
-				} else {
-					html.find('[id^="void"]')[i].removeAttribute("data-selected");
-					html.find('[id^="void"]')[i].style.backgroundColor = "rgb(255, 255, 255, 0.3)";
-					html.find('[id^="void"]')[i].style.color = "";
-				}
-			}
-		}
-		// Checks if details for the Experience Track was included, this should happen for all Characters!
-		if (expPointsMax) {
-			for (i = 0; i < expPointsMax; i++) {
-				if (i + 1 <= html.find('#total-exp')[0].value) {
-					html.find('[id^="exp"]')[i].setAttribute("data-selected", "true");
-					html.find('[id^="exp"]')[i].style.backgroundColor = "#191813";
-					html.find('[id^="exp"]')[i].style.color = "#ffffff";
-				} else {
-					html.find('[id^="exp"]')[i].removeAttribute("data-selected");
-					html.find('[id^="exp"]')[i].style.backgroundColor = "rgb(255, 255, 255, 0.3)";
-					html.find('[id^="exp"]')[i].style.color = "";
-				}
-			}
-		}
-		// Checks if details for the Momentum Track was included, this should happen for all Characters!
-		if(momentumMax) {
-			for (i = 0; i < 6; i++) {
-				if (i + 1 <= html.find('#total-mom')[0].value) {
-					html.find('[id^="mom"]')[i].setAttribute("data-selected", "true");
-					html.find('[id^="mom"]')[i].style.backgroundColor = "#191813";
-					html.find('[id^="mom"]')[i].style.color = "#ffffff";
-				} else {
-					html.find('[id^="mom"]')[i].removeAttribute("data-selected");
-					html.find('[id^="mom"]')[i].style.backgroundColor = "rgb(255, 255, 255, 0.3)";
-					html.find('[id^="mom"]')[i].style.color = "";
-				}
-			}
-		}
-	}
+    // This function renders all the tracks. This will be used every time the character sheet is loaded. It is a vital element as such it runs before most other code!
+    dishonoredRenderTracks(html, stressTrackMax, voidPointsMax, expPointsMax, momentumMax) {
+        let i;
+        // Checks if details for the Stress Track was included, this should happen in all cases!
+        if (stressTrackMax) {
+            for (i = 0; i < stressTrackMax; i++) {
+                if (i + 1 <= html.find("#total-stress")[0].value) {
+                    html.find("[id^=\"stress\"]")[i].setAttribute("data-selected", "true");
+                    html.find("[id^=\"stress\"]")[i].style.backgroundColor = "#191813";
+                    html.find("[id^=\"stress\"]")[i].style.color = "#ffffff";
+                } else {
+                    html.find("[id^=\"stress\"]")[i].removeAttribute("data-selected");
+                    html.find("[id^=\"stress\"]")[i].style.backgroundColor = "rgb(255, 255, 255, 0.3)";
+                    html.find("[id^=\"stress\"]")[i].style.color = "";
+                }
+            }
+        }
+        // Checks if details for the Void Track was included, this should happen for all Characters!
+        if (voidPointsMax) {
+            for (i = 0; i < voidPointsMax; i++) {
+                if (i + 1 <= html.find("#total-void")[0].value) {
+                    html.find("[id^=\"void\"]")[i].setAttribute("data-selected", "true");
+                    html.find("[id^=\"void\"]")[i].style.backgroundColor = "#191813";
+                    html.find("[id^=\"void\"]")[i].style.color = "#ffffff";
+                } else {
+                    html.find("[id^=\"void\"]")[i].removeAttribute("data-selected");
+                    html.find("[id^=\"void\"]")[i].style.backgroundColor = "rgb(255, 255, 255, 0.3)";
+                    html.find("[id^=\"void\"]")[i].style.color = "";
+                }
+            }
+        }
+        // Checks if details for the Experience Track was included, this should happen for all Characters!
+        if (expPointsMax) {
+            for (i = 0; i < expPointsMax; i++) {
+                if (i + 1 <= html.find("#total-exp")[0].value) {
+                    html.find("[id^=\"exp\"]")[i].setAttribute("data-selected", "true");
+                    html.find("[id^=\"exp\"]")[i].style.backgroundColor = "#191813";
+                    html.find("[id^=\"exp\"]")[i].style.color = "#ffffff";
+                } else {
+                    html.find("[id^=\"exp\"]")[i].removeAttribute("data-selected");
+                    html.find("[id^=\"exp\"]")[i].style.backgroundColor = "rgb(255, 255, 255, 0.8)";
+                    html.find("[id^=\"exp\"]")[i].style.color = "";
+                }
+            }
+        }
+        // Checks if details for the Momentum Track was included, this should happen for all Characters!
+        if(momentumMax) {
+            for (i = 0; i < 6; i++) {
+                if (i + 1 <= html.find("#total-mom")[0].value) {
+                    html.find("[id^=\"mom\"]")[i].setAttribute("data-selected", "true");
+                    html.find("[id^=\"mom\"]")[i].style.backgroundColor = "#191813";
+                    html.find("[id^=\"mom\"]")[i].style.color = "#ffffff";
+                } else {
+                    html.find("[id^=\"mom\"]")[i].removeAttribute("data-selected");
+                    html.find("[id^=\"mom\"]")[i].style.backgroundColor = "rgb(255, 255, 255, 0.3)";
+                    html.find("[id^=\"mom\"]")[i].style.color = "";
+                }
+            }
+        }
+    }
 
     // This handles performing a skill test using the "Perform Check" button.
     async rollSkillTest(event, checkTarget, selectedSkill, selectedStyle, speaker) {
-		event.preventDefault();
-		// This creates a dialog to gather details regarding the roll and waits for a response
+        event.preventDefault();
+        // This creates a dialog to gather details regarding the roll and waits for a response
         let rolldialog = await DishonoredRollDialog.create();
         if (rolldialog) {
             let dicePool = rolldialog.get("dicePoolSlider");
-			let focusTarget = parseInt(rolldialog.get("dicePoolFocus"));
-			// Once the response has been collected it then sends it to be rolled.
+            let focusTarget = parseInt(rolldialog.get("dicePoolFocus"));
+            // Once the response has been collected it then sends it to be rolled.
             let dishonoredRoll = new DishonoredRoll();
             dishonoredRoll.performSkillTest(dicePool, checkTarget, focusTarget, selectedSkill, selectedStyle, speaker);
         }
@@ -110,34 +93,34 @@ export class DishonoredSharedActorFunctions {
     // This handles performing an "item" roll by clicking the item's image.
     async rollGenericItem(event, type, id, speaker) {
         event.preventDefault();
-        var item = speaker.items.get(id);
+        let item = speaker.items.get(id);
         let dishonoredRoll = new DishonoredRoll();
         // It will send it to a different method depending what item type was sent to it.
         switch(type) {
-            case "item":
-                dishonoredRoll.performItemRoll(item, speaker);
-                break;
-            case "focus":
-                dishonoredRoll.performFocusRoll(item, speaker);
-                break;
-            case "bonecharm":
-                dishonoredRoll.performBonecharmRoll(item, speaker);
-                break;
-            case "weapon":
-                dishonoredRoll.performWeaponRoll(item, speaker);
-                break;
-            case "armor":
-                dishonoredRoll.performArmorRoll(item, speaker);
-                break;
-            case "talent":
-                dishonoredRoll.performTalentRoll(item, speaker);
-                break;
-            case "contact":
-                dishonoredRoll.performContactRoll(item, speaker);
-                break;
-            case "power":
-                dishonoredRoll.performPowerRoll(item, speaker);
-                break;
+        case "item":
+            dishonoredRoll.performItemRoll(item, speaker);
+            break;
+        case "focus":
+            dishonoredRoll.performFocusRoll(item, speaker);
+            break;
+        case "bonecharm":
+            dishonoredRoll.performBonecharmRoll(item, speaker);
+            break;
+        case "weapon":
+            dishonoredRoll.performWeaponRoll(item, speaker);
+            break;
+        case "armor":
+            dishonoredRoll.performArmorRoll(item, speaker);
+            break;
+        case "talent":
+            dishonoredRoll.performTalentRoll(item, speaker);
+            break;
+        case "contact":
+            dishonoredRoll.performContactRoll(item, speaker);
+            break;
+        case "power":
+            dishonoredRoll.performPowerRoll(item, speaker);
+            break;
         }
     }
 }
\ No newline at end of file
diff --git a/module/actors/sheets/character-sheet.js b/module/actors/sheets/character-sheet.js
index 16deb14..f743b5a 100644
--- a/module/actors/sheets/character-sheet.js
+++ b/module/actors/sheets/character-sheet.js
@@ -1,15 +1,20 @@
 import {
     DishonoredSharedActorFunctions
-} from '../actor.js'
+} from "../actor.js";
 
 export class DishonoredCharacterSheet extends ActorSheet {
-
     /** @override */
-    static get defaultOptions() {
+    static get defaultOptions () {
         return mergeObject(super.defaultOptions, {
             classes: ["dishonored", "sheet", "actor", "character"],
             width: 700,
-            height: 735,
+            height: 800,
+            tabs: [{
+                navSelector: ".sheet-tabs",
+                contentSelector: ".sheet-body",
+                initial: "focuses"
+            }],
+            scrollY: [".focuses", ".abilities", ".belongings", ".biography", ".notes"],
             dragDrop: [{
                 dragSelector: ".item-list .item",
                 dropSelector: null
@@ -21,66 +26,70 @@ export class DishonoredCharacterSheet extends ActorSheet {
 
     // If the player is not a GM and has limited permissions - send them to the limited sheet, otherwise, continue as usual.
     /** @override */
-    get template() {
-        if ( !game.user.isGM && this.actor.limited) return "systems/FVTT-Dishonored/templates/actors/limited-sheet.html";
-        return `systems/FVTT-Dishonored/templates/actors/character-sheet.html`;
-      }
+    get template () {
+        let versionInfo;
+        if (game.world.data) versionInfo = game.world.data.coreVersion;
+        else game.world.coreVersion;
+        if (!game.user.isGM && this.actor.limited) return "systems/FVTT-Dishonored/templates/actors/limited-sheet.html";
+        if (isNewerVersion(versionInfo,"0.8.-1")) return "systems/FVTT-Dishonored/templates/actors/character-sheet.html";
+        else return "systems/FVTT-Dishonored/templates/actors/character-sheet-0.7.9.html";
+    }
 
     /* -------------------------------------------- */
 
     /** @override */
     getData() {
-        const data = super.getData();
+        const sheetData = this.object;
         //Ensure skill and style values don't weigh over the max of 8.
-        if (data.data.skills.fight.value > 8) data.data.skills.fight.value = 8;
-        if (data.data.skills.move.value > 8) data.data.skills.move.value = 8;
-        if (data.data.skills.study.value > 8) data.data.skills.study.value = 8;
-        if (data.data.skills.survive.value > 8) data.data.skills.survive.value = 8;
-        if (data.data.skills.talk.value > 8) data.data.skills.talk.value = 8;
-        if (data.data.skills.tinker.value > 8) data.data.skills.tinker.value = 8;
-        if (data.data.styles.boldly.value > 8) data.data.styles.boldly.value = 8;
-        if (data.data.styles.carefully.value > 8) data.data.styles.carefully.value = 8;
-        if (data.data.styles.cleverly.value > 8) data.data.styles.cleverly.value = 8;
-        if (data.data.styles.forcefully.value > 8) data.data.styles.forcefully.value = 8;
-        if (data.data.styles.quietly.value > 8) data.data.styles.quietly.value = 8;
-        if (data.data.styles.swiftly.value > 8) data.data.styles.swiftly.value = 8;
+        if (sheetData.data.data.skills.fight.value > 8) sheetData.data.data.skills.fight.value = 8;
+        if (sheetData.data.data.skills.move.value > 8) sheetData.data.data.skills.move.value = 8;
+        if (sheetData.data.data.skills.study.value > 8) sheetData.data.data.skills.study.value = 8;
+        if (sheetData.data.data.skills.survive.value > 8) sheetData.data.data.skills.survive.value = 8;
+        if (sheetData.data.data.skills.talk.value > 8) sheetData.data.data.skills.talk.value = 8;
+        if (sheetData.data.data.skills.tinker.value > 8) sheetData.data.data.skills.tinker.value = 8;
+        if (sheetData.data.data.styles.boldly.value > 8) sheetData.data.data.styles.boldly.value = 8;
+        if (sheetData.data.data.styles.carefully.value > 8) sheetData.data.data.styles.carefully.value = 8;
+        if (sheetData.data.data.styles.cleverly.value > 8) sheetData.data.data.styles.cleverly.value = 8;
+        if (sheetData.data.data.styles.forcefully.value > 8) sheetData.data.data.styles.forcefully.value = 8;
+        if (sheetData.data.data.styles.quietly.value > 8) sheetData.data.data.styles.quietly.value = 8;
+        if (sheetData.data.data.styles.swiftly.value > 8) sheetData.data.data.styles.swiftly.value = 8;
 
         // Checks if any values are larger than their relevant max, if so, set to max. 
-        if (data.data.void.value > data.data.void.max) data.data.void.value = data.data.void.max;
-        if (data.data.stress.value > data.data.stress.max) data.data.stress.value = data.data.stress.max;
+        if (sheetData.data.data.void.value > sheetData.data.data.void.max) sheetData.data.data.void.value = sheetData.data.data.void.max;
+        if (sheetData.data.data.stress.value > sheetData.data.data.stress.max) sheetData.data.data.stress.value = sheetData.data.data.stress.max;
         // For some reason - this is treated as a string, so this enforce use of integers here.
-        if (parseInt(data.data.mana.value) > parseInt(data.data.mana.max)) data.data.mana.value = data.data.mana.max;
+        if (parseInt(sheetData.data.data.mana.value) > parseInt(sheetData.data.data.mana.max)) sheetData.data.data.mana.value = sheetData.data.data.mana.max;
 
         // Checks if mana max is not equal to double the void max, if it isn't, set it so.
-        if (data.data.mana.max != 2*data.data.void.max) data.data.mana.max = 2*data.data.void.max;
+        if (sheetData.data.data.mana.max != 2*sheetData.data.data.void.max) sheetData.data.data.mana.max = 2*sheetData.data.data.void.max;
 
         //Ensure skill and style values aren't lower than 4.
-        if (data.data.skills.fight.value < 4) data.data.skills.fight.value = 4;
-        if (data.data.skills.move.value < 4) data.data.skills.move.value = 4;
-        if (data.data.skills.study.value < 4) data.data.skills.study.value = 4;
-        if (data.data.skills.survive.value < 4) data.data.skills.survive.value = 4;
-        if (data.data.skills.talk.value < 4) data.data.skills.talk.value = 4;
-        if (data.data.skills.tinker.value < 4) data.data.skills.tinker.value = 4;
-        if (data.data.styles.boldly.value < 4) data.data.styles.boldly.value = 4;
-        if (data.data.styles.carefully.value < 4) data.data.styles.carefully.value = 4;
-        if (data.data.styles.cleverly.value < 4) data.data.styles.cleverly.value = 4;
-        if (data.data.styles.forcefully.value < 4) data.data.styles.forcefully.value = 4;
-        if (data.data.styles.quietly.value < 4) data.data.styles.quietly.value = 4;
-        if (data.data.styles.swiftly.value < 4) data.data.styles.swiftly.value = 4;
-
-        // Checks if any values are below their theoretical minimum, if so - set it to the very minimum.
-        if (data.data.void.value < 0) data.data.void.value = 0;
-        if (data.data.void.max < 1) data.data.void.max = 1;
-        if (data.data.stress.value < 0) data.data.stress.value = 0;
-        if (data.data.experience < 0) data.data.experience = 0;
-        if (data.data.mana.value < 0) data.data.mana.value = 0;
-        if (data.data.mana.max < 2) data.data.mana.max = 2;
+        if (sheetData.data.data.skills.fight.value < 4) sheetData.data.data.skills.fight.value = 4;
+        if (sheetData.data.data.skills.move.value < 4) sheetData.data.data.skills.move.value = 4;
+        if (sheetData.data.data.skills.study.value < 4) sheetData.data.data.skills.study.value = 4;
+        if (sheetData.data.data.skills.survive.value < 4) sheetData.data.data.skills.survive.value = 4;
+        if (sheetData.data.data.skills.talk.value < 4) sheetData.data.data.skills.talk.value = 4;
+        if (sheetData.data.data.skills.tinker.value < 4) sheetData.data.data.skills.tinker.value = 4;
+        if (sheetData.data.data.styles.boldly.value < 4) sheetData.data.data.styles.boldly.value = 4;
+        if (sheetData.data.data.styles.carefully.value < 4) sheetData.data.data.styles.carefully.value = 4;
+        if (sheetData.data.data.styles.cleverly.value < 4) sheetData.data.data.styles.cleverly.value = 4;
+        if (sheetData.data.data.styles.forcefully.value < 4) sheetData.data.data.styles.forcefully.value = 4;
+        if (sheetData.data.data.styles.quietly.value < 4) sheetData.data.data.styles.quietly.value = 4;
+        if (sheetData.data.data.styles.swiftly.value < 4) sheetData.data.data.styles.swiftly.value = 4;
+
+        // Checks if any values are below their theoretical minimum, if so set it to the very minimum.
+        if (sheetData.data.data.void.value < 0) sheetData.data.data.void.value = 0;
+        if (sheetData.data.data.void.max < 1) sheetData.data.data.void.max = 1;
+        if (sheetData.data.data.stress.value < 0) sheetData.data.data.stress.value = 0;
+        if (sheetData.data.data.experience < 0) sheetData.data.data.experience = 0;
+        if (sheetData.data.data.mana.value < 0) sheetData.data.data.mana.value = 0;
+        if (sheetData.data.data.mana.max < 2) sheetData.data.data.mana.max = 2;
+        $.each(sheetData.data.items, (key, item) => {
+            if (item.img == "icons/svg/item-bag.svg") item.img = "/systems/FVTT-Dishonored/icons/dishonoredlogo.webp";
+            if (item.img == "icons/svg/mystery-man.svg") item.img = "/systems/FVTT-Dishonored/icons/dishonoredlogo.webp";
+        });
+        return sheetData.data;
         
-        $.each(data.items, (key, item) => {
-            if (!item.img) item.img = '/systems/FVTT-Dishonored/icons/dishonoredlogo.webp';
-        })
-
-        return data;
     }
 
     /* -------------------------------------------- */
@@ -89,6 +98,11 @@ export class DishonoredCharacterSheet extends ActorSheet {
     activateListeners(html) {
         super.activateListeners(html);
         
+        // Sets up a declaration to be able to check the version easily.
+        let versionInfo;
+        if (game.world.data) versionInfo = game.world.data.coreVersion;
+        else game.world.coreVersion;
+
         // Opens the class DishonoredSharedActorFunctions for access at various stages.
         let dishonoredActor = new DishonoredSharedActorFunctions();
 
@@ -96,206 +110,176 @@ export class DishonoredCharacterSheet extends ActorSheet {
         if ( !game.user.isGM && this.actor.limited) return;
 
         // We use i alot in for loops. Best to assign it now for use later in multiple places.
-        var i;
+        let i;
+
+        // We use div alot to define text blocks. Define here.
+        let div;
 
         // Here we are checking how many bonecharms, helmets and armors are equipped. 
         // The player can only have three bonecharms, and one of each armor type. As such, we will use this later.
-        var armorNumber = 0;
-        var bonecharmNumber = 0;
-        var helmetNumber = 0;
-        var stressTrackMax = 0;
-        function armorCount(currentActor) {
-            armorNumber = 0;
-            helmetNumber = 0;
-            currentActor.actor.items.forEach((values) => {
-                if (values.type == "armor") {
-                    if (values.data.data.helmet == true && values.data.data.equipped == true) helmetNumber+= 1;
-                    if (values.data.data.helmet == false && values.data.data.equipped == true) armorNumber+= 1;
-                }
-            });
-        }
-        function bonecharmCount(currentActor) {
-            bonecharmNumber = 0;
-            currentActor.actor.items.forEach((values) => {
-                if (values.type == "bonecharm" && values.data.data.equipped == true) bonecharmNumber+= 1;
-            });
-            html.find('[name ="data.bonecharmequipped"]')[0].value = bonecharmNumber;
-        }
-        armorCount(this);
-        bonecharmCount(this);
+        let armorNumber = 0;
+        let bonecharmNumber = 0;
+        let helmetNumber = 0;
+        let stressTrackMax = 0;
+        armorNumber = 0;
+        bonecharmNumber = 0;
+        helmetNumber = 0;
+        this.actor.items.forEach((values) => {
+            if (values.type == "armor") {
+                if (values.data.data.helmet == true && values.data.data.equipped == true) helmetNumber+= 1;
+                if (values.data.data.helmet == false && values.data.data.equipped == true) armorNumber+= 1;
+            }
+            else if (values.type == "bonecharm" && values.data.data.equipped == true) bonecharmNumber+= 1;
+        });
+        html.find("[name =\"data.bonecharmequipped\"]")[0].value = bonecharmNumber;
+
         // For ease of access we may as well turn the tooltip for bonecharm counts red.
         if(bonecharmNumber > 3) {
-            html.find('.bonecharmCount')[0].style.backgroundColor = "#fd0000";
-            html.find('.bonecharmCount')[0].style.color = "#ffffff";
+            html.find(".bonecharmCount")[0].style.backgroundColor = "#fd0000";
+            html.find(".bonecharmCount")[0].style.color = "#ffffff";
         }
 
         // This creates a dynamic Void Point tracker. It polls for the hidden control "max-void" and for the value, 
         // creates a new div for each and places it under a child called "bar-void-renderer"
-        var voidPointsMax = html.find('#max-void')[0].value;
+        let voidPointsMax = html.find("#max-void")[0].value;
         for (i = 1; i <= voidPointsMax; i++) {
-            var div = document.createElement("DIV");
+            div = document.createElement("DIV");
             div.className = "box";
             div.id = "void-" + i;
             div.innerHTML = i;
-            div.style = "width: calc(100% / " + html.find('#max-void')[0].value + ");"
-            html.find('#bar-void-renderer')[0].appendChild(div);
+            div.style = "width: calc(100% / " + html.find("#max-void")[0].value + ");";
+            html.find("#bar-void-renderer")[0].appendChild(div);
         }
 
         // This creates a dynamic Stress tracker. It polls for the value of the survive skill, adds any protection from armor. 
         // With the total value, creates a new div for each and places it under a child called "bar-stress-renderer".
         function stressTrackUpdate() {
-            stressTrackMax = parseInt(html.find('#survive')[0].value);
-            var armor = html.find('[data-item-type="armor"]');
+            stressTrackMax = parseInt(html.find("#survive")[0].value);
+            let armor = html.find("[data-item-type=\"armor\"]");
             for (i = 0; i < armor.length; i++) {
-                if (armor[i].getAttribute("data-item-equipped") == 'true') {
+                if (armor[i].getAttribute("data-item-equipped") == "true") {
                     stressTrackMax += parseInt($(armor[i]).children()[2].innerHTML);
                 }
             }
             // This checks that the max-stress hidden field is equal to the calculated Max Stress value, if not it makes it so.
-            if (html.find('#max-stress')[0].value != stressTrackMax)
+            if (html.find("#max-stress")[0].value != stressTrackMax)
             {
-                html.find('#max-stress')[0].value = stressTrackMax;
+                html.find("#max-stress")[0].value = stressTrackMax;
             }
-            html.find('#bar-stress-renderer').empty();
+            html.find("#bar-stress-renderer").empty();
             for (i = 1; i <= stressTrackMax; i++) {
-                var div = document.createElement("DIV");
+                div = document.createElement("DIV");
                 div.className = "box";
                 div.id = "stress-" + i;
                 div.innerHTML = i;
-                div.style = "width: calc(100% / " + html.find('#max-stress')[0].value + ");"
-                html.find('#bar-stress-renderer')[0].appendChild(div);
+                div.style = "width: calc(100% / " + html.find("#max-stress")[0].value + ");";
+                html.find("#bar-stress-renderer")[0].appendChild(div);
             }
         }
         stressTrackUpdate();
 
         // This creates a dynamic Experience tracker. For this it uses a max value of 30. This can be configured here. 
         // It creates a new div for each and places it under a child called "bar-void-renderer"
-        var expPointsMax = game.settings.get("FVTT-Dishonored", "maxNumberOfExperience");
-        var i;
+        let expPointsMax = game.settings.get("FVTT-Dishonored", "maxNumberOfExperience");
         for (i = 1; i <= expPointsMax; i++) {
-            var div = document.createElement("DIV");
+            div = document.createElement("DIV");
             div.className = "box";
             div.id = "exp-" + i;
             div.innerHTML = i;
-            div.style = "width: calc(100% / " + expPointsMax + ");"
-            html.find('#bar-exp-renderer')[0].appendChild(div);
+            div.style = "width: calc(100% / " + expPointsMax + ");";
+            html.find("#bar-exp-renderer")[0].appendChild(div);
         }
 
-        // This creates a dynamic Momentum tracker. Dishonored only has 6 momentum, so this should never be changed. But this can be configured here. 
-        // It creates a new div for each and places it under a child called "bar-mom-renderer"
-        // var momPointsMax = 6;
-        // var i;
-        // for (i = 1; i <= momPointsMax; i++) {
-        //     var div = document.createElement("DIV");
-        //     div.className = "box";
-        //     div.id = "mom-" + i;
-        //     div.innerHTML = i;
-        //     div.style = "width: calc(100% / " + momPointsMax + ");"
-        //     html.find('#bar-mom-renderer')[0].appendChild(div);
-        // }
-
         // Fires the function dishonoredRenderTracks as soon as the parameters exist to do so.
-        // dishonoredActor.dishonoredRenderTracks(html, stressTrackMax, voidPointsMax, expPointsMax, momPointsMax);
         dishonoredActor.dishonoredRenderTracks(html, stressTrackMax, voidPointsMax, expPointsMax);
 
         // This allows for each item-edit image to link open an item sheet. This uses Simple Worldbuilding System Code.
-        html.find('.control.edit').click(ev => {
+        html.find(".control.edit").click(ev => {
             const li = $(ev.currentTarget).parents(".entry");
-            const item = this.actor.getOwnedItem(li.data("itemId"));
+            const item = this.actor.items.get(li.data("itemId"));
             item.sheet.render(true);
         });
 
         // This if statement checks if the form is editable, if not it hides control used by the owner, then aborts any more of the script.
         if (!this.options.editable) {
             // This hides the ability to Perform a Skill Test for the character.
-            for (i = 0; i < html.find('.check-button').length; i++) {
-                html.find('.check-button')[i].style.display = 'none';
+            for (i = 0; i < html.find(".check-button").length; i++) {
+                html.find(".check-button")[i].style.display = "none";
             }
             // This hides the ability to change the amount of Void Points the character has.
-            for (i = 0; i < html.find('.voidchange').length; i++) {
-                html.find('.voidchange')[i].style.display = 'none';
+            for (i = 0; i < html.find(".voidchange").length; i++) {
+                html.find(".voidchange")[i].style.display = "none";
             }
             // This hides all toggle, add and delete item images.
-            for (i = 0; i < html.find('.control.create').length; i++) {
-                html.find('.control.create')[i].style.display = 'none';
+            for (i = 0; i < html.find(".control.create").length; i++) {
+                html.find(".control.create")[i].style.display = "none";
             }
-            for (i = 0; i < html.find('.control.delete').length; i++) {
-                html.find('.control.delete')[i].style.display = 'none';
+            for (i = 0; i < html.find(".control.delete").length; i++) {
+                html.find(".control.delete")[i].style.display = "none";
             }
-            for (i = 0; i < html.find('.control.toggle').length; i++) {
-                html.find('.control.delete')[i].style.display = 'none';
+            for (i = 0; i < html.find(".control.toggle").length; i++) {
+                html.find(".control.delete")[i].style.display = "none";
             }
             // This hides all skill and style check boxes (and titles)
-            for (i = 0; i < html.find('.selector').length; i++) {
-                html.find('.selector')[i].style.display = 'none';
+            for (i = 0; i < html.find(".selector").length; i++) {
+                html.find(".selector")[i].style.display = "none";
             }
-            for (i = 0; i < html.find('.selector').length; i++) {
-                html.find('.selector')[i].style.display = 'none';
+            for (i = 0; i < html.find(".selector").length; i++) {
+                html.find(".selector")[i].style.display = "none";
             }
             // Remove hover CSS from clickables that are no longer clickable.
-            for (i = 0; i < html.find('.box').length; i++) {
-                html.find('.box')[i].classList.add("unset-clickables");
+            for (i = 0; i < html.find(".box").length; i++) {
+                html.find(".box")[i].classList.add("unset-clickables");
             }
-            for (i = 0; i < html.find('.rollable').length; i++) {
-                html.find('.rollable')[i].classList.add("unset-clickables");
+            for (i = 0; i < html.find(".rollable").length; i++) {
+                html.find(".rollable")[i].classList.add("unset-clickables");
             }
             return;
-        };
+        }
 
         // This toggles whether the item is equipped or not. Equipped items count towards item caps.
-        html.find('.control.toggle').click(ev => {
-            var itemType = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-type");
-            var itemId = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-id");
-            var item = this.actor.getOwnedItem(itemId);
-            var itemData = item.data;
+        html.find(".control.toggle").click(ev => {
+            let itemId = ev.currentTarget.closest(".entry").dataset.itemId;
+            let item = this.actor.items.get(itemId);
+            let itemType = ev.currentTarget.closest(".entry").dataset.itemType;
             if (itemType == "armor") var isHelmet = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-helmet");
-            if (this.actor.items.get(itemId).data.data.equipped == true) {
-                itemData.data.equipped = false;
-                $(ev.currentTarget).children()[0].classList.remove("fa-toggle-on");
-                $(ev.currentTarget).children()[0].classList.add("fa-toggle-off");
-                $(ev.currentTarget).parents(".entry")[0].setAttribute("data-item-equipped", "false")
-            }
-            else if (itemType == "bonecharm" && bonecharmNumber >= 3) {
-                ui.notifications.error(game.i18n.localize('dishonored.notifications.tooManyBonecharms'));
-            }
-            else if (itemType == "armor" && isHelmet == 'false' && armorNumber >= 1) {
-                ui.notifications.error(game.i18n.localize('dishonored.notifications.armorAlreadyEquipped'));
-            }
-            else if (itemType == "armor" && isHelmet == 'true' && helmetNumber >= 1) {
-                ui.notifications.error(game.i18n.localize('dishonored.notifications.helmentAlreadyEquipped'));
-            }
-            else {
-                itemData.data.equipped = true;
-                $(ev.currentTarget).children()[0].classList.remove("fa-toggle-off");
-                $(ev.currentTarget).children()[0].classList.add("fa-toggle-on");
-                $(ev.currentTarget).parents(".entry")[0].setAttribute("data-item-equipped", "true")
+            if (item.data.data.equipped === false) {
+                if (itemType == "bonecharm" && bonecharmNumber >= 3) {
+                    ui.notifications.error(game.i18n.localize("dishonored.notifications.tooManyBonecharms"));
+                    return false;
+                }
+                else if (itemType == "armor" && isHelmet == "false" && armorNumber >= 1) {
+                    ui.notifications.error(game.i18n.localize("dishonored.notifications.armorAlreadyEquipped"));
+                    return false;
+                }
+                else if (itemType == "armor" && isHelmet == "true" && helmetNumber >= 1) {
+                    ui.notifications.error(game.i18n.localize("dishonored.notifications.helmetAlreadyEquipped"));
+                    return false;
+                }
             }
-            item.update(itemData);
-            stressTrackUpdate();
-            dishonoredActor.dishonoredRenderTracks(html, stressTrackMax);
-            this.submit();
+            return this.actor.items.get(itemId).update({["data.equipped"]: !getProperty(item.data, "data.equipped")});
         });
 
         // This allows for all items to be rolled, it gets the current targets type and id and sends it to the rollGenericItem function.
-        html.find('.rollable').click(ev =>{
-            var itemType = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-type");
-            var itemId = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-id");
+        html.find(".rollable").click(ev =>{
+            let itemType = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-type");
+            let itemId = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-id");
             dishonoredActor.rollGenericItem(ev, itemType, itemId, this.actor);
-        })
+        });
 
         // Allows item-create images to create an item of a type defined individually by each button. This uses code found via the Foundry VTT System Tutorial.
-        html.find('.control.create').click(ev => {
+        html.find(".control.create").click(ev => {
             ev.preventDefault();
             const header = ev.currentTarget;
             const type = header.dataset.type;
             const data = duplicate(header.dataset);
-            const name = game.i18n.format("dishonored.actor.item.adjectiveNew") + ' ' + type.charAt(0).toUpperCase() + type.slice(1);
+            const name = game.i18n.format("dishonored.actor.item.adjectiveNew") + " " + type.charAt(0).toUpperCase() + type.slice(1);
             if (type == "bonecharm" && bonecharmNumber >= 3) {
-                ui.notifications.info(game.i18n.localize('dishonored.notifications.tooManyBonecharmsNew'));
+                ui.notifications.info(game.i18n.localize("dishonored.notifications.tooManyBonecharmsNew"));
                 data.equipped = false;
             }
             if (type == "armor" && armorNumber >= 1) {
-                ui.notifications.info(game.i18n.localize('dishonored.notifications.armorAlreadyEquippedNew'));
+                ui.notifications.info(game.i18n.localize("dishonored.notifications.armorAlreadyEquippedNew"));
                 data.equipped = false;
             }
             const itemData = {
@@ -305,70 +289,49 @@ export class DishonoredCharacterSheet extends ActorSheet {
             };
             delete itemData.data["type"];
             stressTrackUpdate();
-            return this.actor.createOwnedItem(itemData);
+            // Check if we are using a Foundry version above 0.8.0, use new code.
+            if (isNewerVersion(versionInfo,"0.8.-1")) return this.actor.createEmbeddedDocuments("Item",[(itemData)]);
+            else return this.actor.createOwnedItem(itemData);
         });
 
         // Allows item-delete images to allow deletion of the selected item. This uses Simple Worldbuilding System Code.
-        html.find('.control.delete').click(ev => {
+        html.find(".control.delete").click(ev => {
             const li = $(ev.currentTarget).parents(".entry");
-            this.actor.deleteOwnedItem(li.data("itemId"));
-            li.slideUp(200, () => this.render(false));
+            // Check if we are using a Foundry version above 0.8.0, use new code.
+            if (isNewerVersion(versionInfo,"0.8.-1")) this.actor.deleteEmbeddedDocuments("Item",[li.data("itemId")]);
+            else this.actor.deleteOwnedItem(li.data("itemId"));
+            return li.slideUp(200, () => this.render(false));
         });
 
         // Reads if a experience track box has been clicked, and if it has will either: set the value to the clicked box, or reduce the value by one. 
         // This check is dependent on various requirements, see comments in code.
-        html.find('[id^="exp"]').click(ev => {
-            var newTotalObject = $(ev.currentTarget)[0];
-            var newTotal = newTotalObject.id.replace(/\D/g, '');
+        html.find("[id^=\"exp\"]").click(ev => {
+            let newTotalObject = $(ev.currentTarget)[0];
+            let newTotal = newTotalObject.id.replace(/\D/g, "");
+            let total;
             // data-selected stores whether the track box is currently activated or not. This checks that the box is activated
             if (newTotalObject.getAttribute("data-selected") === "true") {
                 // Now we check that the "next" track box is not activated. 
                 // If there isn't one, or it isn't activated, we only want to decrease the value by 1 rather than setting the value.
-                var nextCheck = 'exp-' + (parseInt(newTotal) + 1);
-                if (!html.find('#'+nextCheck)[0] || html.find('#'+nextCheck)[0].getAttribute("data-selected") != "true") {
-                    html.find('#total-exp')[0].value = html.find('#total-exp')[0].value - 1;
+                let nextCheck = "exp-" + (parseInt(newTotal) + 1);
+                if (!html.find("#"+nextCheck)[0] || html.find("#"+nextCheck)[0].getAttribute("data-selected") != "true") {
+                    html.find("#total-exp")[0].value = html.find("#total-exp")[0].value - 1;
                     this.submit();
                 } 
                 // If it isn't caught by the if, the next box is likely activated. If something happened, its safer to set the value anyway.
                 else {
-                    var total = html.find('#total-exp')[0].value;
+                    total = html.find("#total-exp")[0].value;
                     if (total != newTotal) {
-                        html.find('#total-exp')[0].value = newTotal;
+                        html.find("#total-exp")[0].value = newTotal;
                         this.submit();
                     }
                 }
             } 
             // If the clicked box wasn't activated, we need to activate it now.
             else {
-                var total = html.find('#total-exp')[0].value;
-                if (total != newTotal) {
-                    html.find('#total-exp')[0].value = newTotal;
-                    this.submit();
-                }
-            }
-        });
-
-        // Reads if a momentum track box has been clicked, and if it has will either: set the value to the clicked box, or reduce the value by one.
-        // See line 186-220 for a more detailed break down on the context of each scenario. Momentum uses the same logic.
-        html.find('[id^="mom"]').click(ev => {
-            var newTotalObject = $(ev.currentTarget)[0];
-            var newTotal = newTotalObject.id.substring(4);
-            if (newTotalObject.getAttribute("data-selected") === "true") {
-                var nextCheck = 'mom-' + (parseInt(newTotal) + 1);
-                if (!html.find('#'+nextCheck)[0] || html.find('#'+nextCheck)[0].getAttribute("data-selected") != "true") {
-                    html.find('#total-mom')[0].value = html.find('#total-mom')[0].value - 1;
-                    this.submit();
-                } else {
-                    var total = html.find('#total-mom')[0].value;
-                    if (total != newTotal) {
-                        html.find('#total-mom')[0].value = newTotal;
-                        this.submit();
-                    }
-                }
-            } else {
-                var total = html.find('#total-mom')[0].value;
+                total = html.find("#total-exp")[0].value;
                 if (total != newTotal) {
-                    html.find('#total-mom')[0].value = newTotal;
+                    html.find("#total-exp")[0].value = newTotal;
                     this.submit();
                 }
             }
@@ -376,25 +339,26 @@ export class DishonoredCharacterSheet extends ActorSheet {
 
         // Reads if a stress track box has been clicked, and if it has will either: set the value to the clicked box, or reduce the value by one.
         // See line 186-220 for a more detailed break down on the context of each scenario. Stress uses the same logic.
-        html.find('[id^="stress"]').click(ev => {
-            var newTotalObject = $(ev.currentTarget)[0];
-            var newTotal = newTotalObject.id.substring(7);
+        html.find("[id^=\"stress\"]").click(ev => {
+            let newTotalObject = $(ev.currentTarget)[0];
+            let newTotal = newTotalObject.id.substring(7);
+            let total;
             if (newTotalObject.getAttribute("data-selected") === "true") {
-                var nextCheck = 'stress-' + (parseInt(newTotal) + 1);
-                if (!html.find('#'+nextCheck)[0] || html.find('#'+nextCheck)[0].getAttribute("data-selected") != "true") {
-                    html.find('#total-stress')[0].value = html.find('#total-stress')[0].value - 1;
+                let nextCheck = "stress-" + (parseInt(newTotal) + 1);
+                if (!html.find("#"+nextCheck)[0] || html.find("#"+nextCheck)[0].getAttribute("data-selected") != "true") {
+                    html.find("#total-stress")[0].value = html.find("#total-stress")[0].value - 1;
                     this.submit();
                 } else {
-                    var total = html.find('#total-stress')[0].value;
+                    total = html.find("#total-stress")[0].value;
                     if (total != newTotal) {
-                        html.find('#total-stress')[0].value = newTotal;
+                        html.find("#total-stress")[0].value = newTotal;
                         this.submit();
                     }
                 }
             } else {
-                var total = html.find('#total-stress')[0].value;
+                total = html.find("#total-stress")[0].value;
                 if (total != newTotal) {
-                    html.find('#total-stress')[0].value = newTotal;
+                    html.find("#total-stress")[0].value = newTotal;
                     this.submit();
                 }
             }
@@ -402,51 +366,52 @@ export class DishonoredCharacterSheet extends ActorSheet {
 
         // Reads if a void track box has been clicked, and if it has will either: set the value to the clicked box, or reduce the value by one.
         // See line 186-220 for a more detailed break down on the context of each scenario. Void uses the same logic.
-        html.find('[id^="void"]').click(ev => {
-            var newTotalObject = $(ev.currentTarget)[0];
-            var newTotal = newTotalObject.id.replace(/\D/g, '');
+        html.find("[id^=\"void\"]").click(ev => {
+            let newTotalObject = $(ev.currentTarget)[0];
+            let newTotal = newTotalObject.id.replace(/\D/g, "");
+            let total;
             if (newTotalObject.getAttribute("data-selected") === "true") {
-                var nextCheck = 'void-' + (parseInt(newTotal) + 1);
-                if (!html.find('#'+nextCheck)[0] || html.find('#'+nextCheck)[0].getAttribute("data-selected") != "true") {
-                    html.find('#total-void')[0].value = html.find('#total-void')[0].value - 1;
+                let nextCheck = "void-" + (parseInt(newTotal) + 1);
+                if (!html.find("#"+nextCheck)[0] || html.find("#"+nextCheck)[0].getAttribute("data-selected") != "true") {
+                    html.find("#total-void")[0].value = html.find("#total-void")[0].value - 1;
                     this.submit();
                 } else {
-                    var total = html.find('#total-void')[0].value;
+                    total = html.find("#total-void")[0].value;
                     if (total != newTotal) {
-                        html.find('#total-void')[0].value = newTotal;
+                        html.find("#total-void")[0].value = newTotal;
                         this.submit();
                     }
                 }
             } else {
-                var total = html.find('#total-void')[0].value;
+                total = html.find("#total-void")[0].value;
                 if (total != newTotal) {
-                    html.find('#total-void')[0].value = newTotal;
+                    html.find("#total-void")[0].value = newTotal;
                     this.submit();
                 }
             }
         });
         
         // If the decrease-void-max button is clicked it removes a point off the max-void and two points from max-mana.
-        html.find('[id="decrease-void-max"]').click(ev => {
-            html.find('#max-void')[0].value--;
-            html.find('#max-mana')[0].value--;
-            html.find('#max-mana')[0].value--;
+        html.find("[id=\"decrease-void-max\"]").click(ev => {
+            html.find("#max-void")[0].value--;
+            html.find("#max-mana")[0].value--;
+            html.find("#max-mana")[0].value--;
             this.submit();
         });
 
         // If the increase-void-max button is clicked it adds a point to the max-void and two points to max-mana.
-        html.find('[id="increase-void-max"]').click(ev => {
-            html.find('#max-void')[0].value++;
-            html.find('#max-mana')[0].value++;
-            html.find('#max-mana')[0].value++;
+        html.find("[id=\"increase-void-max\"]").click(ev => {
+            html.find("#max-void")[0].value++;
+            html.find("#max-mana")[0].value++;
+            html.find("#max-mana")[0].value++;
             this.submit();
         });
 
         // Turns the Skill checkboxes into essentially a radio button. It removes any other ticks, and then checks the new skill.
         // Finally a submit is required as data has changed.
-        html.find('.selector.skill').click(ev => {
+        html.find(".selector.skill").click(ev => {
             for (i = 0; i <= 5; i++) {
-                html.find('.selector.skill')[i].checked = false;
+                html.find(".selector.skill")[i].checked = false;
             }
             $(ev.currentTarget)[0].checked = true;
             this.submit();
@@ -454,31 +419,35 @@ export class DishonoredCharacterSheet extends ActorSheet {
 
         // Turns the Style checkboxes into essentially a radio button. It removes any other ticks, and then checks the new style.
         // Finally a submit is required as data has changed.
-        html.find('.selector.style').click(ev => {
+        html.find(".selector.style").click(ev => {
             for (i = 0; i <= 5; i++) {
-                html.find('.selector.style')[i].checked = false;
+                html.find(".selector.style")[i].checked = false;
             }
             $(ev.currentTarget)[0].checked = true;
             this.submit();
         });
 
         // If the check-button is clicked it grabs the selected skill and the selected style and fires the method rollSkillTest. See actor.js for further info.
-        html.find('.check-button').click(ev => {
+        html.find(".check-button").click(ev => {
+            let selectedSkill;
+            let selectedSkillValue;
+            let selectedStyle;
+            let selectedStyleValue;
             for (i = 0; i <= 5; i++) {
-                if (html.find('.selector.skill')[i].checked === true) {
-                    var selectedSkill = html.find('.selector.skill')[i].id;
-                    var selectedSkill = selectedSkill.slice(0, -9)
-                    var selectedSkillValue = html.find('#'+selectedSkill)[0].value;
+                if (html.find(".selector.skill")[i].checked === true) {
+                    let selectedSkillHTML = html.find(".selector.skill")[i].id;
+                    selectedSkill = selectedSkillHTML.slice(0, -9);
+                    selectedSkillValue = html.find("#"+selectedSkill)[0].value;
                 }
             }
             for (i = 0; i <= 5; i++) {
-                if (html.find('.selector.style')[i].checked === true) {
-                    var selectedStyle = html.find('.selector.style')[i].id;
-                    var selectedStyle = selectedStyle.slice(0, -9)
-                    var selectedStyleValue = html.find('#'+selectedStyle)[0].value;
+                if (html.find(".selector.style")[i].checked === true) {
+                    let selectedStyleHTML = html.find(".selector.style")[i].id;
+                    selectedStyle = selectedStyleHTML.slice(0, -9);
+                    selectedStyleValue = html.find("#"+selectedStyle)[0].value;
                 }
             }
-            var checkTarget = parseInt(selectedSkillValue) + parseInt(selectedStyleValue);
+            let checkTarget = parseInt(selectedSkillValue) + parseInt(selectedStyleValue);
 
             dishonoredActor.rollSkillTest(ev, checkTarget, selectedSkill, selectedStyle, this.actor);
         });
diff --git a/module/actors/sheets/npc-sheet.js b/module/actors/sheets/npc-sheet.js
index 4fd94fb..67393d4 100644
--- a/module/actors/sheets/npc-sheet.js
+++ b/module/actors/sheets/npc-sheet.js
@@ -1,15 +1,20 @@
 import {
     DishonoredSharedActorFunctions
-} from '../actor.js'
+} from "../actor.js";
 
 export class DishonoredNPCSheet extends ActorSheet {
-
     /** @override */
-    static get defaultOptions() {
+    static get defaultOptions () {
         return mergeObject(super.defaultOptions, {
             classes: ["dishonored", "sheet", "actor", "npc"],
             width: 700,
-            height: 735,
+            height: 700,
+            tabs: [{
+                navSelector: ".sheet-tabs",
+                contentSelector: ".sheet-body",
+                initial: "focuses"
+            }],
+            scrollY: [".focuses", ".abilities", ".belongings", ".biography", ".notes"],
             dragDrop: [{
                 dragSelector: ".item-list .item",
                 dropSelector: null
@@ -18,59 +23,58 @@ export class DishonoredNPCSheet extends ActorSheet {
     }
 
     /* -------------------------------------------- */
+
     // If the player is not a GM and has limited permissions - send them to the limited sheet, otherwise, continue as usual.
     /** @override */
-    get template() {
-        if ( !game.user.isGM && this.actor.limited) return "systems/FVTT-Dishonored/templates/actors/limited-sheet.html";
-        return `systems/FVTT-Dishonored/templates/actors/npc-sheet.html`;
-      }
+    get template () {
+        if (!game.user.isGM && this.actor.limited) return "systems/FVTT-Dishonored/templates/actors/limited-sheet.html";
+        return "systems/FVTT-Dishonored/templates/actors/npc-sheet.html";
+    }
 
     /* -------------------------------------------- */
 
     /** @override */
     getData() {
-        const data = super.getData();
-        data.dtypes = ["String", "Number", "Boolean"];
-
+        const sheetData = this.object;
         //Ensure skill and style values don't weigh over the max of 8.
-        if (data.data.skills.fight.value > 8) data.data.skills.fight.value = 8;
-        if (data.data.skills.move.value > 8) data.data.skills.move.value = 8;
-        if (data.data.skills.study.value > 8) data.data.skills.study.value = 8;
-        if (data.data.skills.survive.value > 8) data.data.skills.survive.value = 8;
-        if (data.data.skills.talk.value > 8) data.data.skills.talk.value = 8;
-        if (data.data.skills.tinker.value > 8) data.data.skills.tinker.value = 8;
-        if (data.data.styles.boldly.value > 8) data.data.styles.boldly.value = 8;
-        if (data.data.styles.carefully.value > 8) data.data.styles.carefully.value = 8;
-        if (data.data.styles.cleverly.value > 8) data.data.styles.cleverly.value = 8;
-        if (data.data.styles.forcefully.value > 8) data.data.styles.forcefully.value = 8;
-        if (data.data.styles.quietly.value > 8) data.data.styles.quietly.value = 8;
-        if (data.data.styles.swiftly.value > 8) data.data.styles.swiftly.value = 8;
-
-        // Checks if stress is larger than its max, if so, set to max. 
-        if (data.data.stress.value > data.data.stress.max) data.data.stress.value = data.data.stress.max;
+        if (sheetData.data.data.skills.fight.value > 8) sheetData.data.data.skills.fight.value = 8;
+        if (sheetData.data.data.skills.move.value > 8) sheetData.data.data.skills.move.value = 8;
+        if (sheetData.data.data.skills.study.value > 8) sheetData.data.data.skills.study.value = 8;
+        if (sheetData.data.data.skills.survive.value > 8) sheetData.data.data.skills.survive.value = 8;
+        if (sheetData.data.data.skills.talk.value > 8) sheetData.data.data.skills.talk.value = 8;
+        if (sheetData.data.data.skills.tinker.value > 8) sheetData.data.data.skills.tinker.value = 8;
+        if (sheetData.data.data.styles.boldly.value > 8) sheetData.data.data.styles.boldly.value = 8;
+        if (sheetData.data.data.styles.carefully.value > 8) sheetData.data.data.styles.carefully.value = 8;
+        if (sheetData.data.data.styles.cleverly.value > 8) sheetData.data.data.styles.cleverly.value = 8;
+        if (sheetData.data.data.styles.forcefully.value > 8) sheetData.data.data.styles.forcefully.value = 8;
+        if (sheetData.data.data.styles.quietly.value > 8) sheetData.data.data.styles.quietly.value = 8;
+        if (sheetData.data.data.styles.swiftly.value > 8) sheetData.data.data.styles.swiftly.value = 8;
+
+        // Checks if any values are larger than their relevant max, if so, set to max. 
+        if (sheetData.data.data.stress.value > sheetData.data.data.stress.max) sheetData.data.data.stress.value = sheetData.data.data.stress.max;
 
         //Ensure skill and style values aren't lower than 4.
-        if (data.data.skills.fight.value < 4) data.data.skills.fight.value = 4;
-        if (data.data.skills.move.value < 4) data.data.skills.move.value = 4;
-        if (data.data.skills.study.value < 4) data.data.skills.study.value = 4;
-        if (data.data.skills.survive.value < 4) data.data.skills.survive.value = 4;
-        if (data.data.skills.talk.value < 4) data.data.skills.talk.value = 4;
-        if (data.data.skills.tinker.value < 4) data.data.skills.tinker.value = 4;
-        if (data.data.styles.boldly.value < 4) data.data.styles.boldly.value = 4;
-        if (data.data.styles.carefully.value < 4) data.data.styles.carefully.value = 4;
-        if (data.data.styles.cleverly.value < 4) data.data.styles.cleverly.value = 4;
-        if (data.data.styles.forcefully.value < 4) data.data.styles.forcefully.value = 4;
-        if (data.data.styles.quietly.value < 4) data.data.styles.quietly.value = 4;
-        if (data.data.styles.swiftly.value < 4) data.data.styles.swiftly.value = 4;
-
-        // Checks if stress is below 0, if so - set it to 0.
-        if (data.data.stress.value < 0) data.data.stress.value = 0;
+        if (sheetData.data.data.skills.fight.value < 4) sheetData.data.data.skills.fight.value = 4;
+        if (sheetData.data.data.skills.move.value < 4) sheetData.data.data.skills.move.value = 4;
+        if (sheetData.data.data.skills.study.value < 4) sheetData.data.data.skills.study.value = 4;
+        if (sheetData.data.data.skills.survive.value < 4) sheetData.data.data.skills.survive.value = 4;
+        if (sheetData.data.data.skills.talk.value < 4) sheetData.data.data.skills.talk.value = 4;
+        if (sheetData.data.data.skills.tinker.value < 4) sheetData.data.data.skills.tinker.value = 4;
+        if (sheetData.data.data.styles.boldly.value < 4) sheetData.data.data.styles.boldly.value = 4;
+        if (sheetData.data.data.styles.carefully.value < 4) sheetData.data.data.styles.carefully.value = 4;
+        if (sheetData.data.data.styles.cleverly.value < 4) sheetData.data.data.styles.cleverly.value = 4;
+        if (sheetData.data.data.styles.forcefully.value < 4) sheetData.data.data.styles.forcefully.value = 4;
+        if (sheetData.data.data.styles.quietly.value < 4) sheetData.data.data.styles.quietly.value = 4;
+        if (sheetData.data.data.styles.swiftly.value < 4) sheetData.data.data.styles.swiftly.value = 4;
+
+        // Checks if any values are below their theoretical minimum, if so set it to the very minimum.
+        if (sheetData.data.data.stress.value < 0) sheetData.data.data.stress.value = 0;
         
-        $.each(data.items, (key, item) => {
-            if (!item.img) item.img = '/systems/FVTT-Dishonored/icons/dishonoredlogo.webp';
-        })
+        $.each(sheetData.data.items, (key, item) => {
+            if (!item.img) item.img = "/systems/FVTT-Dishonored/icons/dishonoredlogo.webp";
+        });
 
-        return data;
+        return sheetData.data;
     }
 
     /* -------------------------------------------- */
@@ -79,6 +83,11 @@ export class DishonoredNPCSheet extends ActorSheet {
     activateListeners(html) {
         super.activateListeners(html);
         
+        // Sets up a declaration to be able to check the version easily.
+        let versionInfo;
+        if (game.world.data) versionInfo = game.world.data.coreVersion;
+        else game.world.coreVersion;
+        
         // Opens the class DishonoredSharedActorFunctions for access at various stages.
         let dishonoredActor = new DishonoredSharedActorFunctions();
 
@@ -86,134 +95,212 @@ export class DishonoredNPCSheet extends ActorSheet {
         if ( !game.user.isGM && this.actor.limited) return;
 
         // We use i alot in for loops. Best to assign it now for use later in multiple places.
-        var i;
+        let i;
 
+        // We use div alot to define text blocks. Define here.
+        let div;
+
+        // Here we are checking how many bonecharms, helmets and armors are equipped. 
+        // The player can only have three bonecharms, and one of each armor type. As such, we will use this later.
+        let armorNumber = 0;
+        let bonecharmNumber = 0;
+        let helmetNumber = 0;
+        let stressTrackMax = 0;
+        function armorCount(currentActor) {
+            armorNumber = 0;
+            helmetNumber = 0;
+            currentActor.actor.items.forEach((values) => {
+                if (values.type == "armor") {
+                    if (values.data.data.helmet == true && values.data.data.equipped == true) helmetNumber+= 1;
+                    if (values.data.data.helmet == false && values.data.data.equipped == true) armorNumber+= 1;
+                }
+            });
+        }
+        armorCount(this);
         // This creates a dynamic Stress tracker. It polls for the value of the survive skill, adds any protection from armor. 
         // With the total value, creates a new div for each and places it under a child called "bar-stress-renderer".
-        var stressTrackMax = parseInt(html.find('#survive')[0].value);
-        var armor = html.find('[id^="protectval-armor"]');
-        for (i = 0; i < armor.length; i++) {
-            stressTrackMax += parseInt(armor[i].innerHTML);
-        }
-        if (html.find('#max-stress')[0].value != stressTrackMax)
-        {
-            html.find('#max-stress')[0].value = stressTrackMax;
-            this.submit();
-        }
-        for (i = 1; i <= stressTrackMax; i++) {
-            var div = document.createElement("DIV");
-            div.className = "box";
-            div.id = "stress-" + i;
-            div.innerHTML = i;
-            div.style = "width: calc(100% / " + html.find('#max-stress')[0].value + ");"
-            html.find('#bar-stress-renderer')[0].appendChild(div);
+        function stressTrackUpdate() {
+            stressTrackMax = parseInt(html.find("#survive")[0].value);
+            let armor = html.find("[data-item-type=\"armor\"]");
+            for (i = 0; i < armor.length; i++) {
+                if (armor[i].getAttribute("data-item-equipped") == "true") {
+                    stressTrackMax += parseInt($(armor[i]).children()[2].innerHTML);
+                }
+            }
+            // This checks that the max-stress hidden field is equal to the calculated Max Stress value, if not it makes it so.
+            if (html.find("#max-stress")[0].value != stressTrackMax)
+            {
+                html.find("#max-stress")[0].value = stressTrackMax;
+            }
+            html.find("#bar-stress-renderer").empty();
+            for (i = 1; i <= stressTrackMax; i++) {
+                div = document.createElement("DIV");
+                div.className = "box";
+                div.id = "stress-" + i;
+                div.innerHTML = i;
+                div.style = "width: calc(100% / " + html.find("#max-stress")[0].value + ");";
+                html.find("#bar-stress-renderer")[0].appendChild(div);
+            }
         }
+        stressTrackUpdate();
 
         // Fires the function dishonoredRenderTracks as soon as the parameters exist to do so.
         dishonoredActor.dishonoredRenderTracks(html, stressTrackMax);
 
         // This allows for each item-edit image to link open an item sheet. This uses Simple Worldbuilding System Code.
-        html.find('.control.edit').click(ev => {
+        html.find(".control.edit").click(ev => {
             const li = $(ev.currentTarget).parents(".entry");
-            const item = this.actor.getOwnedItem(li.data("itemId"));
+            const item = this.actor.items.get(li.data("itemId"));
             item.sheet.render(true);
         });
 
-        // This if statement checks if the form is editable, if not it hides controls used by the owner, then aborts any more of the script.
+        // This if statement checks if the form is editable, if not it hides control used by the owner, then aborts any more of the script.
         if (!this.options.editable) {
-            // This hides the ability to Perform a Skill Test for the character
-            for (i = 0; i < html.find('.check-button').length; i++) {
-                html.find('.check-button')[i].style.display = 'none';
+            // This hides the ability to Perform a Skill Test for the character.
+            for (i = 0; i < html.find(".check-button").length; i++) {
+                html.find(".check-button")[i].style.display = "none";
+            }
+            // This hides the ability to change the amount of Void Points the character has.
+            for (i = 0; i < html.find(".voidchange").length; i++) {
+                html.find(".voidchange")[i].style.display = "none";
             }
-            // This hides all add and delete item images.
-            for (i = 0; i < html.find('.control.create').length; i++) {
-                html.find('.control.create')[i].style.display = 'none';
+            // This hides all toggle, add and delete item images.
+            for (i = 0; i < html.find(".control.create").length; i++) {
+                html.find(".control.create")[i].style.display = "none";
             }
-            for (i = 0; i < html.find('.control.delete').length; i++) {
-                html.find('.control.delete')[i].style.display = 'none';
+            for (i = 0; i < html.find(".control.delete").length; i++) {
+                html.find(".control.delete")[i].style.display = "none";
+            }
+            for (i = 0; i < html.find(".control.toggle").length; i++) {
+                html.find(".control.delete")[i].style.display = "none";
             }
             // This hides all skill and style check boxes (and titles)
-            for (i = 0; i < html.find('.selector').length; i++) {
-                html.find('.selector')[i].style.display = 'none';
+            for (i = 0; i < html.find(".selector").length; i++) {
+                html.find(".selector")[i].style.display = "none";
+            }
+            for (i = 0; i < html.find(".selector").length; i++) {
+                html.find(".selector")[i].style.display = "none";
             }
             // Remove hover CSS from clickables that are no longer clickable.
-            for (i = 0; i < html.find('.box').length; i++) {
-                html.find('.box')[i].classList.add("unset-clickables");
+            for (i = 0; i < html.find(".box").length; i++) {
+                html.find(".box")[i].classList.add("unset-clickables");
             }
-            for (i = 0; i < html.find('.rollable').length; i++) {
-                html.find('.rollable')[i].classList.add("unset-clickables");
+            for (i = 0; i < html.find(".rollable").length; i++) {
+                html.find(".rollable")[i].classList.add("unset-clickables");
             }
             return;
-        };
+        }
+
+        // This toggles whether the item is equipped or not. Equipped items count towards item caps.
+        html.find(".control.toggle").click(ev => {
+            let itemType = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-type");
+            let itemId = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-id");
+            let item = this.actor.items.get(itemId);
+            let itemData = item.data;
+            if (itemType == "armor") var isHelmet = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-helmet");
+            if (this.actor.items.get(itemId).data.data.equipped == true) {
+                itemData.data.equipped = false;
+                $(ev.currentTarget).children()[0].classList.remove("fa-toggle-on");
+                $(ev.currentTarget).children()[0].classList.add("fa-toggle-off");
+                $(ev.currentTarget).parents(".entry")[0].setAttribute("data-item-equipped", "false");
+            }
+            else if (itemType == "bonecharm" && bonecharmNumber >= 3) {
+                ui.notifications.error(game.i18n.localize("dishonored.notifications.tooManyBonecharms"));
+            }
+            else if (itemType == "armor" && isHelmet == "false" && armorNumber >= 1) {
+                ui.notifications.error(game.i18n.localize("dishonored.notifications.armorAlreadyEquipped"));
+            }
+            else if (itemType == "armor" && isHelmet == "true" && helmetNumber >= 1) {
+                ui.notifications.error(game.i18n.localize("dishonored.notifications.helmentAlreadyEquipped"));
+            }
+            else {
+                itemData.data.equipped = true;
+                $(ev.currentTarget).children()[0].classList.remove("fa-toggle-off");
+                $(ev.currentTarget).children()[0].classList.add("fa-toggle-on");
+                $(ev.currentTarget).parents(".entry")[0].setAttribute("data-item-equipped", "true");
+            }
+            item.update(itemData);
+            stressTrackUpdate();
+            dishonoredActor.dishonoredRenderTracks(html, stressTrackMax);
+            this.submit();
+        });
 
         // This allows for all items to be rolled, it gets the current targets type and id and sends it to the rollGenericItem function.
-        html.find('.rollable').click(ev =>{
-            var itemType = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-type");
-            var itemId = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-id");
+        html.find(".rollable").click(ev =>{
+            let itemType = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-type");
+            let itemId = $(ev.currentTarget).parents(".entry")[0].getAttribute("data-item-id");
             dishonoredActor.rollGenericItem(ev, itemType, itemId, this.actor);
-        })
+        });
 
         // Allows item-create images to create an item of a type defined individually by each button. This uses code found via the Foundry VTT System Tutorial.
-        html.find('.control.create').click(ev => {
+        html.find(".control.create").click(ev => {
             ev.preventDefault();
             const header = ev.currentTarget;
             const type = header.dataset.type;
             const data = duplicate(header.dataset);
-            const name = game.i18n.format("dishonored.actor.item.adjectiveNew") + ' ' + type.charAt(0).toUpperCase() + type.slice(1);
+            const name = game.i18n.format("dishonored.actor.item.adjectiveNew") + " " + type.charAt(0).toUpperCase() + type.slice(1);
+            if (type == "bonecharm" && bonecharmNumber >= 3) {
+                ui.notifications.info(game.i18n.localize("dishonored.notifications.tooManyBonecharmsNew"));
+                data.equipped = false;
+            }
+            if (type == "armor" && armorNumber >= 1) {
+                ui.notifications.info(game.i18n.localize("dishonored.notifications.armorAlreadyEquippedNew"));
+                data.equipped = false;
+            }
             const itemData = {
                 name: name,
                 type: type,
                 data: data
             };
             delete itemData.data["type"];
-            return this.actor.createOwnedItem(itemData);
+            stressTrackUpdate();
+            // Check if we are using a Foundry version above 0.8.0, use new code.
+            if (isNewerVersion(versionInfo,"0.8.-1")) return this.actor.createEmbeddedDocuments("Item",[(itemData)]);
+            else return this.actor.createOwnedItem(itemData);
         });
 
         // Allows item-delete images to allow deletion of the selected item. This uses Simple Worldbuilding System Code.
-        html.find('.control.delete').click(ev => {
+        html.find(".control.delete").click(ev => {
             const li = $(ev.currentTarget).parents(".entry");
-            this.actor.deleteOwnedItem(li.data("itemId"));
+            // Check if we are using a Foundry version above 0.8.0, use new code.
+            if (isNewerVersion(versionInfo,"0.8.-1")) this.actor.deleteEmbeddedDocuments("Item",[li.data("itemId")]);
+            else this.actor.deleteOwnedItem(li.data("itemId"));
             li.slideUp(200, () => this.render(false));
         });
 
         // Reads if a stress track box has been clicked, and if it has will either: set the value to the clicked box, or reduce the value by one.
-        // This check is dependent on various requirements, see comments in code.
-        html.find('[id^="stress"]').click(ev => {
-            var newTotalObject = $(ev.currentTarget)[0];
-            var newTotal = newTotalObject.id.substring(7);
-            // data-selected stores whether the track box is currently activated or not. This checks that the box is activated
+        // See line 186-220 for a more detailed break down on the context of each scenario. Stress uses the same logic.
+        html.find("[id^=\"stress\"]").click(ev => {
+            let newTotalObject = $(ev.currentTarget)[0];
+            let newTotal = newTotalObject.id.substring(7);
+            let total;
             if (newTotalObject.getAttribute("data-selected") === "true") {
-                // Now we check that the "next" track box is not activated. 
-                // If there isn't one, or it isn't activated, we only want to decrease the value by 1 rather than setting the value.
-                var nextCheck = 'stress-' + (parseInt(newTotal) + 1);
-                if (!html.find('#'+nextCheck)[0] || html.find('#'+nextCheck)[0].getAttribute("data-selected") != "true") {
-                    html.find('#total-stress')[0].value = html.find('#total-stress')[0].value - 1;
+                let nextCheck = "stress-" + (parseInt(newTotal) + 1);
+                if (!html.find("#"+nextCheck)[0] || html.find("#"+nextCheck)[0].getAttribute("data-selected") != "true") {
+                    html.find("#total-stress")[0].value = html.find("#total-stress")[0].value - 1;
                     this.submit();
-                } 
-                // If it isn't caught by the if, the next box is likely activated. If something happened, its safer to set the value anyway.
-                else {
-                    var total = html.find('#total-stress')[0].value;
+                } else {
+                    total = html.find("#total-stress")[0].value;
                     if (total != newTotal) {
-                        html.find('#total-stress')[0].value = newTotal;
+                        html.find("#total-stress")[0].value = newTotal;
                         this.submit();
                     }
                 }
-            } 
-            // If the clicked box wasn't activated, we need to activate it now.
-            else {
-                var total = html.find('#total-stress')[0].value;
+            } else {
+                total = html.find("#total-stress")[0].value;
                 if (total != newTotal) {
-                    html.find('#total-stress')[0].value = newTotal;
+                    html.find("#total-stress")[0].value = newTotal;
                     this.submit();
                 }
             }
         });
 
+
         // Turns the Skill checkboxes into essentially a radio button. It removes any other ticks, and then checks the new skill.
         // Finally a submit is required as data has changed.
-        html.find('.selector.skill').click(ev => {
+        html.find(".selector.skill").click(ev => {
             for (i = 0; i <= 5; i++) {
-                html.find('.selector.skill')[i].checked = false;
+                html.find(".selector.skill")[i].checked = false;
             }
             $(ev.currentTarget)[0].checked = true;
             this.submit();
@@ -221,31 +308,36 @@ export class DishonoredNPCSheet extends ActorSheet {
 
         // Turns the Style checkboxes into essentially a radio button. It removes any other ticks, and then checks the new style.
         // Finally a submit is required as data has changed.
-        html.find('.selector.style').click(ev => {
+        html.find(".selector.style").click(ev => {
             for (i = 0; i <= 5; i++) {
-                html.find('.selector.style')[i].checked = false;
+                html.find(".selector.style")[i].checked = false;
             }
             $(ev.currentTarget)[0].checked = true;
             this.submit();
         });
 
         // If the check-button is clicked it grabs the selected skill and the selected style and fires the method rollSkillTest. See actor.js for further info.
-        html.find('.check-button').click(ev => {
+        html.find(".check-button").click(ev => {
+            let selectedSkill;
+            let selectedSkillValue;
+            let selectedStyle;
+            let selectedStyleValue;
             for (i = 0; i <= 5; i++) {
-                if (html.find('.selector.skill')[i].checked === true) {
-                    var selectedSkill = html.find('.selector.skill')[i].id;
-                    var selectedSkill = selectedSkill.slice(0, -9)
-                    var selectedSkillValue = html.find('#'+selectedSkill)[0].value;
+                if (html.find(".selector.skill")[i].checked === true) {
+                    let selectedSkillHTML = html.find(".selector.skill")[i].id;
+                    selectedSkill = selectedSkillHTML.slice(0, -9);
+                    selectedSkillValue = html.find("#"+selectedSkill)[0].value;
                 }
             }
             for (i = 0; i <= 5; i++) {
-                if (html.find('.selector.style')[i].checked === true) {
-                    var selectedStyle = html.find('.selector.style')[i].id;
-                    var selectedStyle = selectedStyle.slice(0, -9)
-                    var selectedStyleValue = html.find('#'+selectedStyle)[0].value;
+                if (html.find(".selector.style")[i].checked === true) {
+                    let selectedStyleHTML = html.find(".selector.style")[i].id;
+                    selectedStyle = selectedStyleHTML.slice(0, -9);
+                    selectedStyleValue = html.find("#"+selectedStyle)[0].value;
                 }
             }
-            var checkTarget = parseInt(selectedSkillValue) + parseInt(selectedStyleValue);
+            let checkTarget = parseInt(selectedSkillValue) + parseInt(selectedStyleValue);
+
             dishonoredActor.rollSkillTest(ev, checkTarget, selectedSkill, selectedStyle, this.actor);
         });
     }
diff --git a/module/apps/logo.js b/module/apps/logo.js
index 13c03ea..bf311c2 100644
--- a/module/apps/logo.js
+++ b/module/apps/logo.js
@@ -10,7 +10,7 @@ export class DishonoredLogo extends Application {
 
     activateListeners(html) {
         html[0].href += game.system.data.version;
-        html.find('#dishonored-logo-verID')[0].innerHTML = game.system.data.version;
+        html.find("#dishonored-logo-verID")[0].innerHTML = game.system.data.version;
     }
 }
 
diff --git a/module/apps/roll-dialog.js b/module/apps/roll-dialog.js
index 54c32a0..864a6cc 100644
--- a/module/apps/roll-dialog.js
+++ b/module/apps/roll-dialog.js
@@ -8,11 +8,11 @@ export class DishonoredRollDialog {
             let formData = null;
             // Create a new dialog.
             const dlg = new Dialog({
-                title: game.i18n.localize('dishonored.apps.dicepoolwindow'),
+                title: game.i18n.localize("dishonored.apps.dicepoolwindow"),
                 content: html,
                 buttons: {
                     roll: {
-                        label: game.i18n.localize('dishonored.apps.rolldice'),
+                        label: game.i18n.localize("dishonored.apps.rolldice"),
                         callback: html => {
                             formData = new FormData(html[0].querySelector("#dice-pool-form"));
                             return resolve(formData);
diff --git a/module/apps/tracker.js b/module/apps/tracker.js
index 77629ae..d98e333 100644
--- a/module/apps/tracker.js
+++ b/module/apps/tracker.js
@@ -13,33 +13,26 @@ export class DishonoredTracker extends Application {
         let chaos = game.settings.get("FVTT-Dishonored", "chaos");
         let momentum = game.settings.get("FVTT-Dishonored", "momentum");
         // Fire renderTracker once which populates the Momentum and Chaos windows, then consistently check for updates, this should be seperate as we want the check function to be asyncherous.
-        renderTracker()
+        renderTracker();
         this.checkUpdates();
 
         // Hide the increase and decrease buttons if the user doesn't have permissions.
         if (!game.user.hasRole(game.settings.get("FVTT-Dishonored", "chaosPermissionLevel"))) {
-            html.find('#dishonored-chaos-track-decrease')[0].style.display = 'none';
-            html.find('#dishonored-chaos-track-increase')[0].style.display = 'none';
-            html.find('#dishonored-track-chaos')[0].disabled = true;
-        }
-
-        // Hide the increase and decrease buttons if the user doesn't have permissions.
-        if (!game.user.hasRole(game.settings.get("FVTT-Dishonored", "momentumPermissionLevel"))) {
-            html.find('#dishonored-momentum-track-decrease')[0].style.display = 'none';
-            html.find('#dishonored-momentum-track-increase')[0].style.display = 'none';
-            html.find('#dishonored-track-momentum')[0].disabled = true;
+            html.find("#dishonored-chaos-track-decrease")[0].style.display = "none";
+            html.find("#dishonored-chaos-track-increase")[0].style.display = "none";
+            html.find("#dishonored-track-chaos")[0].disabled = true;
         }
 
         // Find the button which has the class #dishonored-chaos-track-increase and tie the following to the onClick
-        html.find('#dishonored-chaos-track-increase').click(ev => {
+        html.find("#dishonored-chaos-track-increase").click(function() {
             // Check if the player has permissions before moving on!
             if (game.user.hasRole(game.settings.get("FVTT-Dishonored", "chaosPermissionLevel"))) {
                 // Set momentum, we do this as otherwise when we render the tracker it will use the old initial load momentum (THANKS mkscho63)
                 momentum = game.settings.get("FVTT-Dishonored", "momentum");
                 chaos = parseInt(document.getElementById("dishonored-track-chaos").value);
-                // Check if chaos is currently 99999999, anything past this is unable to render. If it is error. This is a meme.
-                if (chaos === 99999999) {
-                    ui.notifications.error(game.i18n.localize('dishonored.notifications.chaosGreater'));
+                // Check if chaos is currently 99, anything past this is unable to render. If it does error it becomes a meme.
+                if (chaos === 99) {
+                    ui.notifications.error(game.i18n.localize("dishonored.notifications.chaosGreater"));
                     return false;
                 }
                 // Otherwise we are good to add +1 and set the value and re-render the track.
@@ -49,36 +42,12 @@ export class DishonoredTracker extends Application {
             }
             // If the played does not have permissions - error!
             else {
-                ui.notifications.error(game.i18n.localize('dishonored.notifications.chaosButtonInvalidPermissions'));
-                return false;
-            }
-        });
-
-        // Find the button which has the class #dishonored-momentum-track-increase and tie the following to the onClick
-        html.find('#dishonored-momentum-track-increase').click(ev => {
-            // Check if the player has permissions before moving on!
-            if (game.user.hasRole(game.settings.get("FVTT-Dishonored", "momentumPermissionLevel"))) {
-                // Set chaos, we do this as otherwise when we render the tracker it will use the old initial load chaos (THANKS mkscho63)
-                chaos = game.settings.get("FVTT-Dishonored", "chaos");
-                momentum = parseInt(document.getElementById("dishonored-track-momentum").value);
-                // check if momentum is currently 6, if so it cannot be increased so error.
-                if (momentum === 6) {
-                    ui.notifications.error(game.i18n.localize('dishonored.notifications.momentumGreater'));
-                    return false;
-                }
-                // Otherwise we are good to add +1 and set the value and re-render the track.
-                momentum = momentum + 1;
-                game.settings.set("FVTT-Dishonored", "momentum", momentum);
-                renderTracker();
-            }
-            // If the played does not have permissions - error!
-            else {
-                ui.notifications.error(game.i18n.localize('dishonored.notifications.momentumButtonInvalidPermissions'));
+                ui.notifications.error(game.i18n.localize("dishonored.notifications.chaosButtonInvalidPermissions"));
                 return false;
             }
         });
 
-        html.find('#dishonored-chaos-track-decrease').click(ev => {
+        html.find("#dishonored-chaos-track-decrease").click(function() {
             // Check if the player has permissions before moving on!
             if (game.user.hasRole(game.settings.get("FVTT-Dishonored", "chaosPermissionLevel"))) {
                 // Set momentum, we do this as otherwise when we render the tracker it will use the old initial load momentum (THANKS mkscho63)
@@ -86,7 +55,7 @@ export class DishonoredTracker extends Application {
                 chaos = parseInt(document.getElementById("dishonored-track-chaos").value);
                 // check if chaos is currently 0, if so it cannot be decreased so error.
                 if (chaos === 0) {
-                    ui.notifications.warn(game.i18n.localize('dishonored.notifications.chaosLess'));
+                    ui.notifications.warn(game.i18n.localize("dishonored.notifications.chaosLess"));
                     return false;
                 }
                 // Otherwise we are good to take -1 and set the value and re-render the track.
@@ -96,49 +65,20 @@ export class DishonoredTracker extends Application {
             }
             // If the played does not have permissions - error!
             else {
-                ui.notifications.error(game.i18n.localize('dishonored.notifications.chaosButtonInvalidPermissions'));
-                return false;
-            }
-        });
-
-        html.find('#dishonored-momentum-track-decrease').click(ev => {
-            // Check if the player has permissions before moving on!
-            if (game.user.hasRole(game.settings.get("FVTT-Dishonored", "momentumPermissionLevel"))) {
-                // Set chaos, we do this as otherwise when we render the tracker it will use the old initial load chaos (THANKS mkscho63)
-                chaos = game.settings.get("FVTT-Dishonored", "chaos");
-                momentum = parseInt(document.getElementById("dishonored-track-momentum").value);
-                // check if momentum is currently 0, if so it cannot be decreased so error.
-                if (momentum === 0) {
-                    ui.notifications.warn(game.i18n.localize('dishonored.notifications.momentumLess'));
-                    return false;
-                }
-                // Otherwise we are good to take -1 and set the value and re-render the track.
-                momentum = momentum - 1;
-                game.settings.set("FVTT-Dishonored", "momentum", momentum);
-                renderTracker();
-            }
-            // If the played does not have permissions - error!
-            else {
-                ui.notifications.error(game.i18n.localize('dishonored.notifications.momentumButtonInvalidPermissions'));
+                ui.notifications.error(game.i18n.localize("dishonored.notifications.chaosButtonInvalidPermissions"));
                 return false;
             }
         });
 
         // We want it so that we unfocus if the enter key is pressed, we do this by recording the keycode 13 and bluring.
-        html.find('#dishonored-track-chaos').keydown(ev => {
+        html.find("#dishonored-track-chaos").keydown(ev => {
             if (ev.keyCode == 13) {
-                html.find('#dishonored-track-chaos').blur();
+                html.find("#dishonored-track-chaos").blur();
             }
-        })
-
-        html.find('#dishonored-track-momentum').keydown(ev => {
-            if (ev.keyCode == 13) {
-                html.find('#dishonored-track-momentum').blur();
-            }
-        })
+        });
 
         // This is what is fired when the chaos tracker text box is edited.
-        html.find('#dishonored-track-chaos').change(ev => {
+        html.find("#dishonored-track-chaos").change(function() {
             // Check if the player has permissions before moving on!
             if (game.user.hasRole(game.settings.get("FVTT-Dishonored", "chaosPermissionLevel"))) {
                 // Set chaos and momentum, we do this as otherwise when we render the tracker it will use the old initial load chaos (THANKS mkscho63)
@@ -147,19 +87,19 @@ export class DishonoredTracker extends Application {
                 let len = document.getElementById("dishonored-track-chaos").value.length;
                 // If the value is NaN and doesn't start with + or -, then error.
                 if (isNaN(document.getElementById("dishonored-track-chaos").value) && document.getElementById("dishonored-track-chaos").value.substr(0,1) != "+" && document.getElementById("dishonored-track-chaos").value.substr(0,1) != "-") {
-                    ui.notifications.error(game.i18n.localize('dishonored.notifications.NaN'));
+                    ui.notifications.error(game.i18n.localize("dishonored.notifications.NaN"));
                     document.getElementById("dishonored-track-chaos").value = chaos;
                 }
                 else {
                     // If a blank value is input, default to 0
-                    if (document.getElementById("dishonored-track-chaos").value == '') {
+                    if (document.getElementById("dishonored-track-chaos").value == "") {
                         document.getElementById("dishonored-track-chaos").value = 0;
                     }
                     // If a value begins with +, then add the two together
                     if (document.getElementById("dishonored-track-chaos").value.substr(0,1) == "+") {
                         // As we allow any + value through we want to check the rest is actually a number, this is caught here.
                         if (isNaN(document.getElementById("dishonored-track-chaos").value.substr(1,len-1))) {
-                            ui.notifications.error(game.i18n.localize('dishonored.notifications.NaN'));
+                            ui.notifications.error(game.i18n.localize("dishonored.notifications.NaN"));
                             document.getElementById("dishonored-track-chaos").value = chaos;
                         }
                         else {
@@ -170,7 +110,7 @@ export class DishonoredTracker extends Application {
                     if (document.getElementById("dishonored-track-chaos").value.substr(0,1) == "-") {
                         // As we allow any - value through we want to check the rest is actually a number, this is caught here.
                         if (isNaN(document.getElementById("dishonored-track-chaos").value.substr(1,len-1))) {
-                            ui.notifications.error(game.i18n.localize('dishonored.notifications.NaN'));
+                            ui.notifications.error(game.i18n.localize("dishonored.notifications.NaN"));
                             document.getElementById("dishonored-track-chaos").value = chaos;
                         }
                         else {
@@ -180,13 +120,13 @@ export class DishonoredTracker extends Application {
                     // If the new value is going to be below 0, warn and return false.
                     if (document.getElementById("dishonored-track-chaos").value < 0) {
                         document.getElementById("dishonored-track-chaos").value = chaos;
-                        ui.notifications.warn(game.i18n.localize('dishonored.notifications.chaosLess'));
+                        ui.notifications.warn(game.i18n.localize("dishonored.notifications.chaosLess"));
                         return false;
                     }
-                    // If the new value is going to be above 99999999, error and return false.
-                    if (document.getElementById("dishonored-track-chaos").value > 99999999) {
+                    // If the new value is going to be above 99, error and return false.
+                    if (document.getElementById("dishonored-track-chaos").value > 99) {
                         document.getElementById("dishonored-track-chaos").value = chaos;
-                        ui.notifications.error(game.i18n.localize('dishonored.notifications.chaosGreaterSet'));
+                        ui.notifications.error(game.i18n.localize("dishonored.notifications.chaosGreaterSet"));
                         return false;
                     }
                 }
@@ -197,91 +137,82 @@ export class DishonoredTracker extends Application {
             }
             // If the played does not have permissions - error!
             else {
-                ui.notifications.error(game.i18n.localize('dishonored.notifications.chaosButtonInvalidPermissions'));
+                ui.notifications.error(game.i18n.localize("dishonored.notifications.chaosButtonInvalidPermissions"));
                 return false;
             }
         });
 
-        // This is what is fired when the momentum tracker text box is edited.
-        html.find('#dishonored-track-momentum').change(ev => {
-            // Check if the player has permissions before moving on!
-            if (game.user.hasRole(game.settings.get("FVTT-Dishonored", "momentumPermissionLevel"))) {
-                // Set chaos and momentum, we do this as otherwise when we render the tracker it will use the old initial load chaos (THANKS mkscho63)
-                momentum = game.settings.get("FVTT-Dishonored", "momentum");
-                chaos = game.settings.get("FVTT-Dishonored", "chaos");
-                // If the value is NaN and doesn't start with + or -, then error.
-                if (isNaN(document.getElementById("dishonored-track-momentum").value) && document.getElementById("dishonored-track-momentum").value.substr(0,1) != "+" && document.getElementById("dishonored-track-momentum").value.substr(0,1) != "-") {
-                    ui.notifications.error(game.i18n.localize('dishonored.notifications.NaN'));
-                    document.getElementById("dishonored-track-momentum").value = momentum;
-                }
+        html.find("[id^=\"dishonored-momentum-tracker\"]").click(ev => {
+            momentum = game.settings.get("FVTT-Dishonored", "momentum");
+            chaos = game.settings.get("FVTT-Dishonored", "chaos");
+            let captureObject = $(ev.currentTarget)[0];
+            let newTotalObjectBG = html.find("#" + captureObject.id.substr(0,captureObject.id.length-2) + "bg")[0];
+            let newTotal = captureObject.id.replace(/\D/g, "");
+            // data-selected stores whether the track box is currently activated or not. This checks that the box is activated
+            if (newTotalObjectBG.getAttribute("data-selected") === "true") {
+                // Now we check that the "next" track box is not activated. 
+                // If there isn't one, or it isn't activated, we only want to decrease the value by 1 rather than setting the value.
+                let nextCheck = "dishonored-momentum-tracker-" + (parseInt(newTotal) + 1 + "-bg");
+                if (!html.find("#"+nextCheck)[0] || html.find("#"+nextCheck)[0].getAttribute("data-selected") != "true") {
+                    momentum = momentum - 1;
+                    game.settings.set("FVTT-Dishonored", "momentum", momentum);
+                    renderTracker();
+                } 
+                // If it isn't caught by the if, the next box is likely activated. If something happened, its safer to set the value anyway.
                 else {
-                    // If a blank value is input, default to 0
-                    if (document.getElementById("dishonored-track-momentum").value == '') {
-                        document.getElementById("dishonored-track-momentum").value = 0;
-                    }
-                    // If a value begins with +, then add the two together
-                    if (document.getElementById("dishonored-track-momentum").value.substr(0,1) == "+") {
-                        // As we allow any + value through we want to check the rest is actually a number, this is caught here.
-                        if (isNaN(document.getElementById("dishonored-track-momentum").value.substr(1,len-1))) {
-                            ui.notifications.error(game.i18n.localize('dishonored.notifications.NaN'));
-                            document.getElementById("dishonored-track-momentum").value = momentum;
-                        }
-                        else {
-                            document.getElementById("dishonored-track-momentum").value = momentum + parseInt(document.getElementById("dishonored-track-momentum").value.substr(1,document.getElementById("dishonored-track-momentum").value.length - 1));
-                        }
-                    }
-                    // If a value begins with -, then take the new value from the older.
-                    if (document.getElementById("dishonored-track-momentum").value.substr(0,1) == "-") {
-                        // As we allow any + value through we want to check the rest is actually a number, this is caught here.
-                        if (isNaN(document.getElementById("dishonored-track-momentum").value.substr(1,len-1))) {
-                            ui.notifications.error(game.i18n.localize('dishonored.notifications.NaN'));
-                            document.getElementById("dishonored-track-momentum").value = momentum;
-                        }
-                        else {
-                            document.getElementById("dishonored-track-momentum").value = momentum - parseInt(document.getElementById("dishonored-track-momentum").value.substr(1,document.getElementById("dishonored-track-momentum").value.length - 1));
-                        }
-                    }
-                    // If the new value is going to be below 0, warn and return false.
-                    if (document.getElementById("dishonored-track-momentum").value < 0) {
-                        document.getElementById("dishonored-track-momentum").value = momentum;
-                        ui.notifications.warn(game.i18n.localize('dishonored.notifications.momentumLess'));
-                        return false;
-                    }
-                    // If the new value is going to be above 6, warn and return false.
-                    if (document.getElementById("dishonored-track-momentum").value > 6) {
-                        document.getElementById("dishonored-track-momentum").value = momentum;
-                        ui.notifications.warn(game.i18n.localize('dishonored.notifications.momentumGreaterSet'));
-                        return false;
+                    // let total = html.find('#total-exp')[0].value;
+                    if (momentum != newTotal) {
+                        momentum = newTotal;
+                        game.settings.set("FVTT-Dishonored", "momentum", momentum);
+                        renderTracker();
                     }
                 }
-                // Set the value and re-render
-                momentum = document.getElementById("dishonored-track-momentum").value;
-                game.settings.set("FVTT-Dishonored", "momentum", momentum);
-                renderTracker();
-            }
-            // If the played does not have permissions - error!
+            } 
+            // If the clicked box wasn't activated, we need to activate it now.
             else {
-                ui.notifications.error(game.i18n.localize('dishonored.notifications.momentumButtonInvalidPermissions'));
-                return false;
+                if (momentum != newTotal) {
+                    momentum = newTotal;
+                    game.settings.set("FVTT-Dishonored", "momentum", momentum);
+                    renderTracker();
+                }
             }
         });
 
         // Set the element value to its respective variable.
         function renderTracker() {
             document.getElementById("dishonored-track-chaos").value = chaos;
-            document.getElementById("dishonored-track-momentum").value = momentum;
+            for (let i=1;i<=6;i++) {
+                if (i<=momentum) {
+                    html.find("#dishonored-momentum-tracker-"+i+"-bg")[0].setAttribute("data-selected", "true");
+                    html.find("#dishonored-momentum-tracker-"+i+"-bg")[0].style.fill = "white";
+                    html.find("#dishonored-momentum-tracker-"+i+"-fg")[0].style.color = "";
+                    html.find("#dishonored-momentum-tracker-"+i+"-fg")[0].style.textShadow = "";
+                }
+                else {
+                    html.find("#dishonored-momentum-tracker-"+i+"-bg")[0].removeAttribute("data-selected");
+                    html.find("#dishonored-momentum-tracker-"+i+"-bg")[0].style.fill = "";
+                    html.find("#dishonored-momentum-tracker-"+i+"-fg")[0].style.color = "white";
+                    html.find("#dishonored-momentum-tracker-"+i+"-fg")[0].style.textShadow = "-1px 0 black, 0 1px black, 1px 0 black, 0 -1px black";
+                }
+            }
         }
-
     }
 
     async checkUpdates() {
+        // We use i in loops, defining at top-level
+        let i;
         // Grab the Refresh Rate from the system settings (*1000 as JS counts in ms)
         let refreshRate = game.settings.get("FVTT-Dishonored", "trackerRefreshRate") * 1000;
         // Create function that will cycle regularly
-        function check() {
+        setInterval(function check() {
             // Define Chaos and Momentum as the value displayed and the storedChaos and Momentum as the value saved to the settings
             let chaos = document.getElementById("dishonored-track-chaos").value;
-            let momentum = document.getElementById("dishonored-track-momentum").value;
+            let momentum;
+            for (i=1;i<=6;i++) {
+                if (document.getElementById("dishonored-momentum-tracker-"+i+"-bg").getAttribute("data-selected")==="true") {
+                    momentum = i;
+                }
+            }
             let storedChaos = game.settings.get("FVTT-Dishonored", "chaos");
             let storedMomentum = game.settings.get("FVTT-Dishonored", "momentum");
             // Get out clause that checks if the chaos or momentum is below 0 and if so, change it to 0. 
@@ -292,23 +223,29 @@ export class DishonoredTracker extends Application {
                 game.settings.set("FVTT-Dishonored", "momentum", 0);
             }
             // Check if the field is currently focused, we don't want to interupt the user if they have the field focused!
-            if ($("#dishonored-track-chaos").is(':focus') == false) {
+            if ($("#dishonored-track-chaos").is(":focus") == false) {
                 // If the displayed and stored value is not equal, make the displayed value equal the stored value!
                 if (storedChaos != chaos) {
                     document.getElementById("dishonored-track-chaos").value = storedChaos;
                 }
             }
-            // Check if the field is currently focused, we don't want to interupt the user if they have the field focused!
-            if ($("#dishonored-track-momentum").is(':focus') == false) {
-                // If the displayed and stored value is not equal, make the displayed value equal the stored value!
-                if (storedMomentum != momentum) {
-                    document.getElementById("dishonored-track-momentum").value = storedMomentum;
+
+            if (storedMomentum != momentum) {
+                for (i=1;i<=6;i++) {
+                    if (i<=storedMomentum) {
+                        document.getElementById("dishonored-momentum-tracker-"+i+"-bg").setAttribute("data-selected", "true");
+                        document.getElementById("dishonored-momentum-tracker-"+i+"-bg").style.fill = "white";
+                        document.getElementById("dishonored-momentum-tracker-"+i+"-fg").style.color = "";
+                        document.getElementById("dishonored-momentum-tracker-"+i+"-fg").style.textShadow = "";
+                    }
+                    else {
+                        document.getElementById("dishonored-momentum-tracker-"+i+"-bg").removeAttribute("data-selected");
+                        document.getElementById("dishonored-momentum-tracker-"+i+"-bg").style.fill = "";
+                        document.getElementById("dishonored-momentum-tracker-"+i+"-fg").style.color = "white";
+                        document.getElementById("dishonored-momentum-tracker-"+i+"-fg").style.textShadow = "-1px 0 black, 0 1px black, 1px 0 black, 0 -1px black";
+                    }
                 }
-            }
-            // Tell script to wait for refresh, and then fire this function again
-            setTimeout(check, refreshRate);
-        }
-        // Initially fire the function.
-        check();
+            }  
+        }, refreshRate);
     }
 }
diff --git a/module/dishonored.js b/module/dishonored.js
index 6e79bfe..913e643 100644
--- a/module/dishonored.js
+++ b/module/dishonored.js
@@ -35,6 +35,9 @@ import {
 import {
     DishonoredPowerSheet
 } from "./items/power-sheet.js";
+import {
+    DishonoredTruthSheet
+} from "./items/truth-sheet.js";
 import { 
     DishonoredTracker 
 } from "./apps/tracker.js";
@@ -42,13 +45,16 @@ import {
     DishonoredLogo
 } from "./apps/logo.js";
 import * as macros 
-from "./macro.js";
+    from "./macro.js";
 
 /* -------------------------------------------- */
 /*  Foundry VTT Initialization                  */
 /* -------------------------------------------- */
 
 Hooks.once("init", function() {
+    let versionInfo;
+    if (game.world.data) versionInfo = game.world.data.coreVersion;
+    else game.world.coreVersion;
     // Splash Screen
     console.log(`Initializing Dishonored Tabletop Roleplaying Game System
                                                             @@
@@ -73,8 +79,7 @@ Hooks.once("init", function() {
               @                              @@@@
                                                 @@@
                                                    @@@
-                                                      @@`)
-
+                                                      @@`);
 
     // Create a namespace within the game global
     game.dishonored = {
@@ -89,6 +94,7 @@ Hooks.once("init", function() {
             DishonoredTalentSheet,
             DishonoredContactSheet,
             DishonoredPowerSheet,
+            DishonoredTruthSheet,
         },
         entities: {
             DishonoredActor,
@@ -104,8 +110,8 @@ Hooks.once("init", function() {
     };
 
     // Define custom Entity classes
-    CONFIG.Actor.entityClass = DishonoredActor;
-    CONFIG.Item.entityClass = DishonoredItem;
+    CONFIG.Actor.documentClass = DishonoredActor;
+    CONFIG.Item.documentClass = DishonoredItem;
 
     // Register sheet application classes
     Actors.unregisterSheet("core", ActorSheet);
@@ -142,12 +148,15 @@ Hooks.once("init", function() {
     Items.registerSheet("dishonored", DishonoredPowerSheet, {
         types: ["power"],
     });
+    Items.registerSheet("dishonored", DishonoredTruthSheet, {
+        types: ["truth"],
+    });
 
     // Code taken from FFG Star Wars which also flips their health system! (Plus I like the increasing height that it implements)
     Token.prototype._drawBar = function (number, bar, data) {
         let val = Number(data.value);
         if (data.attribute === "stress") {
-          val = Number(data.max - data.value);
+            val = Number(data.max - data.value);
         }
         const pct = Math.clamped(val, 0, data.max) / data.max;
         let h = Math.max(canvas.dimensions.size / 12, 8);
@@ -155,22 +164,22 @@ Hooks.once("init", function() {
         // Draw the bar
         let color = number === 0 ? [1 - pct / 2, pct, 0] : [0.5 * pct, 0.7 * pct, 0.5 + pct / 2];
         bar
-          .clear()
-          .beginFill(0x000000, 0.5)
-          .lineStyle(2, 0x000000, 0.9)
-          .drawRoundedRect(0, 0, this.w, h, 3)
-          .beginFill(PIXI.utils.rgb2hex(color), 0.8)
-          .lineStyle(1, 0x000000, 0.8)
-          .drawRoundedRect(1, 1, pct * (this.w - 2), h - 2, 2);
+            .clear()
+            .beginFill(0x000000, 0.5)
+            .lineStyle(2, 0x000000, 0.9)
+            .drawRoundedRect(0, 0, this.w, h, 3)
+            .beginFill(PIXI.utils.rgb2hex(color), 0.8)
+            .lineStyle(1, 0x000000, 0.8)
+            .drawRoundedRect(1, 1, pct * (this.w - 2), h - 2, 2);
         // Set position
         let posY = number === 0 ? this.h - h : 0;
         bar.position.set(0, posY);
-      };
+    };
 
     // Register system settings
     game.settings.register("FVTT-Dishonored", "multipleComplications", {
-        name: game.i18n.localize('dishonored.settings.names.multipleComplications'),
-        hint: game.i18n.localize('dishonored.settings.hints.multipleComplications'),
+        name: game.i18n.localize("dishonored.settings.names.multipleComplications"),
+        hint: game.i18n.localize("dishonored.settings.hints.multipleComplications"),
         scope: "world",
         type: Boolean,
         default: true,
@@ -178,54 +187,54 @@ Hooks.once("init", function() {
     });
 
     game.settings.register("FVTT-Dishonored", "send2ActorPermissionLevel", {
-        name: game.i18n.localize('dishonored.settings.names.send2ActorPermissionLevel'),
-        hint: game.i18n.localize('dishonored.settings.hints.send2ActorPermissionLevel'),
+        name: game.i18n.localize("dishonored.settings.names.send2ActorPermissionLevel"),
+        hint: game.i18n.localize("dishonored.settings.hints.send2ActorPermissionLevel"),
         scope: "world",
         type: String,
         default: "ASSISTANT",
         config: true,
         choices: {
-          "NONE": "Switch Off Send2Actor",
-          "PLAYER": "Players",
-          "TRUSTED": "Trusted Players",
-          "ASSISTANT": "Assistant Gamemaster",
-          "GAMEMASTER": "Gamemasters",
+            "NONE": "Switch Off Send2Actor",
+            "PLAYER": game.i18n.localize("USER.RolePlayer"),
+            "TRUSTED": game.i18n.localize("USER.RoleTrusted"),
+            "ASSISTANT": game.i18n.localize("USER.RoleAssistant"),
+            "GAMEMASTER": game.i18n.localize("USER.RoleGamemaster"),
         }
     });
 
     game.settings.register("FVTT-Dishonored", "chaosPermissionLevel", {
-        name: game.i18n.localize('dishonored.settings.names.chaosPermissionLevel'),
-        hint: game.i18n.localize('dishonored.settings.hints.chaosPermissionLevel'),
+        name: game.i18n.localize("dishonored.settings.names.chaosPermissionLevel"),
+        hint: game.i18n.localize("dishonored.settings.hints.chaosPermissionLevel"),
         scope: "world",
         type: String,
         default: "ASSISTANT",
         config: true,
         choices: {
-          "PLAYER": "Players",
-          "TRUSTED": "Trusted Players",
-          "ASSISTANT": "Assistant Gamemaster",
-          "GAMEMASTER": "Gamemasters",
+            "PLAYER": game.i18n.localize("USER.RolePlayer"),
+            "TRUSTED": game.i18n.localize("USER.RoleTrusted"),
+            "ASSISTANT": game.i18n.localize("USER.RoleAssistant"),
+            "GAMEMASTER": game.i18n.localize("USER.RoleGamemaster"),
         }
     });
 
     game.settings.register("FVTT-Dishonored", "momentumPermissionLevel", {
-        name: game.i18n.localize('dishonored.settings.names.momentumPermissionLevel'),
-        hint: game.i18n.localize('dishonored.settings.hints.momentumPermissionLevel'),
+        name: game.i18n.localize("dishonored.settings.names.momentumPermissionLevel"),
+        hint: game.i18n.localize("dishonored.settings.hints.momentumPermissionLevel"),
         scope: "world",
         type: String,
         default: "PLAYER",
         config: true,
         choices: {
-          "PLAYER": "Players",
-          "TRUSTED": "Trusted Players",
-          "ASSISTANT": "Assistant Gamemaster",
-          "GAMEMASTER": "Gamemasters",
+            "PLAYER": game.i18n.localize("USER.RolePlayer"),
+            "TRUSTED": game.i18n.localize("USER.RoleTrusted"),
+            "ASSISTANT": game.i18n.localize("USER.RoleAssistant"),
+            "GAMEMASTER": game.i18n.localize("USER.RoleGamemaster"),
         }
     });
 
     game.settings.register("FVTT-Dishonored", "maxNumberOfExperience", {
-        name: game.i18n.localize('dishonored.settings.names.maxNumberOfExperience'),
-        hint: game.i18n.localize('dishonored.settings.hints.maxNumberOfExperience'),
+        name: game.i18n.localize("dishonored.settings.names.maxNumberOfExperience"),
+        hint: game.i18n.localize("dishonored.settings.hints.maxNumberOfExperience"),
         scope: "world",
         type: Number,
         default: 30,
@@ -233,14 +242,21 @@ Hooks.once("init", function() {
     });
 
     game.settings.register("FVTT-Dishonored", "trackerRefreshRate", {
-        name: game.i18n.localize('dishonored.settings.names.trackerRefreshRate'),
-        hint: game.i18n.localize('dishonored.settings.hints.trackerRefreshRate'),
+        name: game.i18n.localize("dishonored.settings.names.trackerRefreshRate"),
+        hint: game.i18n.localize("dishonored.settings.hints.trackerRefreshRate"),
         scope: "world",
         type: Number,
         default: 5,
         config: true
     });
 
+    game.settings.register("FVTT-Dishonored", "ignoreTrackerPermissionsAlert", {
+        scope: "world",
+        type: Boolean,
+        default: false,
+        config: true
+    });
+
     game.settings.register("FVTT-Dishonored", "chaos", {
         scope: "world",
         type: Number,
@@ -255,22 +271,97 @@ Hooks.once("init", function() {
         config: false
     });
 
+    game.settings.register("FVTT-Dishonored", "currentMigrationVersion", {
+        scope: "world",
+        type: String,
+        default: 0,
+        config: false
+    });
+
     Hooks.on("ready", function() {
-        let i = USER_ROLES[game.settings.get("FVTT-Dishonored", "momentumPermissionLevel")];
+        var currentMigVer = game.settings.get("FVTT-Dishonored", "currentMigrationVersion") == 0 ? "0.4.1": game.settings.get("FVTT-Dishonored", "currentMigrationVersion");
+        if (isNewerVersion(game.system.data.version, currentMigVer ?? "0.4.1")) {
+            ui.notifications.notify("Current Migration Version does not match Current Version, running Migration Script.");
+            console.log("Current Migration Version does not match Current Version, running Migration Script.");
+            game.dishonored.migration(currentMigVer);
+        }
+        let i;
+        let error;
+        if (isNewerVersion(versionInfo,"0.8.-1")) {
+            i = foundry.CONST.USER_ROLES[game.settings.get("FVTT-Dishonored", "momentumPermissionLevel")];
+        }
+        else {
+            i = USER_ROLES[game.settings.get("FVTT-Dishonored", "momentumPermissionLevel")];
+        }
         for (i; i <= 4; i++) {
-            if (!game.permissions.SETTINGS_MODIFY.includes(i)) var error = true;
+            if (!game.permissions.SETTINGS_MODIFY.includes(i)) {
+                error = "momentum";
+            }
+        }
+        if (isNewerVersion(versionInfo,"0.8.-1")) {
+            i = foundry.CONST.USER_ROLES[game.settings.get("FVTT-Dishonored", "chaosPermissionLevel")];
+        }
+        else {
+            i = USER_ROLES[game.settings.get("FVTT-Dishonored", "chaosPermissionLevel")];
+        }
+        for (i; i <= 4; i++) {
+            if (!game.permissions.SETTINGS_MODIFY.includes(i)) {
+                error = "chaos";
+            }
         }
         if (error) {
-            console.error(game.i18n.localize('dishonored.notifications.momentumTrackerPermissions'));
-            ui.notifications.error(game.i18n.localize('dishonored.notifications.momentumTrackerPermissions'));
+            let string = "";
+            string += "<span style=\"text-align: center\">";
+            string += game.i18n.localize("dishonored.notifications."+error+".trackerPermissions1");
+            string += "<span style=\"font-weight: bold; color: #ffaaaa; text-decoration: underline; cursor: pointer;\"  onclick=\"a = new PermissionConfig(); a.render(true)\">";
+            string += game.i18n.localize("PERMISSION.Title");
+            string += "</span>";
+            string += game.i18n.localize("dishonored.notifications.trackerPermissions2");
+            string += error == "momentum" ? game.settings.get("FVTT-Dishonored", "momentumPermissionLevel") : game.settings.get("FVTT-Dishonored", "chaosPermissionLevel");
+            string += game.i18n.localize("dishonored.notifications."+error+".trackerPermissions3");
+            string += "<span style=\"font-weight: bold; color: #ffaaaa; text-decoration: underline; cursor: pointer;\" onclick=\"a = new SettingsConfig(); a._tabs[0].active = 'system'; a.render(true);\">"+game.i18n.localize("SETTINGS.TabSystem")+"</span>";
+            string += game.i18n.localize("dishonored.notifications.trackerPermissions4");
+            let tmp = document.createElement("DIV");
+            tmp.innerHTML = string;
+            console.error(tmp.textContent);
+            if (game.settings.get("FVTT-Dishonored", "ignoreTrackerPermissionsAlert") == false && game.user.isGM ) {
+                string +="</br><span style=\"font-weight: bold; color: #ffaaaa; text-decoration: underline; cursor: pointer;\" onclick=\"game.settings.set('FVTT-Dishonored', 'ignoreTrackerPermissionsAlert', 'true');\"> ";
+                string += game.i18n.localize("dishonored.notifications.trackerPermissionsClickHere");
+                string += "</span></span>";
+                ui.notifications.error(string,{"permanent":true});
+            }
         }
-        let t = new DishonoredTracker()
-        renderTemplate("systems/FVTT-Dishonored/templates/apps/tracker.html").then(html => {
+        let t = new DishonoredTracker();
+        renderTemplate("systems/FVTT-Dishonored/templates/apps/tracker.html").then(function() {
             t.render(true);
         });
-        let l = new DishonoredLogo()
-        renderTemplate("systems/FVTT-Dishonored/templates/apps/logo.html").then(html => {
+        let l = new DishonoredLogo();
+        renderTemplate("systems/FVTT-Dishonored/templates/apps/logo.html").then(function() {
             l.render(true);
         });
     });
-});
\ No newline at end of file
+
+    game.dishonored.migration = function(currentMigVer) {
+        var recheck = false;
+        switch (currentMigVer) {
+        case "0.4.1":
+            ui.notifications.notify("Migrating from 0.4.1 to 0.5.0");
+            console.log("Migrating from 0.4.1 to 0.5.0");
+            game.actors.forEach(function(actor) {
+                if (actor.data.type == "character") {
+                    if (actor.data.data.truth1) actor.createOwnedItem({name:actor.data.data.truth1, type: "truth", img:"systems/FVTT-Dishonored/icons/dishonoredlogo.webp"});
+                    if (actor.data.data.truth2) actor.createOwnedItem({name:actor.data.data.truth2, type: "truth", img:"systems/FVTT-Dishonored/icons/dishonoredlogo.webp"});
+                }
+            });
+            game.settings.set("FVTT-Dishonored", "currentMigrationVersion", "0.5.0");
+            currentMigVer = "0.5.0";
+            recheck = true;
+            break;
+        default:
+            recheck = false;
+            break;
+        }
+        if (recheck == true) {game.dishonored.migration(currentMigVer);}
+    };
+});
+
diff --git a/module/items/armor-sheet.js b/module/items/armor-sheet.js
index 2ca170d..d19c515 100644
--- a/module/items/armor-sheet.js
+++ b/module/items/armor-sheet.js
@@ -16,17 +16,17 @@ export class DishonoredArmorSheet extends ItemSheet {
     /** @override */
     get template() {
         if ( !game.user.isGM && this.item.limited) {
-	        ui.notifications.warn(game.i18n.localize('dishonored.notifications.lackPermission'));
+            ui.notifications.warn(game.i18n.localize("dishonored.notifications.lackPermission"));
             return;
         }
-        return `systems/FVTT-Dishonored/templates/items/armor-sheet.html`;
-      }
+        return "systems/FVTT-Dishonored/templates/items/armor-sheet.html";
+    }
 
     /* -------------------------------------------- */
 
     /** @override */
     getData() {
-        const data = super.getData();
+        const data = this.object.data;
         data.dtypes = ["String", "Number", "Boolean"];
 
         return data;
diff --git a/module/items/bonecharm-sheet.js b/module/items/bonecharm-sheet.js
index 3687a53..93f8aa6 100644
--- a/module/items/bonecharm-sheet.js
+++ b/module/items/bonecharm-sheet.js
@@ -16,17 +16,17 @@ export class DishonoredBonecharmSheet extends ItemSheet {
     /** @override */
     get template() {
         if ( !game.user.isGM && this.item.limited) {
-            ui.notifications.warn(game.i18n.localize('dishonored.notifications.lackPermission'));
+            ui.notifications.warn(game.i18n.localize("dishonored.notifications.lackPermission"));
             return;
         }
-        return `systems/FVTT-Dishonored/templates/items/bonecharm-sheet.html`;
-      }
+        return "systems/FVTT-Dishonored/templates/items/bonecharm-sheet.html";
+    }
 
     /* -------------------------------------------- */
 
     /** @override */
     getData() {
-        const data = super.getData();
+        const data = this.object.data;
         data.dtypes = ["String", "Number", "Boolean"];
 
         return data;
diff --git a/module/items/contact-sheet.js b/module/items/contact-sheet.js
index 6df1fdd..50243ea 100644
--- a/module/items/contact-sheet.js
+++ b/module/items/contact-sheet.js
@@ -16,17 +16,17 @@ export class DishonoredContactSheet extends ItemSheet {
     /** @override */
     get template() {
         if ( !game.user.isGM && this.item.limited) {
-            ui.notifications.warn(game.i18n.localize('dishonored.notifications.lackPermission'));
+            ui.notifications.warn(game.i18n.localize("dishonored.notifications.lackPermission"));
             return;
         }
-        return `systems/FVTT-Dishonored/templates/items/contact-sheet.html`;
-      }
+        return "systems/FVTT-Dishonored/templates/items/contact-sheet.html";
+    }
 
     /* -------------------------------------------- */
 
     /** @override */
     getData() {
-        const data = super.getData();
+        const data = this.object.data;
         data.dtypes = ["String", "Number", "Boolean"];
 
         return data;
@@ -51,30 +51,30 @@ export class DishonoredContactSheet extends ItemSheet {
 
         // If the sheet is not editable, hide the Send2Actor button (as the player shouldn't be able to edit this!). Also bump up the size of the Description editor.
         if (!this.options.editable) {
-            html.find('.send2actor')[0].style.display = 'none';
-            html.find('.description')[0].style.height = 'calc(100% - 50px)';
+            html.find(".send2actor")[0].style.display = "none";
+            html.find(".description")[0].style.height = "calc(100% - 50px)";
             return;
         }
 
         // Check if the user has the role set in the system settings. If not hide the button from the user.
         if (!game.user.hasRole(game.settings.get("FVTT-Dishonored", "send2ActorPermissionLevel"))) {
-            html.find('.send2actor')[0].style.display = 'none';
+            html.find(".send2actor")[0].style.display = "none";
         }
         else {
-            html.find('.send2actor').click(ev => {
+            html.find(".send2actor").click(ev => {
                 // Grab the value of the name field, the editor content and the img src and send this to the send2Actor method.
-                var name = html.find('#name')[0].value;
-                var description = html.find('.editor-content')[0].innerHTML;
-                var img = html.find('.img')[0].getAttribute("src");
-                var localisedText = game.i18n.localize('dishonored.notifications.s2A');
-                this.send2Actor(name, description, img).then(created => ui.notifications.info(localisedText.replace('|#|', name)));
+                let name = html.find("#name")[0].value;
+                let description = html.find(".editor-content")[0].innerHTML;
+                let img = html.find(".img")[0].getAttribute("src");
+                let localisedText = game.i18n.localize("dishonored.notifications.s2A");
+                this.send2Actor(name, description, img).then(ui.notifications.info(localisedText.replace("|#|", name)));
             });
         }
     }
 
     // Create an actor with the name, img and notes set from the contact - the actor is hardcoded as NPC here.
     async send2Actor(name, description, img) {
-        let actor = await Actor.create({
+        await Actor.create({
             name: name,
             type: "npc",
             img: img,
@@ -85,6 +85,6 @@ export class DishonoredContactSheet extends ItemSheet {
             token: {},
             items: [],
             flags: {}
-          });
+        });
     }
 }
\ No newline at end of file
diff --git a/module/items/focus-sheet.js b/module/items/focus-sheet.js
index 9e8f6cd..e100463 100644
--- a/module/items/focus-sheet.js
+++ b/module/items/focus-sheet.js
@@ -16,17 +16,17 @@ export class DishonoredFocusSheet extends ItemSheet {
     /** @override */
     get template() {
         if ( !game.user.isGM && this.item.limited) {
-            ui.notifications.warn(game.i18n.localize('dishonored.notifications.lackPermission'));
+            ui.notifications.warn(game.i18n.localize("dishonored.notifications.lackPermission"));
             return;
         }
-        return `systems/FVTT-Dishonored/templates/items/focus-sheet.html`;
-      }
+        return "systems/FVTT-Dishonored/templates/items/focus-sheet.html";
+    }
 
     /* -------------------------------------------- */
 
     /** @override */
     getData() {
-        const data = super.getData();
+        const data = this.object.data;
         data.dtypes = ["String", "Number", "Boolean"];
 
         //Checks if the rating of the focus is above 5 or 2. If it exceeds these bounds it sets it to the closest limit. (i.e. 1 is set to 2)
diff --git a/module/items/item-sheet.js b/module/items/item-sheet.js
index 942023a..d3fb0bc 100644
--- a/module/items/item-sheet.js
+++ b/module/items/item-sheet.js
@@ -16,17 +16,17 @@ export class DishonoredItemSheet extends ItemSheet {
     /** @override */
     get template() {
         if ( !game.user.isGM && this.item.limited) {
-            ui.notifications.warn(game.i18n.localize('dishonored.notifications.lackPermission'));
+            ui.notifications.warn(game.i18n.localize("dishonored.notifications.lackPermission"));
             return;
         }
-        return `systems/FVTT-Dishonored/templates/items/item-sheet.html`;
-      }
+        return "systems/FVTT-Dishonored/templates/items/item-sheet.html";
+    }
 
     /* -------------------------------------------- */
 
     /** @override */
     getData() {
-        const data = super.getData();
+        const data = this.object.data;
         data.dtypes = ["String", "Number", "Boolean"];
 
         return data;
diff --git a/module/items/item.js b/module/items/item.js
index bd903cb..03b0b36 100644
--- a/module/items/item.js
+++ b/module/items/item.js
@@ -1,6 +1,7 @@
 export class DishonoredItem extends Item {
-  prepareData() {
-    this.data.img = '/systems/FVTT-Dishonored/icons/dishonoredlogo.webp';
-    super.prepareData();
-  }
+    prepareData() {
+        if (this.data.img == "icons/svg/item-bag.svg") this.data.img = "/systems/FVTT-Dishonored/icons/dishonoredlogo.webp";
+        if (this.data.img == "icons/svg/mystery-man.svg") this.data.img = "/systems/FVTT-Dishonored/icons/dishonoredlogo.webp";
+        return this.data;
+    }
 }
\ No newline at end of file
diff --git a/module/items/power-sheet.js b/module/items/power-sheet.js
index fd8d69a..e2d1759 100644
--- a/module/items/power-sheet.js
+++ b/module/items/power-sheet.js
@@ -16,17 +16,17 @@ export class DishonoredPowerSheet extends ItemSheet {
     /** @override */
     get template() {
         if ( !game.user.isGM && this.item.limited) {
-            ui.notifications.warn(game.i18n.localize('dishonored.notifications.lackPermission'));
+            ui.notifications.warn(game.i18n.localize("dishonored.notifications.lackPermission"));
             return;
         }
-        return `systems/FVTT-Dishonored/templates/items/power-sheet.html`;
-      }
+        return "systems/FVTT-Dishonored/templates/items/power-sheet.html";
+    }
 
     /* -------------------------------------------- */
 
     /** @override */
     getData() {
-        const data = super.getData();
+        const data = this.object.data;
         data.dtypes = ["String", "Number", "Boolean"];
 
         return data;
diff --git a/module/items/talent-sheet.js b/module/items/talent-sheet.js
index 6fbf40b..1e4d7df 100644
--- a/module/items/talent-sheet.js
+++ b/module/items/talent-sheet.js
@@ -16,17 +16,17 @@ export class DishonoredTalentSheet extends ItemSheet {
     /** @override */
     get template() {
         if ( !game.user.isGM && this.item.limited) {
-            ui.notifications.warn(game.i18n.localize('dishonored.notifications.lackPermission'));
+            ui.notifications.warn(game.i18n.localize("dishonored.notifications.lackPermission"));
             return;
         }
-        return `systems/FVTT-Dishonored/templates/items/talent-sheet.html`;
-      }
+        return "systems/FVTT-Dishonored/templates/items/talent-sheet.html";
+    }
 
     /* -------------------------------------------- */
 
     /** @override */
     getData() {
-        const data = super.getData();
+        const data = this.object.data;
         data.dtypes = ["String", "Number", "Boolean"];
 
         return data;
diff --git a/module/items/truth-sheet.js b/module/items/truth-sheet.js
new file mode 100644
index 0000000..5381e29
--- /dev/null
+++ b/module/items/truth-sheet.js
@@ -0,0 +1,56 @@
+export class DishonoredTruthSheet extends ItemSheet {
+
+    /** @override */
+    static get defaultOptions() {
+        return mergeObject(super.defaultOptions, {
+            classes: ["dishonored", "sheet", "item", "truth"],
+            width: 500,
+            height: 100,
+            tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }]
+        });
+    }
+
+    /* -------------------------------------------- */
+
+    // If the player is not a GM and has limited permissions - send them to the limited sheet, otherwise, continue as usual.
+    /** @override */
+    get template() {
+        if ( !game.user.isGM && this.item.limited) {
+            ui.notifications.warn(game.i18n.localize("dishonored.notifications.lackPermission"));
+            return;
+        }
+        return "systems/FVTT-Dishonored/templates/items/truth-sheet.html";
+    }
+
+    /* -------------------------------------------- */
+
+    /** @override */
+    getData() {
+        const data = this.object.data;
+        data.dtypes = ["String", "Number", "Boolean"];
+
+        return data;
+    }
+
+    /* -------------------------------------------- */
+
+    /** @override */
+    setPosition(options = {}) {
+        const position = super.setPosition(options);
+        const sheetBody = this.element.find(".sheet-body");
+        const bodyHeight = position.height - 192;
+        sheetBody.css("height", bodyHeight);
+        return position;
+    }
+
+    /* -------------------------------------------- */
+
+    /** @override */
+    activateListeners(html) {
+        super.activateListeners(html);
+
+        // Everything below here is only needed if the sheet is editable
+        if (!this.options.editable) return;
+
+    }
+}
\ No newline at end of file
diff --git a/module/items/weapon-sheet.js b/module/items/weapon-sheet.js
index d05352f..eb0cef3 100644
--- a/module/items/weapon-sheet.js
+++ b/module/items/weapon-sheet.js
@@ -16,17 +16,17 @@ export class DishonoredWeaponSheet extends ItemSheet {
     /** @override */
     get template() {
         if ( !game.user.isGM && this.item.limited) {
-            ui.notifications.warn(game.i18n.localize('dishonored.notifications.lackPermission'));
+            ui.notifications.warn(game.i18n.localize("dishonored.notifications.lackPermission"));
             return;
         }
-        return `systems/FVTT-Dishonored/templates/items/weapon-sheet.html`;
-      }
+        return "systems/FVTT-Dishonored/templates/items/weapon-sheet.html";
+    }
 
     /* -------------------------------------------- */
 
     /** @override */
     getData() {
-        const data = super.getData();
+        const data = this.object.data;
         data.dtypes = ["String", "Number", "Boolean"];
 
         return data;
diff --git a/module/macro.js b/module/macro.js
index 7fd4a41..059b3a4 100644
--- a/module/macro.js
+++ b/module/macro.js
@@ -1,31 +1,31 @@
 import {
     DishonoredRoll
-} from './roll.js'
+} from "./roll.js";
 
 export function skillTest(actor, skillName, styleName, focusRating, numberOfDice) {
     let fail = false;  
     if (actor === undefined) {
-        ui.notifications.warn(game.i18n.localize('dishonored.notifications.macroActor'));
+        ui.notifications.warn(game.i18n.localize("dishonored.notifications.macroActor"));
         fail = true;
     }
     if (skillName === undefined) {
-        ui.notifications.warn(game.i18n.localize('dishonored.notifications.macroSkill'));
+        ui.notifications.warn(game.i18n.localize("dishonored.notifications.macroSkill"));
         fail = true;
     }
     if (styleName === undefined) {
-        ui.notifications.warn(game.i18n.localize('dishonored.notifications.macroStyle'));
+        ui.notifications.warn(game.i18n.localize("dishonored.notifications.macroStyle"));
         fail = true;
     }
     if (focusRating < 1) {
-        ui.notifications.warn(game.i18n.localize('dishonored.notifications.macroFocus'));
+        ui.notifications.warn(game.i18n.localize("dishonored.notifications.macroFocus"));
         fail = true;
     }
     if (numberOfDice > 5) {
-        ui.notifications.warn(game.i18n.localize('dishonored.notifications.macroDiceGreater'));
+        ui.notifications.warn(game.i18n.localize("dishonored.notifications.macroDiceGreater"));
         fail = true;
     }
     else if (numberOfDice < 1) {
-        ui.notifications.warn(game.i18n.localize('dishonored.notifications.macroDiceLess'));
+        ui.notifications.warn(game.i18n.localize("dishonored.notifications.macroDiceLess"));
         fail = true;
     }
     if (fail === true) {
diff --git a/module/roll.js b/module/roll.js
index 7945db7..3929bea 100644
--- a/module/roll.js
+++ b/module/roll.js
@@ -2,74 +2,82 @@ export class DishonoredRoll {
 
     async performSkillTest(dicePool, checkTarget, focusTarget, selectedSkill, selectedStyle, speaker) {
         // Define some variables that we will be using later.
+        let r;
         let i;
+        let successText;
+        let complicationText;
         let result = 0;
         let diceString = "";
         let success = 0;
         let complication = 0;
-        // Check if we are using a Foundry version below 0.7.0, if so use the old code.
-        if (!isNewerVersion(game.world.coreVersion,'0.7.0')) {
+        let versionInfo;
+        if (game.world.data) versionInfo = game.world.data.coreVersion;
+        else game.world.coreVersion;
+        // Check if we are using a Foundry version above 0.7.0, use new code.
+        if (isNewerVersion(versionInfo,"0.8.-1")) {
             // Define r as our dice roll we want to perform (1d20, 2d20, 3d20, 4d20 or 5d20). We will then roll it.
-            var r = new Roll(dicePool+"d20")
-            r.roll();
-            // Now for each dice in the dice pool we want to check what the individual result was.
-            for (i = 0; i < dicePool; i++) {
-                result = r.dice[0].rolls[i].roll;
-                // If the result is less than or equal to the focus, that counts as 2 successes and we want to show the dice as green.
-                if (result <= focusTarget) {
-                    diceString += '<li class="roll die d20 max">' + result + '</li>';
-                    success += 2;
-                } 
-                // If the result is less than or equal to the target (the style and skill added together), that counts as 1 success but we want to show the dice as normal.
-                else if (result <= checkTarget) {
-                    diceString += '<li class="roll die d20">' + result + '</li>';
-                    success += 1;
-                }
-                // If the result is 20, than we want to count it as a complication. We also want to show it as red!
-                else if (result == 20) {
-                    diceString += '<li class="roll die d20 min">' + result + '</li>';
-                    complication += 1;
-                }
-                // If none of the above is true, the dice failed to do anything and is treated as normal.
-                else {
-                    diceString += '<li class="roll die d20">' + result + '</li>';
+            r = new Roll(dicePool+"d20");
+            let rollPromise = r.evaluate({async: true});
+            await rollPromise.then(function () {
+                // Now for each dice in the dice pool we want to check what the individual result was.
+                for (i = 0; i < dicePool; i++) {
+                    result = r.terms[0].results[i].result;
+                    // If the result is less than or equal to the focus, that counts as 2 successes and we want to show the dice as green.
+                    if (result <= focusTarget) {
+                        diceString += "<li class=\"roll die d20 max\">" + result + "</li>";
+                        success += 2;
+                    } 
+                    // If the result is less than or equal to the target (the style and skill added together), that counts as 1 success but we want to show the dice as normal.
+                    else if (result <= checkTarget) {
+                        diceString += "<li class=\"roll die d20\">" + result + "</li>";
+                        success += 1;
+                    }
+                    // If the result is 20, than we want to count it as a complication. We also want to show it as red!
+                    else if (result == 20) {
+                        diceString += "<li class=\"roll die d20 min\">" + result + "</li>";
+                        complication += 1;
+                    }
+                    // If none of the above is true, the dice failed to do anything and is treated as normal.
+                    else {
+                        diceString += "<li class=\"roll die d20\">" + result + "</li>";
+                    }
                 }
-            }
+            });
         }
-        // If not use the shiny new code.
+        // If not use the old code.
         else {
             // Define r as our dice roll we want to perform (1d20, 2d20, 3d20, 4d20 or 5d20). We will then roll it.
-            var r = new Roll(dicePool+"d20")
+            r = new Roll(dicePool+"d20");
             r.roll();
             // Now for each dice in the dice pool we want to check what the individual result was.
             for (i = 0; i < dicePool; i++) {
                 result = r.terms[0].results[i].result;
                 // If the result is less than or equal to the focus, that counts as 2 successes and we want to show the dice as green.
                 if (result <= focusTarget) {
-                    diceString += '<li class="roll die d20 max">' + result + '</li>';
+                    diceString += "<li class=\"roll die d20 max\">" + result + "</li>";
                     success += 2;
                 } 
                 // If the result is less than or equal to the target (the style and skill added together), that counts as 1 success but we want to show the dice as normal.
                 else if (result <= checkTarget) {
-                    diceString += '<li class="roll die d20">' + result + '</li>';
+                    diceString += "<li class=\"roll die d20\">" + result + "</li>";
                     success += 1;
                 }
                 // If the result is 20, than we want to count it as a complication. We also want to show it as red!
                 else if (result == 20) {
-                    diceString += '<li class="roll die d20 min">' + result + '</li>';
+                    diceString += "<li class=\"roll die d20 min\">" + result + "</li>";
                     complication += 1;
                 }
                 // If none of the above is true, the dice failed to do anything and is treated as normal.
                 else {
-                    diceString += '<li class="roll die d20">' + result + '</li>';
+                    diceString += "<li class=\"roll die d20\">" + result + "</li>";
                 }
             }
         }
         // Here we want to check if the success was exactly one (as "1 Successes" doesn't make grammatical sense). We create a string for the Successes.
         if (success == 1) {
-            var successText = success + game.i18n.format("dishonored.roll.success");
+            successText = success + game.i18n.format("dishonored.roll.success");
         } else {
-            var successText = success + game.i18n.format("dishonored.roll.successPlural");
+            successText = success + game.i18n.format("dishonored.roll.successPlural");
         }
 
         // Check if we allow multiple complications, or if only one complication ever happens.
@@ -79,29 +87,28 @@ export class DishonoredRoll {
         // If no complications exist then we don't even show this box.
         if (complication >= 1) {
             if (complication > 1 && multipleComplicationsAllowed === true) {
-                var localisedPluralisation = game.i18n.format("dishonored.roll.complicationPlural")
-                var complicationText = '<h4 class="dice-total failure"> ' + localisedPluralisation.replace('|#|', complication) + '</h4>';
+                var localisedPluralisation = game.i18n.format("dishonored.roll.complicationPlural");
+                complicationText = "<h4 class=\"dice-total failure\"> " + localisedPluralisation.replace("|#|", complication) + "</h4>";
             } else {
-                var complicationText = '<h4 class="dice-total failure"> ' + game.i18n.format("dishonored.roll.complication") + '</h4>';
+                complicationText = "<h4 class=\"dice-total failure\"> " + game.i18n.format("dishonored.roll.complication") + "</h4>";
             }
         } else {
-            var complicationText = '';
+            complicationText = "";
         }
 
         // Set the flavour to "[Skill] [Style] Skill Test". This shows the chat what type of test occured.
         let flavor = game.i18n.format("dishonored.actor.skill." + selectedSkill) + " " + game.i18n.format("dishonored.actor.style." + selectedStyle) + game.i18n.format("dishonored.roll.test");
 
         // Build a dynamic html using the variables from above.
-        let html = `
-            <div class="dishonored roll skill">
+        let html = `<div class="dishonored roll skill">
                 <div class="dice-roll">
                     <div class="dice-result">
                         <div class="dice-formula">
                             <table class="aim">
                                 <tr>
                                     <td> ` + dicePool + `d20 </td>
-                                    <td> ` + game.i18n.format("dishonored.roll.html.target") + `:` + checkTarget + ` </td>
-                                    <td> ` + game.i18n.format("dishonored.roll.html.focus") + `:` + focusTarget + ` </td>
+                                    <td> ` + game.i18n.format("dishonored.roll.html.target") + ":" + checkTarget + ` </td>
+                                    <td> ` + game.i18n.format("dishonored.roll.html.focus") + ":" + focusTarget + ` </td>
                                 </tr>
                             </table>
                         </div>
@@ -113,62 +120,55 @@ export class DishonoredRoll {
                             </section>
                         </div>` +
                         complicationText +
-                        `<h4 class="dice-total">` + successText + `</h4>
+                        "<h4 class=\"dice-total\">" + successText + `</h4>
                     </div>
                 </div>
-            </div>
-        `
-        // Check if the dice3d module exists (Dice So Nice). If it does, post a roll in that and then send to chat after the roll has finished. If not just send to chat.
-        if(game.dice3d) {
-            game.dice3d.showForRoll(r).then(displayed => {
-                this.sendToChat(speaker, html, r, flavor);
-            });
-        }
-        else {
-            this.sendToChat(speaker, html, r, flavor);
-        };
+            </div>`;
+        this.sendToChat(CHAT_MESSAGE_TYPES.ROLL, speaker, html, r, flavor);
     }
 
     async performItemRoll(item, speaker) {
         // Create variable div and populate it with localisation to use in the HTML.
+        let valueTag;
         var variablePrompt = game.i18n.format("dishonored.roll.item.quantity");
-        let variable = `<div class='dice-formula'> `+variablePrompt.replace('|#|', item.data.data.quantity)+`</div>`;
+        let variable = "<div class='dice-formula'> "+variablePrompt.replace("|#|", item.data.data.quantity)+"</div>";
         // Create dynamic tags div and populate it with localisation to use in the HTML.
         if (item.data.data.cost > 0) {
             var costLocalisation = game.i18n.format("dishonored.roll.item.value");
-            var valueTag = "<div class='tag'> "+costLocalisation.replace('|#|', item.data.data.cost)+"</div>";
+            valueTag = "<div class='tag'> "+costLocalisation.replace("|#|", item.data.data.cost)+"</div>";
         }
         else {
-            var valueTag = '';
+            valueTag = "";
         }
         // Send the divs to populate a HTML template and sends to chat.
-        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variable, valueTag).then(html=>this.sendToChat(speaker, html));
+        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variable, valueTag).then(html=>this.sendToChat(CHAT_MESSAGE_TYPES.OTHER, speaker, html));
     }
 
     async performFocusRoll(item, speaker) {
         // Create variable div and populate it with localisation to use in the HTML.
         let variablePrompt = game.i18n.format("dishonored.roll.focus.rating");
-        let variable = `<div class='dice-formula'> `+variablePrompt.replace('|#|', item.data.data.rating)+`</div>`;
+        let variable = "<div class='dice-formula'> "+variablePrompt.replace("|#|", item.data.data.rating)+"</div>";
         // Send the divs to populate a HTML template and sends to chat.
-        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variable).then(html=>this.sendToChat(speaker, html));
+        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variable).then(html=>this.sendToChat(CHAT_MESSAGE_TYPES.OTHER, speaker, html));
     }
 
     async performBonecharmRoll(item, speaker) {
         // Populate a HTML template and sends to chat.
-        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description).then(html=>this.sendToChat(speaker, html));
+        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description).then(html=>this.sendToChat(CHAT_MESSAGE_TYPES.OTHER, speaker, html));
     }
 
     async performWeaponRoll(item, speaker) {
         // Create variable div and populate it with localisation to use in the HTML.
+        let tags;
         var variablePrompt = game.i18n.format("dishonored.roll.weapon.damage");
-        let variable = `<div class='dice-formula'> `+variablePrompt.replace('|#|', item.data.data.damage)+`</div>`;
+        let variable = "<div class='dice-formula'> "+variablePrompt.replace("|#|", item.data.data.damage)+"</div>";
         // Create dynamic tags div and populate it with localisation to use in the HTML.
         if (item.data.data.cost > 0) {
             var costLocalisation = game.i18n.format("dishonored.roll.item.value");
-            var tags = "<div class='tag'> "+costLocalisation.replace('|#|', item.data.data.cost)+"</div>";
+            tags = "<div class='tag'> "+costLocalisation.replace("|#|", item.data.data.cost)+"</div>";
         }
         else {
-            var tags = '';
+            tags = "";
         }
         if (item.data.data.qualities.armorpierce) tags += "<div class='tag'> "+game.i18n.format("dishonored.actor.belonging.weapon.armorpierce")+"</div>";
         if (item.data.data.qualities.awkward) tags += "<div class='tag'> "+game.i18n.format("dishonored.actor.belonging.weapon.awkward")+"</div>";
@@ -182,62 +182,64 @@ export class DishonoredRoll {
         if (item.data.data.qualities.rangeddistant) tags += "<div class='tag'> "+game.i18n.format("dishonored.actor.belonging.weapon.distant")+"</div>";
         if (item.data.data.qualities.rangednearby) tags += "<div class='tag'> "+game.i18n.format("dishonored.actor.belonging.weapon.nearby")+"</div>";
         // Send the divs to populate a HTML template and sends to chat.
-        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variable, tags).then(html=>this.sendToChat(speaker, html));
+        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variable, tags).then(html=>this.sendToChat(CHAT_MESSAGE_TYPES.OTHER, speaker, html));
     }
 
     async performArmorRoll(item, speaker) {
         // Create variable div and populate it with localisation to use in the HTML.
+        let valueTag;
         let variablePrompt = game.i18n.format("dishonored.roll.armor.protect");
-        let variable = `<div class='dice-formula'> `+variablePrompt.replace('|#|', item.data.data.protection)+`</div>`;
+        let variable = "<div class='dice-formula'> "+variablePrompt.replace("|#|", item.data.data.protection)+"</div>";
         // Create dynamic tags div and populate it with localisation to use in the HTML.
         if (item.data.data.cost > 0) {
             var costLocalisation = game.i18n.format("dishonored.roll.item.value");
-            var valueTag = "<div class='tag'> "+costLocalisation.replace('|#|', item.data.data.cost)+"</div>";
+            valueTag = "<div class='tag'> "+costLocalisation.replace("|#|", item.data.data.cost)+"</div>";
         }
         else {
-            var valueTag = '';
+            valueTag = "";
         }
         // Send the divs to populate a HTML template and sends to chat.
-        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variable, valueTag).then(html=>this.sendToChat(speaker, html));
+        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variable, valueTag).then(html=>this.sendToChat(CHAT_MESSAGE_TYPES.OTHER, speaker, html));
     }
 
     async performTalentRoll(item, speaker) {
         // Create variable div and populate it with localisation to use in the HTML.
         var variablePrompt = game.i18n.format("dishonored.roll.talent.type");
-        var variable = `<div class='dice-formula'> `+variablePrompt.replace('|#|', item.data.data.type)+`</div>`;
+        var variable = "<div class='dice-formula'> "+variablePrompt.replace("|#|", item.data.data.type)+"</div>";
         // Send the divs to populate a HTML template and sends to chat.
-        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variable).then(html=>this.sendToChat(speaker, html));
+        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variable).then(html=>this.sendToChat(CHAT_MESSAGE_TYPES.OTHER, speaker, html));
     }
 
     async performContactRoll(item, speaker) {
         // Create variable div and populate it with localisation to use in the HTML.
         var variablePrompt = game.i18n.format("dishonored.roll.contact.relation");
-        var variable = `<div class='dice-formula'> `+variablePrompt.replace('|#|', item.data.data.relationship)+`</div>`;
+        var variable = "<div class='dice-formula'> "+variablePrompt.replace("|#|", item.data.data.relationship)+"</div>";
         // Send the divs to populate a HTML template and sends to chat.
-        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variable).then(html=>this.sendToChat(speaker, html));
+        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variable).then(html=>this.sendToChat(CHAT_MESSAGE_TYPES.OTHER, speaker, html));
     }
 
     async performPowerRoll(item, speaker) {
+        let variablePrompt;
         // Create variable div and populate it with localisation to use in the HTML.
         if (item.data.data.manacost > 0) {
             var localisedContent = game.i18n.format("dishonored.roll.power.mana");
-            var variablePrompt = "<div class='dice-formula'> "+localisedContent.replace('|#|', item.data.data.manacost)+"</div>";
+            variablePrompt = "<div class='dice-formula'> "+localisedContent.replace("|#|", item.data.data.manacost)+"</div>";
         }
         else {
-            var variablePrompt = '';
+            variablePrompt = "";
         }
         var runeValue = game.i18n.format("dishonored.roll.power.rune");
         // Create dynamic tags div and populate it with localisation to use in the HTML.
-        var tags = `<div class = 'tag'>`+runeValue.replace('|#|', item.data.data.runecost)+`</div>`;
+        var tags = "<div class = 'tag'>"+runeValue.replace("|#|", item.data.data.runecost)+"</div>";
         // Send the divs to populate a HTML template and sends to chat.
-        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variablePrompt, tags).then(html=>this.sendToChat(speaker, html));
+        this.genericItemTemplate(item.data.img, item.data.name, item.data.data.description, variablePrompt, tags).then(html=>this.sendToChat(CHAT_MESSAGE_TYPES.OTHER, speaker, html));
     }
 
     async genericItemTemplate(img, name, description, variable, tags) {
         // Checks if the following are empty/undefined. If so sets to blank.
-        let descField = description ? description : '';
-        let tagField = tags ? tags : '';
-        let varField = variable ? variable : '';
+        let descField = description ? description : "";
+        let tagField = tags ? tags : "";
+        let varField = variable ? variable : "";
         // Builds a generic HTML template that is used for all items.
         let html = `
             <div class='dishonored roll generic'>
@@ -260,14 +262,16 @@ export class DishonoredRoll {
         return html;
     }
 
-    async sendToChat(speaker, content, roll, flavor) {
+    async sendToChat(type, speaker, content, roll, flavor) {
         // Send's Chat Message to foundry, if items are missing they will appear as false or undefined and this not be rendered.
         ChatMessage.create({
-            user: game.user._id,
+            user: game.user.id,
+            type: type,
             speaker: ChatMessage.getSpeaker({ scene: null, actor: speaker }),
             flavor: flavor,
+            roll: roll, 
+            rollMode: game.settings.get("core", "rollMode"),
             content: content,
-            roll: roll,
             sound: "sounds/dice.wav"
         }).then(msg => {
             return msg;
diff --git a/styles/dishonored.css b/styles/dishonored.css
index 4500f74..6636a2b 100644
--- a/styles/dishonored.css
+++ b/styles/dishonored.css
@@ -1,7 +1,7 @@
 /* Window Content Overrides */
 
 .dishonored .window-content {
-    background: #dadada !important;
+    background: #ffffff !important;
     padding: 0;
 }
 
@@ -9,13 +9,67 @@
 
 /* Globals */
 
+@font-face {
+  font-family: 'EB Garamond';
+  font-style: normal;
+  font-weight: 400;
+  src: local(''),
+       url('../fonts/eb-garamond-v14-latin-ext_latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/eb-garamond-v14-latin-ext_latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+@font-face {
+  font-family: 'EB Garamond';
+  font-style: normal;
+  font-weight: 700;
+  src: local(''),
+       url('../fonts/eb-garamond-v14-latin-ext_latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/eb-garamond-v14-latin-ext_latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+@font-face {
+  font-family: 'EB Garamond';
+  font-style: italic;
+  font-weight: 400;
+  src: local(''),
+       url('../fonts/eb-garamond-v14-latin-ext_latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/eb-garamond-v14-latin-ext_latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+@font-face {
+  font-family: 'EB Garamond';
+  font-style: italic;
+  font-weight: 700;
+  src: local(''),
+       url('../fonts/eb-garamond-v14-latin-ext_latin-700italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
+       url('../fonts/eb-garamond-v14-latin-ext_latin-700italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+::-webkit-scrollbar-thumb {
+    border-radius: 0px;
+    background: #ffffff;
+    border: 1px solid #000000;
+}
+
+::-webkit-scrollbar-track {
+    box-shadow: 0 0 1px #000 inset;
+    border-radius: 0px;
+    background: black;
+}
+
+.notification.error.permanent {
+    text-align: center;
+}
+
+.dishonored {
+    font-family: "EB Garamond";
+}
+
 .dishonored .bold {
     font-weight: bold;
 }
 
 .dishonored .title {
     text-align: center;
-    font-size: 14pt;
+    font-size: 18pt;
+    line-height: 24px;
 }
 
 .dishonored .row {
@@ -65,8 +119,8 @@
 
 .dishonored .track .bar .box {
     height: 14px;
-    border: 1px solid #191919;
-    border-collapse: collapse;
+    outline: 1px solid #191919;
+    margin-left: 1px;
     padding: 0px;
     display: block;
     font-size: 8pt;
@@ -80,119 +134,154 @@
 
 
 
+/* Actor - Globals */
+
+.dishonored.sheet.actor.window-app {
+    min-width: 700px;
+    min-height: 700px;
+}
+
+
+
 /* Actor - Header Section - Globals */
 
 .dishonored.sheet.actor .header-fields {
     flex: 1;
-    background: rgb(255, 255, 255, 0.9);
-    position: sticky;
     top: 0;
-    padding: 5px;
+    position: sticky;
+    background-color: #ffffff;
+    /* padding: 5px; */
 }
 
-.dishonored.sheet.actor .header-fields .row .column {
-    display: flex;
-    width: 100%;
+.dishonored.sheet.actor .header-fields .background {
+    position: absolute;
 }
 
-
-
-/* Actor - Header Section - Specific - Trackers */
-
-.dishonored.sheet.actor .header-fields .section.experience .title {
-    font-size: 14px;
+.dishonored.sheet.actor .header-fields .background.left {
+    left: -1px;
 }
 
+.dishonored.sheet.actor .header-fields .background.right {
+    right: 0px;
+}
 
+.dishonored.sheet.actor .header-fields .slot {
+    position:relative;
+    width: 44%;
+    left: 28%;
+}
 
-/* Actor - Main Section - Globals */
-
-.dishonored.sheet.actor .main {
-    flex: 1;
-    padding: 5px;
+.dishonored.sheet.actor .header-fields .row .column {
+    display: flex;
+    width: 100%;
+    padding-top: 2px;
 }
 
-.dishonored.sheet.actor .main .row {
-    max-height: 250px;
+.dishonored.sheet.actor .header-fields input {
+    font-size: 16pt;
+    height: 30px;
 }
 
-.dishonored.sheet.actor .main .row .limited-only {
-    height: 20px;
+.dishonored.sheet.actor .header-fields select {
+    text-align: center;
+    text-align-last: center;
+    font-family: "EB Garamond";
+    font-size: 16pt;
+    height: 30px;
 }
 
-.dishonored.sheet.actor .main .row .column {
-    width: calc(100% / 3);
-    overflow-y: auto;
+.dishonored.sheet.actor .header-fields .section {
+    padding: 0 4%;
 }
 
-.dishonored.sheet.actor .main .row .column .section .profile-img {
+.dishonored.sheet.actor .header-fields .row .column .section .profile-img {
     width: 150px;
     height: 150px;
     object-fit: cover;
     object-position: 50% 0;
+    border: none;
 }
 
-.dishonored.sheet.actor .main .row .column .section .title {
-    font-size: 18pt;
+.dishonored.sheet.actor .header-fields .tabs {
+    font-size: 16pt;
     font-weight: bold;
+    margin: 0;
+    border-color: #000000;
+    border-bottom: 0;
 }
 
-.dishonored.sheet.actor .main .row .column .section .row {
-    display: flex;
-    flex-direction: row;
-}
 
-.dishonored.sheet.actor .main .row .column .section .entry.row {
-    display: flex;
-    flex-direction: row;
+
+/* Actor - Header Section - Specific - Trackers */
+
+.dishonored.sheet.actor .header-fields .section.experience {
+    padding: 0;
+    position: relative;
 }
 
-.dishonored.sheet.actor .main .row .column .section .notes {
-    height: 200px;
-    text-align: left;
+.dishonored.sheet.actor .header-fields .section.experience .title {
+    font-size: 14pt;
+    padding-top: 8px;
 }
 
-.dishonored.sheet.actor .main .row .column .section .notes .editor {
-    height: 100%;
+.dishonored.sheet.actor .header-fields .section .track .bar .voidchange {
+    width: 10%;
 }
 
 
 
-/* Actor - Main Section - Specific - Trackers */
+/* Actor - Header Section - Specific - Trackers */
 
-.dishonored.sheet.actor .main .row .column .section .track .bar .voidchange {
-    width: 5%;
+.dishonored.sheet.actor .header-fields .section.stress {
+    padding: 0;
+    position: relative;
 }
 
+.dishonored.sheet.actor .stress .track .bar .box {
+    height: 20px;
+    font-size: 10pt;
+}
 
 
-/* Actor - Main Section - Specific - Skills/Styles */
 
-.dishonored.sheet.actor .main .row .column .section .stat.row .field {
-    width: 25%;
+/* Actor - Header Section - Specific - Skills/Styles */
+
+.dishonored.sheet.actor .header-fields .row .column .section .stat.row .field {
+    width: 15%;
+    font-size: 14pt;
+    height: 24px;
+    font-weight: bold;
+}
+
+.dishonored.sheet.actor .header-fields .row .column .section .stat.row .text {
+    width: calc(85% - 30px);
+    font-size: 12pt;
+    font-weight: bold;
 }
 
-.dishonored.sheet.actor .main .row .column .section .stat.row .text {
-    width: calc(75% - 30px);
+.dishonored.sheet.actor .header-fields .row .column .section .stat.row .head-text {
+    font-size: 10pt;
+    font-weight: bold;
 }
 
-.dishonored.sheet.actor .main .row .column .section .stat.row .selector-space {
+.dishonored.sheet.actor .header-fields .row .column .section .stat.row .selector-space {
     width: 30px;
 }
 
-.dishonored.sheet.actor .main .row .column .section .stat.row .selector {
+.dishonored.sheet.actor .header-fields .row .column .section .stat.row .selector {
     border: 1px solid;
     border-collapse: collapse;
     padding: 0px;
     display: block;
+    height: 20px;
 }
 
-.dishonored.sheet.actor .main .row .column .section .stat.row .selector:hover {
+.dishonored.sheet.actor .header-fields .row .column .section .stat.row .selector:hover {
     box-shadow: 0 0 8px red;
     cursor: pointer;
 }
 
-.dishonored.sheet.actor .main .row .column .section .check-button {
+.dishonored.sheet.actor .header-fields .row .column .section .check-button {
     width: 75%;
     height: 30px;
     line-height: 30px;
@@ -202,59 +291,113 @@
 
 
 
-/* Actor - Main Section - Specific - Items */
+/* Actor - Tabbed Section - Globals */
 
-.dishonored.sheet.actor .main .row .column .section .item.row {
-    border: 1px solid #000000;
-    background-color: rgb(255, 255, 255, 0.3);
+.dishonored.sheet.actor .tab {
+    position: absolute;
+    width: 100%;
+    height: calc(100% - 528px);
+    overflow-y: auto;
+}
+
+.dishonored.sheet.actor.character .tab {
+    height: calc(100% - 528px);
+}
+
+.dishonored.sheet.actor.npc .tab {
+    height: calc(100% - 424px);
+}
+
+.dishonored.sheet.actor .tab[data-tab].active {
+    display: flex;
+}
+
+.dishonored.sheet.actor .tab .section {
+    width: 45%;
+    margin: 0 auto;
+}
+
+.dishonored.sheet.actor .tab .section .title {
+    font-size: 18pt;
+    font-weight: bold;
+}
+
+.dishonored.sheet.actor .tab .section .row {
+    display: flex;
+    flex-direction: row;
+}
+
+.dishonored.sheet.actor .tab .section .entry.row {
+    display: flex;
+    flex-direction: row;
+    font-size: 12pt;
+}
+
+
+
+/* Actor - Tabbed Section - Specific - All Items */
+
+.dishonored.sheet.actor .tab .section .item.row {
+    /* border: 1px solid #000000; */
+    border-radius: 5px;
+    background-color: rgb(200, 200, 200, 0.3);
+    font-size: 13pt;
 }
 
-.dishonored.sheet.actor .main .row .column .section .row .image {
+.dishonored.sheet.actor .tab .section .row .image {
     width: 26px;
 }
 
-.dishonored.sheet.actor .main .row .column .section .row .image img {
+.dishonored.sheet.actor .tab .section .row .image img {
     width: 24px;
     height: 24px;
     object-fit: cover;
     object-position: 50% 0;
+    border: none;
 }
 
-.dishonored.sheet.actor .main .row .column .section .row .image .rollable:hover {
-    content: url("/icons/svg/d20-grey.svg");
-    box-shadow: 0 0 8px red;
+.dishonored.sheet.actor .tab .section .row .image .rollable:hover {
+    content: url("/icons/svg/d20-black.svg");
+    /* box-shadow: 0 0 8px red; */
     cursor: pointer;
+    filter: drop-shadow(0px 0px 5px red);
 }
 
-.dishonored.sheet.actor .main .row .column .section .row .control {
+.dishonored.sheet.actor .tab .section .row .control {
     width: 32px;
+    line-height: 17pt;
+    font-size: 14px;
 }
 
-.dishonored.sheet.actor .main .row .column .section .row .column-x1 {
+.dishonored.sheet.actor .tab .section .row .column-x1 {
     width: calc(100% - 58px);
 }
 
-.dishonored.sheet.actor .main .row .column .section .row .column-x2 {
+.dishonored.sheet.actor .tab .section .row .column-x2 {
     width: calc((100% - 58px)/2);
 }
 
-.dishonored.sheet.actor .main .row .column .section .row .column-x2-big {
+.dishonored.sheet.actor .tab .section .row .column-x2-big {
     width: calc(3*((100% - 58px)/4));
 }
 
-.dishonored.sheet.actor .main .row .column .section .row .column-x2-small {
+.dishonored.sheet.actor .tab .section .row .column-x2-small {
     width: calc((100% - 58px)/4);
 }
 
-.dishonored.sheet.actor .main .row .column .section .row .column-x4 {
+.dishonored.sheet.actor .tab .section .row .column-x4 {
     width: calc(100% /4);
 }
 
-.dishonored.sheet.actor .main .row .column .section .row .small input {
+.dishonored.sheet.actor .tab .section .row .column-x6 {
+    width: calc(100% /6);
+}
+
+.dishonored.sheet.actor .tab .small input {
     height: 17px;
 }
 
-.dishonored.sheet.actor .main .row .column .section .row .small.disabled input {
+.dishonored.sheet.actor .tab .section .row .small.disabled input {
     box-shadow: none;
     cursor: default;
     color: grey;
@@ -262,36 +405,173 @@
 
 
 
-/* Actor - Main Section - Specific - Equipable Specific */
+/* Actor - Tabbed Section - Specific - Focus Specific */
+
+.dishonored.sheet.actor .tab .section.focuses {
+    width: 100%;
+    padding: 0 5% 0;
+    top: 20%;
+    position: absolute;
+    overflow-y: auto;
+    height: 80%;
+}
+
+
+/* Actor - Tabbed Section - Specific - Abilities Specific */
+
+.dishonored.sheet.actor .tab.abilities.active {
+    display: block;
+}
+
+
+.dishonored.sheet.actor .tab.abilities .mana {
+    border-top: 1px solid #000000;
+    font-size: 13pt;
+    display: flex;
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+}
+
+.dishonored.sheet.actor .tab.abilities .mana .column-x6 {
+    width: calc(100% /6);
+    display: flex;
+}
+
+.dishonored.sheet.actor .tab.abilities .main {
+    display: flex;
+    overflow-y: auto;
+    top: 20%;
+    position: absolute;
+    padding: 0;
+    bottom: 23px;
+    width: 100%;
+}
+
+.dishonored.sheet.actor.character .tab.abilities .main {
+    height: calc(80% - 23px);
+}
+
+.dishonored.sheet.actor.npc .tab.abilities .main {
+    height: 80%;
+}
+
+
+
+/* Actor - Tabbed Section - Specific - Belonging Specific */
+
+.dishonored.sheet.actor .tab .section.belongings {
+    width: 100%;
+}
+
+.dishonored.sheet.actor .tab .section.belongings .currency {
+    border-top: 1px solid #000000;
+    font-size: 13pt;
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+}
 
-.dishonored.sheet.actor .main .row .column .section .row.equipable .control {
+.dishonored.sheet.actor .tab .section.belongings .main {
+    overflow-y: auto;
+    padding: 0% 5% 1%;
+    top: 20%;
+    position: absolute;
+    bottom: 23px;
+    width: 100%;
+}
+.dishonored.sheet.actor.character .tab .section.belongings .main {
+    height: calc(80% - 23px);
+}
+.dishonored.sheet.actor.npc .tab .section.belongings .main {
+    height: 80%;
+}
+
+.dishonored.sheet.actor .tab .section.belongings .row.equipable .control {
     width: 56px;
 }
 
-.dishonored.sheet.actor .main .row .column .section .row.equipable .column-x1 {
+.dishonored.sheet.actor .tab .section.belongings .row.equipable .column-x1 {
     width: calc(100% - 80px);
 }
 
-.dishonored.sheet.actor .main .row .column .section .row.equipable .column-x2 {
+.dishonored.sheet.actor .tab .section.belongings .row.equipable .column-x2 {
     width: calc((100% - 80px)/2);
 }
 
-.dishonored.sheet.actor .main .row .column .section .row.equipable .column-x2-big {
+.dishonored.sheet.actor .tab .section.belongings .row.equipable .column-x2-big {
     width: calc(3*((100% - 80px)/4));
 }
 
-.dishonored.sheet.actor .main .row .column .section .row .equipable.column-x2-small {
+.dishonored.sheet.actor .tab .section.belongings .row .equipable.column-x2-small {
     width: calc((100% - 80px)/4);
 }
 
+.dishonored.sheet.actor .tab .section.belongings .row .bonecharm input {
+    padding: 0;
+    min-width: 0;
+    width: 10px
+}
+
 
 
-/* Actor - Main Section - Specific - Bonecharm Specific */
+/* Actor - Tabbed Section - Specific - Biography Specific */
 
-.dishonored.sheet.actor .main .row .column .section.belongings .row .bonecharm input {
+.dishonored.sheet.actor .tab.biography .content {
+    width: 100%;
     padding: 0;
-    min-width: 0;
-    width: 10px
+    top: 20%;
+    position: absolute;
+    overflow-y: auto;
+    height: 80%;
+    display: flex;
+}
+
+
+
+/* Actor - Tabbed Section - Specific - Notes Specific */
+
+.dishonored.sheet.actor .tab.notes {
+    margin: 0;
+    padding: 6% 5% 0;
+}
+
+.dishonored.sheet.actor .tab .section.notes {
+    margin: 0;
+    padding: 0 5%;
+    width: 100%;
+    top: 20%;
+    position: absolute;
+    overflow-y: auto;
+    height: 80%;
+    left: 0;
+    bottom: 0;
+}
+
+.dishonored.sheet.actor .tab .section.notes .notes {
+    height: 95%;
+    margin: 0;
+}
+
+.dishonored.sheet.actor .tab .section.notes .notes .editor {
+    height: 100%;
+    margin: 0;
+    overflow: unset;
+}
+
+.dishonored.sheet.actor .tab .section.notes .notes .editor .tox {
+    height: 100% !important;
+    margin: 0;
+}
+
+.dishonored.sheet.actor .tab .section .notes .editor .editor-content {
+    font-size: 16px;
+    overflow-y: unset;
+}
+
+.dishonored.sheet.actor .tab .section .notes .editor .editor-content h1, h2 {
+    line-height: 1.2em;
+    border-color: #4b4a44;
 }
 
 
@@ -341,6 +621,10 @@
     height: 100%;
 }
 
+.dishonored.sheet.item .description .editor .tox {
+    height: 100% !important;
+}
+
 
 
 /* Item - Contact Specific */
@@ -416,6 +700,7 @@
     background: none;
     border: none;
     text-align: left;
+    font-size: 1.2em;
 }
 
 .dishonored.roll.generic .dice-roll .dice-result .dice-formula .img {
@@ -444,51 +729,146 @@
 
 .dishonored.tracker {
     position: absolute;
-    display: block;
-    width: 200px;
-    height: 70px;
-    margin: 5px;
-    margin-right: 0;
-    border: 1px solid black;
 }
 
-.dishonored.tracker.chaos {
-    bottom: 0;
-    right: 304px;
+.dishonored.tracker.panel {
+    right:0;
+    bottom: 5px;
 }
 
-.dishonored.tracker.momentum {
-    bottom: 80px;
+#sidebar:not(.collapsed) ~ .dishonored.tracker.panel{
     right: 304px;
 }
 
-.dishonored.tracker .header {
+.dishonored.tracker.button {
+    cursor: pointer;
+}
+
+.dishonored.tracker.button:hover {
+    text-shadow: 0 0 6px red;
+}
+
+.dishonored.tracker.chaos.number {
+    border-radius: 70px;
+    width: 70px;
+    height: 69px;
+    bottom: 63px;
     text-align: center;
-    font-size: 1.75em;
-    text-transform: uppercase;
-    padding-bottom: 5px;
+    right: 56px;
+    font-size: 45px;
+    z-index: 1;
+    border: none;
+    color: black;
+    font-family: "EB Garamond";
+    font-weight: bold;
+    text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
 }
 
-.dishonored.tracker .button-group {
-    display: flex;
-    font-size: 1.5em;
+.dishonored.tracker.chaos.increase {
+    bottom: 108px;
+    right: 11.5px;
+    font-size: 24px;
+    z-index: 1;
+    text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
+}
+
+.dishonored.tracker.chaos.decrease {
+    bottom: 79px;
+    right: 9px;
+    font-size: 20px;
+    z-index: 1;
+    text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
+}
+
+.dishonored.tracker.chaos.header {
+    right: 25px;
+    bottom: 0px;
+    color: #ffffff;
+    z-index: 1
+}
+
+.dishonored.tracker.momentum.header {
+    bottom: 25px;
+    right: 280px;
+    z-index: 1;
+    text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
 }
 
-.dishonored.tracker .button-group .button {
-    padding: 0 10px;
+.dishonored.tracker.momentum.track {
+    position: relative;
+}
+
+.dishonored.tracker.momentum.track.item.track-1 {
+    left: 42px;
+}
+
+.dishonored.tracker.momentum.track.item.track-2 {
+    left: calc(42px + 83px);
+}
+
+.dishonored.tracker.momentum.track.item.track-3 {
+    left: calc(42px + 83px + 83px);
+}
+
+.dishonored.tracker.momentum.track.item.track-4 {
+    left: calc(42px + 83px + 83px + 83px);
+}
+
+.dishonored.tracker.momentum.track.item.track-5 {
+    left: calc(42px + 83px + 83px + 83px + 83px);
+}
+
+.dishonored.tracker.momentum.track.item.track-6 {
+    left: calc(42px + 83px + 83px + 83px + 83px + 83px);
+}
+
+.dishonored.tracker.momentum.track.item.background {
+    position: absolute; 
+    bottom: 8px;
+    pointer-events: none;
+    text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
+}
+
+.dishonored.tracker.momentum.track.item.background.svg:hover {
+    filter: drop-shadow(0 0 6px red);
+}
+
+.dishonored.tracker.momentum.track.item.background.slot {
+    pointer-events: auto;
+    stroke:white; 
+    stroke-width:2px; 
+    fill: transparent;
+    z-index: 5;
     cursor: pointer;
 }
 
-.dishonored.tracker .button-group .button:hover {
-    text-shadow: 0 0 8px red;
+.dishonored.tracker.momentum.track.item.foreground {
+    position: absolute;
+    width: 83px;
+    display: inline;
+    text-align: center;
+    bottom: 8px;
+    z-index: 1;
+    font-size: 20px;
+    line-height: 20px;
+    font-weight: bold;
+    cursor: pointer;
+    text-shadow: -1px 0 white, 0 1px white, 1px 0 white, 0 -1px white;
 }
 
-.dishonored.tracker .button-group .input {
-    color: white;
+.dishonored.tracker.momentum.track.item.foreground:hover ~ .dishonored.tracker.momentum.track.item.background.svg {
+    filter: drop-shadow(0 0 6px red);
+}
+
+.dishonored.tracker.header {
+    font-weight: bold;
     text-align: center;
+    font-size: 2em;
+    text-transform: uppercase;
 }
 
 
+
 /* Logo - Generic */
 
 .dishonored.logo {
@@ -511,6 +891,4 @@
     font-size: 10px;
     line-height: 0.1;
     text-align: center;
-}
-
-
+}
\ No newline at end of file
diff --git a/system.json b/system.json
index 4f8ac1a..c6e57d7 100644
--- a/system.json
+++ b/system.json
@@ -2,9 +2,9 @@
     "name": "FVTT-Dishonored",
     "title": "Dishonored Roleplaying Game Unofficial",
     "description": "An unofficial rendition of the Modiphius tabletop role playing game system.",
-    "version": "0.4.1",
-    "minimumCoreVersion": "0.6.4",
-    "compatibleCoreVersion": "0.7.9",
+    "version": "0.5.0",
+    "minimumCoreVersion": "0.7.0",
+    "compatibleCoreVersion": "0.8.1",
     "templateVersion": 1,
     "author": "KaitoR95",
     "esmodules": ["module/dishonored.js"],
diff --git a/template.json b/template.json
index 992ec86..6d4c47b 100644
--- a/template.json
+++ b/template.json
@@ -9,7 +9,6 @@
                     "value": 0,
                     "max": 4
                 },
-                "truth1": "",
                 "skills": {
                     "fight": {
                         "label": "dishonored.actor.skill.fight",
@@ -83,7 +82,6 @@
                 "value": 0,
                 "max": 6
             },
-            "truth2": "",
             "archetype": "",
             "outlook": "",
             "void": {
@@ -99,11 +97,30 @@
             "bonecharmequipped": 0
         },
         "npc": {
-            "templates": ["common"]
+            "templates": ["common"],
+            "type": "Incidental",
+            "types": {
+                "incidental": {
+                    "label": "dishonored.actor.npc.incidental",
+                    "dtype": "String"
+                },
+                "notable": {
+                    "label": "dishonored.actor.npc.notable",
+                    "dtype": "String"
+                },
+                "minor": {
+                    "label": "dishonored.actor.npc.minor",
+                    "dtype": "String"
+                },
+                "major": {
+                    "label": "dishonored.actor.npc.major",
+                    "dtype": "String"
+                }
+            }
         }
     },
     "Item": {
-        "types": ["item", "focus", "bonecharm", "weapon", "armor", "talent", "contact", "power"],
+        "types": ["item", "focus", "bonecharm", "weapon", "armor", "talent", "contact", "power", "truth"],
         "templates": {
             "common": {
                 "description": ""
@@ -153,7 +170,7 @@
         },
         "contact": {
             "templates": ["common"],
-            "relationship": "neutral",
+            "relationship": "Neutral",
             "relationships": {
                 "great": {
                     "label": "dishonored.contact.relation.great",
@@ -181,6 +198,8 @@
             "templates": ["common"],
             "manacost": 0,
             "runecost": 0
+        },
+        "truth": {
         }
     }
 }
\ No newline at end of file
diff --git a/templates/actors/character-sheet-0.7.9.html b/templates/actors/character-sheet-0.7.9.html
new file mode 100644
index 0000000..df4f19a
--- /dev/null
+++ b/templates/actors/character-sheet-0.7.9.html
@@ -0,0 +1,483 @@
+<form class="{{cssClass}}" autocomplete="off">
+    <div class="main-content">
+        <div style="display:none">
+            <div>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/fight-boldly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/fight-carefully.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/fight-cleverly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/fight-forcefully.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/fight-quietly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/fight-swiftly.svg"></img>
+            </div>
+            <div>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/move-boldly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/move-carefully.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/move-cleverly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/move-forcefully.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/move-quietly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/move-swiftly.svg"></img>
+            </div>
+            <div>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/study-boldly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/study-carefully.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/study-cleverly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/study-forcefully.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/study-quietly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/study-swiftly.svg"></img>
+            </div>
+            <div>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/survive-boldly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/survive-carefully.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/survive-cleverly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/survive-forcefully.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/survive-quietly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/survive-swiftly.svg"></img>
+            </div>
+            <div>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/talk-boldly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/talk-carefully.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/talk-cleverly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/talk-forcefully.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/talk-quietly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/talk-swiftly.svg"></img>
+            </div>
+            <div>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/tinker-boldly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/tinker-carefully.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/tinker-cleverly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/tinker-forcefully.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/tinker-quietly.svg"></img>
+                <img style="width: 50px" src="/systems/FVTT-Dishonored/icons/tinker-swiftly.svg"></img>
+            </div>
+        </div>
+        <div class="header-fields">
+            <svg width="701" height="263" viewBox="0 0 211.66663 79.375012" id="svg8" class="background left">
+                <metadata id="metadata5" />
+                <g id="layer1" transform="translate(0,-217.62484)">
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 58.212875,256.12624 41.014958,217.76166 h -7.9375 l 18.520833,34.39583 c 0,0 3.96875,-1.32291 6.614584,3.96875 z" id="path3823" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 59.531249,278.62037 C 22.489583,217.7662 22.489583,217.7662 22.489583,217.7662 h -11.90625 z" id="path3825" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 0.13929219,218.02437 v 13.22916 L 27.920541,260.3577 c 0,0 -3.968749,-5.29162 1.322917,-2.64583 L 13.262521,235.91992 c -0.600082,0.34606 -1.280291,0.52903 -1.973006,0.53071 -2.1918793,0 -3.9687489,-1.77687 -3.9687489,-3.96875 0.0014,-1.10842 0.4662641,-2.16575 1.2820922,-2.9161 z" id="path3829" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 0.12716996,244.04689 v 7.93746 l 4.30981434,3.44785 c 0.6332598,-0.39981 1.3667213,-0.61229 2.1156332,-0.61288 2.19188,0 3.9687495,1.77687 3.9687495,3.96875 -0.0017,0.45188 -0.08048,0.90016 -0.233061,1.3255 l 16.297197,13.03745 h 5.291666 z" id="path3831" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 0.14533709,257.34868 v 7.93754 L 30.57242,278.51539 c 0,0 -5.291667,-2.64584 -5.291667,-3.96875 L 7.8678632,262.63259 c -0.4719416,0.19159 -0.9763504,0.29054 -1.4856973,0.29146 -2.1918801,0 -3.9687501,-1.77687 -3.9687501,-3.96875 7.435e-4,-0.0178 0.0016,-0.0355 0.00258,-0.0532 z" id="path3835" />
+                </g>
+            </svg>
+            <svg width="701" height="263" viewBox="0 0 211.66663 79.375012" id="svg8" class="background right">
+                <metadata id="metadata5" />
+                <g id="layer1" transform="translate(0,-217.62484)">
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.29959881px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 211.51311,225.37769 -9.84346,11.32039 a 2.995988,2.995988 0 0 1 1.17674,2.37573 2.995988,2.995988 0 0 1 -2.99599,2.99598 2.995988,2.995988 0 0 1 -2.10128,-0.86368 l -2.48691,2.86023 a 2.9959881,2.9959881 0 0 1 1.05679,2.28327 2.9959881,2.9959881 0 0 1 -2.99599,2.99599 2.9959881,2.9959881 0 0 1 -1.9901,-0.7607 l -2.99131,3.43953 a 2.9959881,2.9959881 0 0 1 0.7016,1.92224 2.9959881,2.9959881 0 0 1 -2.99599,2.99598 2.9959881,2.9959881 0 0 1 -1.58401,-0.45759 l -7.40396,8.51458 v 5.31788 l -14.97994,16.47793 h -3.97319 l -6.51277,7.48997 c 0,0 9.35611,-1.69482 30.12373,-23.25519 h -1.4348 l 31.23084,-31.23083 z" id="path4690" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 178.67724,217.76614 -15.875,39.6875 v 5.29167 l 26.45834,-44.97917 z" id="path4680" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 203.5945,217.7661 -13.22916,18.1901 v 1.65365 l -17.19792,23.8125 h -1.32292 l -10.58333,14.55208 v 5.29167 l 1.32292,-3.96875 11.90625,-14.55209 h 2.07067 l 23.8032,-28.81426 a 2.6458332,2.6458332 0 0 1 -1.02216,-2.08514 2.6458332,2.6458332 0 0 1 2.64583,-2.64583 2.6458332,2.6458332 0 0 1 1.74202,0.6568 l 7.8021,-9.4449 v -2.64583 z" id="path4684" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path4761" cx="158.87053" cy="285.02679" r="1.3229166" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 600,0 -20,190 22.95898,-87.24805 a 9.9999997,9.9999997 0 0 1 -4.71093,-8.472653 9.9999997,9.9999997 0 0 1 9.56836,-9.984375 l 5.34179,-20.300781 a 9.9999996,9.9999996 0 0 1 -4.23242,-8.160157 9.9999996,9.9999996 0 0 1 8.9961,-9.939453 l 4.0664,-15.453125 a 9.9999995,9.9999995 0 0 1 -6.26758,-9.269531 9.9999995,9.9999995 0 0 1 10,-10 9.9999995,9.9999995 0 0 1 1.31446,0.09766 L 630,0 Z" transform="matrix(0.26458333,0,0,0.26458333,0,217.62484)" id="path4767"/>
+                </g>
+            </svg>
+            <div class="slot">
+                <div class="row">
+                    <div class="column bold title" style="width:85%">
+                        {{localize 'dishonored.actor.character.name'}}
+                    </div>
+                    <div class="column bold title" style="width:15%">
+                        {{localize 'dishonored.actor.character.age'}}
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="column" style="width:85%">
+                        <input name="name" type="text" value="{{name}}" placeholder="Name" />
+                    </div>
+                    <div class="column" style="width:15%">
+                        <input name="data.age" type="text" value="{{data.age}}" placeholder="21" />
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="column bold title" style="width:100%">
+                        {{localize 'dishonored.actor.character.outlook'}}
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="column" style="width:100%">
+                        <input name="data.outlook" type="text" value="{{data.outlook}}" />
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="column bold title" style="width:100%">
+                        {{localize 'dishonored.actor.character.archetype'}}
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="column" style="width:100%">
+                        <input name="data.archetype" type="text" value="{{data.archetype}}" />
+                    </div>
+                </div>
+            </div>
+            <div class="section experience">
+                <div class="title bold">
+                    {{localize 'dishonored.actor.character.experience'}}
+                </div>
+                <div class="track">
+                    <input type="hidden" id="total-exp" name="data.experience" value="{{data.experience}}" data-dtype="Number" />
+                    <div id="bar-exp-renderer" class=" bar"></div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="column">
+                    <div class="section skill">
+                        <div class="title bold">
+                            {{localize 'dishonored.actor.skill.title'}}
+                        </div>
+                        <div class="stat row">
+                            <div class="selector-space"></div>
+                            <div class="text bold head-text">{{localize 'dishonored.actor.skill.name'}}</div>
+                            <div class="field bold head-text">{{localize 'dishonored.actor.skisty.mod'}}</div>
+                        </div>
+                        {{#each data.data.skills as |skill key|}}
+                        <div class="stat row">
+                            <input class="selector skill" id="{{key}}.selector" type="checkbox" name="data.skills.{{key}}.selected" data-dtype="Boolean" {{checked skill.selected}}>
+                            <div class="text"> {{localize skill.label}} </div>
+                            <input class="field" id="{{key}}" name="data.skills.{{key}}.value" type="text" value="{{skill.value}}" />
+                        </div>
+                        {{/each}}
+                        {{#each data.skills as |skill key|}}
+                        <div class="stat row">
+                            <input class="selector skill" id="{{key}}.selector" type="checkbox" name="data.skills.{{key}}.selected" data-dtype="Boolean" {{checked skill.selected}}>
+                            <div class="text"> {{localize skill.label}} </div>
+                            <input class="field" id="{{key}}" name="data.skills.{{key}}.value" type="text" value="{{skill.value}}" />
+                        </div>
+                        {{/each}}
+                        <div class="separator"></div>
+                        <div class="check-button btn" title="{{localize 'dishonored.actor.skisty.check'}}">{{localize 'dishonored.actor.skisty.check'}}</div>
+
+                    </div>
+                </div>
+                <div class="column">
+                    <div class="section stress">
+                        <div class="title bold">
+                            {{localize 'dishonored.actor.character.stress'}}
+                        </div>
+                        <div class="track">
+                            <input type="hidden" id="total-stress" name="data.stress.value" value="{{data.stress.value}}" data-dtype="Number" />
+                            <input type="hidden" id="max-stress" name="data.stress.max" value="{{data.stress.max}}" data-dtype="Number" />
+                            <div id="bar-stress-renderer" class=" bar"></div>
+                        </div>
+                    </div>
+                    <div class="separator"></div>
+                    <div class="section img">
+                        <img class="profile-img" src="{{img}}" data-edit="img" title="{{actor.name}}" />
+                    </div>
+                    <div class="separator"></div>
+                    <div class="section void">
+                        <div class="title bold">
+                            {{localize 'dishonored.actor.character.void'}}
+                        </div>
+                        <div class="track">
+                            <input type="hidden" id="total-void" name="data.void.value" value="{{data.void.value}}" data-dtype="Number" />
+                            <input type="hidden" id="max-void" name="data.void.max" value="{{data.void.max}}" data-dtype="Number" />
+                            <div class="bar">
+                                <div class="voidchange box" id="decrease-void-max"><i class="fas fa-minus"></i></div>
+                                <div id="bar-void-renderer" class="bar"></div>
+                                <div class="voidchange box" id="increase-void-max"><i class="fas fa-plus"></i></div>
+                            </div>
+                            
+                        </div>
+                    </div>
+                </div>
+                <div class="column">
+                    <div class="section style">
+                        <div class="title bold">
+                            {{localize 'dishonored.actor.style.title'}}
+                        </div>
+                        <div class="stat row">
+                            <div class="field bold head-text">{{localize 'dishonored.actor.skisty.mod'}}</div>
+                            <div class="text bold head-text">{{localize 'dishonored.actor.style.name'}}</div>
+                            <div class="selector-space"></div>
+                        </div>
+                        {{#each data.data.styles as |style key|}}
+                        <div class="stat row">
+                            <input class="field" id="{{key}}" name="data.styles.{{key}}.value" type="text" value="{{style.value}}" placeholder="Name" />
+                            <div class="text"> {{localize style.label}} </div>
+                            <input class="selector style" id="{{key}}.selector" type="checkbox" name="data.styles.{{key}}.selected" data-dtype="Boolean" {{checked style.selected}}>
+                        </div>
+                        {{/each}}
+                        {{#each data.styles as |style key|}}
+                        <div class="stat row">
+                            <input class="field" id="{{key}}" name="data.styles.{{key}}.value" type="text" value="{{style.value}}" placeholder="Name" />
+                            <div class="text"> {{localize style.label}} </div>
+                            <input class="selector style" id="{{key}}.selector" type="checkbox" name="data.styles.{{key}}.selected" data-dtype="Boolean" {{checked style.selected}}>
+                        </div>
+                        {{/each}}
+                        <div class="separator"></div>
+                        <div class="check-button btn" title="{{localize 'dishonored.actor.skisty.check'}}">{{localize 'dishonored.actor.skisty.check'}}</div>
+                    </div>
+                </div>
+            </div>
+            <nav class="sheet-tabs tabs" data-group="primary">
+                <a class="item" data-tab="focuses">{{localize 'dishonored.actor.focus.title'}}</a>
+                <a class="item" data-tab="abilities">Abilities</a>
+                <a class="item" data-tab="belongings">{{localize 'dishonored.actor.belonging.title'}}</a>
+                <a class="item" data-tab="biography">Biography</a>
+                <a class="item" data-tab="notes">{{localize 'dishonored.actor.note.title'}}</a>
+            </nav>
+        </div>
+        <section class="sheet-body">
+            <svg width="1920" height="451.40601" viewBox="0 0 507.99999 119.43451" style="width:100%; height:auto; position: absolute;">
+                <g id="layer1" transform="translate(0,-177.56548)">
+                    <path style="fill:#000000;stroke:none;stroke-width:0.27021405px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 251.29904,177.56549 c 0,0 -26.40321,8.3095 -42.27821,8.3095 H 14.552083 c -0.218435,-2.36895 -1.51998,-3.88442 7.9375,-7.9375 -17.5639082,4.05308 -19.8437497,13.49375 -19.8437497,13.49375 0,0 -0.79375,-2.91042 -1.3229166,-8.20209 -0.1012742,17.16706 -0.081664,41.29768 0.028154,62.4301 0,1.3512 3e-7,2.70239 -1.35107080000004,-2.70211 0,9.45749 0.05674275,1.38109 0,13.51066 0,12.15955 5.12274970000004,27.2468 13.22916710000004,40.75754 v -10.80869 c -4.0532084,-9.45731 -2.702139,-21.61693 -1.351068,-29.7235 -1.294766,-0.70358 -1.253477,-0.77596 -1.282109,-3.47799 l -0.01266,-1.19434 H 6.6145833 c -1.3510712,5e-5 -1.3510712,-2.64578 0,-2.64583 h 3.9687497 v -2.64584 H 6.6145833 c -1.3510644,-0.004 -1.3510712,-2.64583 0,-2.64583 h 3.9687497 v -2.64583 H 6.6145833 c -1.3510712,0 -1.3510712,-2.64584 0,-2.64584 H 7.9375 V 218.9479 c 0,0 -0.056305,-2.64583 2.645833,-2.64583 v -3.43958 c -1.5524816,-0.9712 -2.645829,-2.70808 -2.645829,-4.49792 0,-2.70225 2.589529,-5.29116 5.291667,-5.29167 l 220.927079,-1.4e-4 c 0,-9.26041 7.9375,-17.19791 17.19792,-17.19791 z M 8.9958333,189.84374 c 1.1294137,0 2.1728277,0.50947 2.9104167,1.32291 12.964583,0 150.16241,0.0877 210.34375,0 0.73381,-0.70494 1.81389,-1.30638 2.91042,-1.30638 2.11666,0 3.95831,1.90684 3.96353,3.98786 0.005,2.08102 -1.84687,3.93311 -3.96353,3.93311 -1.1186,0 -2.17391,-0.52272 -2.91042,-1.32292 H 11.90625 c -0.736313,0.79801 -1.793616,1.32292 -2.9104167,1.32292 -2.1166666,0 -3.96875,-1.85209 -3.96875,-3.96875 0,-2.11667 1.8520834,-3.96875 3.96875,-3.96875 z M 3.96875,250.6979 c 0.05139,1.99733 1.3408357,3.96875 3.96875,3.96875 0,1.70732 0,3.96875 1.0583333,3.96875 -1.5726561,6.93242 -2.38125,15.875 1.5874997,27.78125 v 1.32292 C 6.6145833,281.12499 4.7625,273.18749 3.3504756,265.30616 2.6458333,259.95832 2.6458333,255.98957 2.6458333,253.34374 v -5.29167 z" id="path1366"/>
+                    <ellipse style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.39883763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path836" cx="13.256729" cy="208.32764" rx="3.9883728" ry="3.9883788" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.77535379;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path822" r="1.9383832" cy="258.62711" cx="5.3950624" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47601172;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path822-6" r="1.1900285" cy="255.00548" cx="4.2051063" />
+                    <path style="fill:#000000;stroke:none;stroke-width:0.27021405px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 256.70096,177.56549 c 0,0 26.40321,8.3095 42.27821,8.3095 h 194.46874 c 0.21844,-2.36895 1.51998,-3.88442 -7.9375,-7.9375 17.56391,4.05308 19.84375,13.49375 19.84375,13.49375 0,0 0.79375,-2.91042 1.32292,-8.20209 0.10127,17.16706 0.0817,41.29768 -0.0282,62.4301 0,1.3512 0,2.70239 1.35107,-2.70211 0,9.45749 -0.0568,1.38109 0,13.51066 0,12.15955 -5.12275,27.2468 -13.22917,40.75754 v -10.80869 c 4.05321,-9.45731 2.70214,-21.61693 1.35107,-29.7235 1.29476,-0.70358 1.25347,-0.77596 1.28211,-3.47799 l 0.0127,-1.19434 h 3.96874 c 1.35107,5e-5 1.35107,-2.64578 0,-2.64583 h -3.96875 v -2.64584 h 3.96875 c 1.35107,-0.004 1.35107,-2.64583 0,-2.64583 h -3.96875 v -2.64583 h 3.96875 c 1.35107,0 1.35107,-2.64584 0,-2.64584 h -1.32291 V 218.9479 c 0,0 0.0563,-2.64583 -2.64584,-2.64583 v -3.43958 c 1.55249,-0.9712 2.64583,-2.70808 2.64583,-4.49792 0,-2.70225 -2.58953,-5.29116 -5.29166,-5.29167 l -220.92708,-1.4e-4 c 0,-9.26041 -7.9375,-17.19791 -17.19792,-17.19791 z m 242.3032,12.27825 c -1.12941,0 -2.17282,0.50947 -2.91041,1.32291 -12.96459,0 -150.16241,0.0877 -210.34375,0 -0.73381,-0.70494 -1.81389,-1.30638 -2.91042,-1.30638 -2.11666,0 -3.95831,1.90684 -3.96353,3.98786 -0.005,2.08102 1.84687,3.93311 3.96353,3.93311 1.1186,0 2.17391,-0.52272 2.91042,-1.32292 h 210.34375 c 0.73631,0.79801 1.79361,1.32292 2.91041,1.32292 2.11667,0 3.96875,-1.85209 3.96875,-3.96875 0,-2.11667 -1.85208,-3.96875 -3.96875,-3.96875 z m 5.02709,60.85416 c -0.0514,1.99733 -1.34084,3.96875 -3.96875,3.96875 0,1.70732 0,3.96875 -1.05834,3.96875 1.57266,6.93242 2.38125,15.875 -1.5875,27.78125 v 1.32292 c 3.96875,-6.61458 5.82084,-14.55208 7.23286,-22.43341 0.70464,-5.34784 0.70464,-9.31659 0.70464,-11.96242 v -5.29167 z" id="path1366-0"/>
+                    <ellipse style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.39883763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path836-6" cx="-494.74329" cy="208.32762" rx="3.9883728" ry="3.9883788" transform="scale(-1,1)" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.77535379;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path822-0" r="1.9383832" cy="258.62714" cx="-502.60495" transform="scale(-1,1)" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47601172;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path822-6-4" r="1.1900285" cy="255.00548" cx="-503.79489" transform="scale(-1,1)" />
+                </g>
+            </svg>
+            <div class="tab focuses active" data-group="primary" data-tab="focuses">
+                <div class="section focuses">
+                    <div class="row item">
+                        <div class="image"></div>
+                        <div class="column-x2-big bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
+                        <div class="column-x2-small bold">{{localize 'dishonored.actor.focus.rating'}}</div>
+                        <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="focus"><i class="fas fa-plus"></i></a>
+                    </div>
+                    {{#each items as |item id|}}
+                    {{#if (eq item.type "focus")}}
+                    <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                        <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                        <h4 class="column-x2-big">{{item.name}}</h4>
+                        <h4 class="column-x2-small">{{item.data.rating}}</h4>
+                        <div class="control">
+                            <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                            <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                        </div>
+                    </li>
+                    {{/if}}
+                    {{/each}}
+                </div>
+            </div>
+            <div class="tab abilities" data-group="primary" data-tab="abilities">
+                <svg width="1920" height="451.40601" viewBox="0 0 507.99999 119.43451" style="width:100%; height:auto; position: absolute;">
+                    <g id="layer1" transform="translate(0,-177.56548)">
+                        <path style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25369042;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="m 243.41667,203.33748 c 7.9375,24.19046 7.9375,48.00327 10.58333,71.81577 2.64583,-23.8125 2.64581,-47.62531 10.58333,-71.81577 -5.29168,3.02379 -7.94394,3.0171 -10.58333,3.0241 -2.65231,0.007 -5.29167,-2.6e-4 -10.58333,-3.0241 z m 5.29166,5.66994 c 2.64584,1.72672 3.96552,1.73048 5.29167,1.72651 1.31969,-0.003 2.64583,2.1e-4 5.29167,-1.72651 -3.96877,13.81402 -3.96877,27.41222 -5.29167,41.01041 -1.32291,-13.59819 -1.32291,-27.19639 -5.29167,-41.01041 z" id="svgColumnSeperator"/>
+                    </g>
+                </svg>
+                <div class="mana">
+                    <div class="column-x6 small"></div>
+                    <div class="column-x6 small"></div>
+                    <div class="column-x6 bold">{{localize 'dishonored.actor.abilities.mana'}}</div>
+                    <div class="column-x6 small">
+                        <div class="small"><input name="data.mana.value" type="text" value="{{data.mana.value}}" placeholder="0"/></div>
+                        <div class="advisory">/</div>
+                        <div class="small disabled"><input id="max-mana" name="data.mana.max" type="text" value="{{data.mana.max}}" readonly/></div>
+                    </div>
+                    <div class="column-x6 small"></div>
+                    <div class="column-x6 small"></div>
+                </div>
+                <div class="main">
+                    <div class="section talents">
+                        <div class="title">
+                            {{localize 'dishonored.actor.talent.title'}}
+                        </div>
+                        <div class="row item">
+                            <div class="image"></div>
+                            <div class="column-x1 bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
+                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="talent"><i class="fas fa-plus"></i></a>
+                        </div>
+                        {{#each items as |item id|}}
+                        {{#if (eq item.type "talent")}}
+                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                            <h4 class="column-x1">{{item.name}}</h4>
+                            <div class="control">
+                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                            </div>
+                        </li>
+                        {{/if}}
+                        {{/each}}
+                    </div>
+                    <div class="section powers">
+                        <div class="title">
+                            {{localize 'dishonored.actor.power.title'}}
+                        </div>
+                        <div class="row item">
+                            <div class="image"></div>
+                            <div class="column-x1 bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
+                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="power"><i class="fas fa-plus"></i></a>
+                        </div>
+                        {{#each items as |item type id|}}
+                        {{#if (eq item.type "power")}}
+                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                            <h4 class="column-x1">{{item.name}}</h4>
+                            <div class="control">
+                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                            </div>
+                        </li>
+                        {{/if}}
+                        {{/each}}
+                    </div>
+                </div>
+            </div>
+            <div class="tab belongings" data-group="primary" data-tab="belongings">
+                <div class="section belongings">
+                    <div class="currency row">
+                        <div class="column-x6 bold">{{localize 'dishonored.actor.belonging.collectable.bonecharm'}}</div>
+                        <div class="column-x6 small bonecharmCount">
+                            <span class="small bonecharm disabled"><input name="data.bonecharmequipped" type="text" value="{{data.bonecharmequipped}}" readonly/></span>/3
+                        </div>
+                        <div class="column-x6 bold">{{localize 'dishonored.actor.belonging.collectable.rune'}}</div>
+                        <div class="column-x6 small"><input name="data.runes" type="text" value="{{data.runes}}" placeholder="0"/></div>
+                        <div class="column-x6 bold">{{localize 'dishonored.actor.belonging.collectable.coin'}}</div>
+                        <div class="column-x6 small"><input name="data.coins" type="text" value="{{data.coins}}" placeholder="0"/></div>
+                    </div>
+                    <div class="main">
+                        <div class="row item equipable">
+                            <div class="image"></div>
+                            <div class="column-x2-big bold">{{localize 'dishonored.actor.belonging.weapon.title'}}</div>
+                            <div class="column-x2-small bold">{{localize 'dishonored.actor.belonging.weapon.dmg'}}</div>
+                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="weapon"><i class="fas fa-plus"></i></a>
+                        </div>
+                        {{#each items as |item type id|}}
+                        {{#if (eq item.type "weapon")}}
+                        <li class="row entry equipable" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                            <h4 class="column-x2-big">{{item.name}}</h4>
+                            <h4 class="column-x2-small">{{item.data.damage}}</h4>
+                            <div class="control">
+                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                            </div>
+                        </li>
+                        {{/if}}
+                        {{/each}}
+                        <div class="row item equipable">
+                            <div class="image"></div>
+                            <div class="column-x2-big bold">{{localize 'dishonored.actor.belonging.armor.title'}}</div>
+                            <div class="column-x2-small bold">{{localize 'dishonored.actor.belonging.armor.protect'}}</div>
+                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="armor"><i class="fas fa-plus"></i></a>
+                        </div>
+                        {{#each items as |item type id|}}
+                        {{#if (eq item.type "armor")}}
+                        <li id="armor-{{item._id}}" class="row entry equipable" data-item-id="{{item._id}}" data-item-type="{{item.type}}" data-item-helmet="{{item.data.helmet}}" data-item-equipped="{{item.data.equipped}}">
+                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                            <h4 class="column-x2-big">{{item.name}}</h4>
+                            <h4 id="protectval-armor-{{item._id}}" class="column-x2-small">{{item.data.protection}}</h4>
+                            <div class="control">
+                                {{#if (eq item.data.equipped true)}}
+                                    <a class="control toggle"><i class="fas fa-toggle-on"></i></a>
+                                {{else}}
+                                    <a class="control toggle"><i class="fas fa-toggle-off"></i></a>
+                                {{/if}}
+                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                            </div>
+                        </li>
+                        {{/if}}
+                        {{/each}}
+                        <div class="row item equipable">
+                            <div class="image"></div>
+                            <div class="column-x2-big bold">{{localize 'dishonored.actor.belonging.bonecharm.title'}}</div>
+                            <div class="column-x2-small bold"></div>
+                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="bonecharm"><i class="fas fa-plus"></i></a>
+                        </div>
+                        {{#each items as |item type id|}}
+                        {{#if (eq item.type "bonecharm")}}
+                        <li class="row entry bonecharm equipable" data-item-id="{{item._id}}" data-item-type="{{item.type}}" >
+                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                            <h4 class="column-x2-big">{{item.name}}</h4>
+                            <div class="column-x2-small"></div>
+                            <div class="control">
+                                <a class="control toggle"><i class="fas fa-toggle-{{#if (eq item.data.equipped true)}}on{{else}}off{{/if}}"></i></a>
+                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                            </div>
+                        </li>
+                        {{/if}}
+                        {{/each}}
+                        <div class="row item equipable">
+                            <div class="image"></div>
+                            <div class="column-x2-big bold">{{localize 'dishonored.actor.belonging.other.title'}}</div>
+                            <div class="column-x2-small bold">{{localize 'dishonored.actor.belonging.other.qty'}}</div>
+                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="item"><i class="fas fa-plus"></i></a>
+                        </div>
+                        {{#each items as |item type id|}}
+                        {{#if (eq item.type "item")}}
+                        <li class="row entry equipable" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                            <h4 class="column-x2-big">{{item.name}}</h4>
+                            <h4 class="column-x2-small">{{item.data.quantity}}</h4>
+                            <div class="control">
+                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                            </div>
+                        </li>
+                        {{/if}}
+                        {{/each}}
+                    </div>
+                </div>
+            </div>
+            <div class="tab biography" data-group="primary" data-tab="biography">
+                <svg width="1920" height="451.40601" viewBox="0 0 507.99999 119.43451" style="width:100%; height:auto; position: absolute;">
+                    <g id="layer1" transform="translate(0,-177.56548)">
+                        <path style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25369042;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="m 243.41667,203.33748 c 7.9375,24.19046 7.9375,48.00327 10.58333,71.81577 2.64583,-23.8125 2.64581,-47.62531 10.58333,-71.81577 -5.29168,3.02379 -7.94394,3.0171 -10.58333,3.0241 -2.65231,0.007 -5.29167,-2.6e-4 -10.58333,-3.0241 z m 5.29166,5.66994 c 2.64584,1.72672 3.96552,1.73048 5.29167,1.72651 1.31969,-0.003 2.64583,2.1e-4 5.29167,-1.72651 -3.96877,13.81402 -3.96877,27.41222 -5.29167,41.01041 -1.32291,-13.59819 -1.32291,-27.19639 -5.29167,-41.01041 z" id="svgColumnSeperator"/>
+                    </g>
+                </svg>
+                <div class="content">
+                    <div class="section truths">
+                        <div class="title">
+                            {{localize 'dishonored.actor.truth.title'}}
+                        </div>
+                        <div class="row item">
+                            <div class="image"></div>
+                            <div class="column-x1 bold">{{localize 'dishonored.actor.truth.content'}}</div>
+                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="truth"><i class="fas fa-plus"></i></a>
+                        </div>
+                        {{#each items as |item id|}}
+                        {{#if (eq item.type "truth")}}
+                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                            <h4 class="column-x1">{{item.name}}</h4>
+                            <div class="control">
+                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                            </div>
+                        </li>
+                        {{/if}}
+                        {{/each}}
+                    </div>
+                    <div class="section contacts">
+                        <div class="title">
+                            {{localize 'dishonored.actor.contact.title'}}
+                        </div>
+                        <div class="row item">
+                            <div class="image"></div>
+                            <div class="column-x2 bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
+                            <div class="column-x2 bold">{{localize 'dishonored.actor.contact.relation'}}</div>
+                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="contact"><i class="fas fa-plus"></i></a>
+                        </div>
+                        {{#each items as |item id|}}
+                        {{#if (eq item.type "contact")}}
+                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                            <h4 class="column-x2">{{item.name}}</h4>
+                            <h4 class="column-x2">{{item.data.relationship}}</h4>
+                            <div class="control">
+                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                            </div>
+                        </li>
+                        {{/if}}
+                        {{/each}}
+                    </div>
+                </div>
+            </div>
+            <div class="tab notes" data-group="primary" data-tab="notes">
+                <div class="section notes">
+                    <div class="notes">
+                        {{editor content=data.notes target="data.notes" button=true owner=owner editable=editable}}
+                    </div>
+                </div>
+            </div>
+        </section>
+    </div>
+</form>
\ No newline at end of file
diff --git a/templates/actors/character-sheet.html b/templates/actors/character-sheet.html
index 48d3739..4172dd5 100644
--- a/templates/actors/character-sheet.html
+++ b/templates/actors/character-sheet.html
@@ -51,73 +51,91 @@
             </div>
         </div>
         <div class="header-fields">
-            <div class="section experience">
-                <div class="title bold">
-                    {{localize 'dishonored.actor.character.experience'}}
-                </div>
-                <div class="track">
-                    <input type="hidden" id="total-exp" name="data.experience" value="{{data.experience}}" data-dtype="Number" />
-                    <div id="bar-exp-renderer" class=" bar"></div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="column bold title" style="width:40%">
-                    {{localize 'dishonored.actor.character.name'}}
-                </div>
-                <div class="column bold title" style="width:25%">
-                    {{localize 'dishonored.actor.character.archetype'}}
-                </div>
-                <div class="column bold title" style="width:25%">
-                    {{localize 'dishonored.actor.character.outlook'}}
-                </div>
-                <div class="column bold title" style="width:10%">
-                    {{localize 'dishonored.actor.character.age'}}
-                </div>
-            </div>
-            <div class="row">
-                <div class="column" style="width:40%">
-                    <input name="name" type="text" value="{{actor.name}}" placeholder="Name" />
+            <svg width="701" height="263" viewBox="0 0 211.66663 79.375012" id="svg8" class="background left">
+                <metadata id="metadata5" />
+                <g id="layer1" transform="translate(0,-217.62484)">
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 58.212875,256.12624 41.014958,217.76166 h -7.9375 l 18.520833,34.39583 c 0,0 3.96875,-1.32291 6.614584,3.96875 z" id="path3823" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 59.531249,278.62037 C 22.489583,217.7662 22.489583,217.7662 22.489583,217.7662 h -11.90625 z" id="path3825" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 0.13929219,218.02437 v 13.22916 L 27.920541,260.3577 c 0,0 -3.968749,-5.29162 1.322917,-2.64583 L 13.262521,235.91992 c -0.600082,0.34606 -1.280291,0.52903 -1.973006,0.53071 -2.1918793,0 -3.9687489,-1.77687 -3.9687489,-3.96875 0.0014,-1.10842 0.4662641,-2.16575 1.2820922,-2.9161 z" id="path3829" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 0.12716996,244.04689 v 7.93746 l 4.30981434,3.44785 c 0.6332598,-0.39981 1.3667213,-0.61229 2.1156332,-0.61288 2.19188,0 3.9687495,1.77687 3.9687495,3.96875 -0.0017,0.45188 -0.08048,0.90016 -0.233061,1.3255 l 16.297197,13.03745 h 5.291666 z" id="path3831" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 0.14533709,257.34868 v 7.93754 L 30.57242,278.51539 c 0,0 -5.291667,-2.64584 -5.291667,-3.96875 L 7.8678632,262.63259 c -0.4719416,0.19159 -0.9763504,0.29054 -1.4856973,0.29146 -2.1918801,0 -3.9687501,-1.77687 -3.9687501,-3.96875 7.435e-4,-0.0178 0.0016,-0.0355 0.00258,-0.0532 z" id="path3835" />
+                </g>
+            </svg>
+            <svg width="701" height="263" viewBox="0 0 211.66663 79.375012" id="svg8" class="background right">
+                <metadata id="metadata5" />
+                <g id="layer1" transform="translate(0,-217.62484)">
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.29959881px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 211.51311,225.37769 -9.84346,11.32039 a 2.995988,2.995988 0 0 1 1.17674,2.37573 2.995988,2.995988 0 0 1 -2.99599,2.99598 2.995988,2.995988 0 0 1 -2.10128,-0.86368 l -2.48691,2.86023 a 2.9959881,2.9959881 0 0 1 1.05679,2.28327 2.9959881,2.9959881 0 0 1 -2.99599,2.99599 2.9959881,2.9959881 0 0 1 -1.9901,-0.7607 l -2.99131,3.43953 a 2.9959881,2.9959881 0 0 1 0.7016,1.92224 2.9959881,2.9959881 0 0 1 -2.99599,2.99598 2.9959881,2.9959881 0 0 1 -1.58401,-0.45759 l -7.40396,8.51458 v 5.31788 l -14.97994,16.47793 h -3.97319 l -6.51277,7.48997 c 0,0 9.35611,-1.69482 30.12373,-23.25519 h -1.4348 l 31.23084,-31.23083 z" id="path4690" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 178.67724,217.76614 -15.875,39.6875 v 5.29167 l 26.45834,-44.97917 z" id="path4680" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 203.5945,217.7661 -13.22916,18.1901 v 1.65365 l -17.19792,23.8125 h -1.32292 l -10.58333,14.55208 v 5.29167 l 1.32292,-3.96875 11.90625,-14.55209 h 2.07067 l 23.8032,-28.81426 a 2.6458332,2.6458332 0 0 1 -1.02216,-2.08514 2.6458332,2.6458332 0 0 1 2.64583,-2.64583 2.6458332,2.6458332 0 0 1 1.74202,0.6568 l 7.8021,-9.4449 v -2.64583 z" id="path4684" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path4761" cx="158.87053" cy="285.02679" r="1.3229166" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 600,0 -20,190 22.95898,-87.24805 a 9.9999997,9.9999997 0 0 1 -4.71093,-8.472653 9.9999997,9.9999997 0 0 1 9.56836,-9.984375 l 5.34179,-20.300781 a 9.9999996,9.9999996 0 0 1 -4.23242,-8.160157 9.9999996,9.9999996 0 0 1 8.9961,-9.939453 l 4.0664,-15.453125 a 9.9999995,9.9999995 0 0 1 -6.26758,-9.269531 9.9999995,9.9999995 0 0 1 10,-10 9.9999995,9.9999995 0 0 1 1.31446,0.09766 L 630,0 Z" transform="matrix(0.26458333,0,0,0.26458333,0,217.62484)" id="path4767"/>
+                </g>
+            </svg>
+            <div class="slot">
+                <div class="row">
+                    <div class="column bold title" style="width:85%">
+                        {{localize 'dishonored.actor.character.name'}}
+                    </div>
+                    <div class="column bold title" style="width:15%">
+                        {{localize 'dishonored.actor.character.age'}}
+                    </div>
                 </div>
-                <div class="column" style="width:25%">
-                    <input name="data.archetype" type="text" value="{{data.archetype}}" />
+                <div class="row">
+                    <div class="column" style="width:85%">
+                        <input name="name" type="text" value="{{name}}" placeholder="Name" />
+                    </div>
+                    <div class="column" style="width:15%">
+                        <input name="data.age" type="text" value="{{data.age}}" placeholder="21" />
+                    </div>
                 </div>
-                <div class="column" style="width:25%">
-                    <input name="data.outlook" type="text" value="{{data.outlook}}" />
+                <div class="row">
+                    <div class="column bold title" style="width:100%">
+                        {{localize 'dishonored.actor.character.outlook'}}
+                    </div>
                 </div>
-                <div class="column" style="width:10%">
-                    <input name="data.age" type="text" value="{{data.age}}" placeholder="21" />
+                <div class="row">
+                    <div class="column" style="width:100%">
+                        <input name="data.outlook" type="text" value="{{data.outlook}}" />
+                    </div>
                 </div>
-            </div>
-            <div class="row">
-                <div class="column bold title">
-                    <div> {{localize 'dishonored.actor.character.firstTruth'}} </div>
+                <div class="row">
+                    <div class="column bold title" style="width:100%">
+                        {{localize 'dishonored.actor.character.archetype'}}
+                    </div>
                 </div>
-                <div class="column bold title">
-                    <div> {{localize 'dishonored.actor.character.secondTruth'}} </div>
+                <div class="row">
+                    <div class="column" style="width:100%">
+                        <input name="data.archetype" type="text" value="{{data.archetype}}" />
+                    </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="column">
-                    <input name="data.truth1" type="text" value="{{data.truth1}}" />
+            <div class="section experience">
+                <div class="title bold">
+                    {{localize 'dishonored.actor.character.experience'}}
                 </div>
-                <div class="column">
-                    <input name="data.truth2" type="text" value="{{data.truth2}}" />
+                <div class="track">
+                    <input type="hidden" id="total-exp" name="data.experience" value="{{data.experience}}" data-dtype="Number" />
+                    <div id="bar-exp-renderer" class=" bar"></div>
                 </div>
             </div>
-        </div>
-        <div class="separator"></div>
-        <div class="main">
             <div class="row">
                 <div class="column">
                     <div class="section skill">
-                        <div class="title">
+                        <div class="title bold">
                             {{localize 'dishonored.actor.skill.title'}}
                         </div>
                         <div class="stat row">
                             <div class="selector-space"></div>
-                            <div class="text bold">{{localize 'dishonored.actor.skill.name'}}</div>
-                            <div class="field bold">{{localize 'dishonored.actor.skisty.mod'}}</div>
+                            <div class="text bold head-text">{{localize 'dishonored.actor.skill.name'}}</div>
+                            <div class="field bold head-text">{{localize 'dishonored.actor.skisty.mod'}}</div>
+                        </div>
+                        {{#each data.data.skills as |skill key|}}
+                        <div class="stat row">
+                            <input class="selector skill" id="{{key}}.selector" type="checkbox" name="data.skills.{{key}}.selected" data-dtype="Boolean" {{checked skill.selected}}>
+                            <div class="text"> {{localize skill.label}} </div>
+                            <input class="field" id="{{key}}" name="data.skills.{{key}}.value" type="text" value="{{skill.value}}" />
                         </div>
+                        {{/each}}
                         {{#each data.skills as |skill key|}}
                         <div class="stat row">
                             <input class="selector skill" id="{{key}}.selector" type="checkbox" name="data.skills.{{key}}.selected" data-dtype="Boolean" {{checked skill.selected}}>
@@ -143,7 +161,7 @@
                     </div>
                     <div class="separator"></div>
                     <div class="section img">
-                        <img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" />
+                        <img class="profile-img" src="{{img}}" data-edit="img" title="{{actor.name}}" />
                     </div>
                     <div class="separator"></div>
                     <div class="section void">
@@ -164,14 +182,21 @@
                 </div>
                 <div class="column">
                     <div class="section style">
-                        <div class="title">
+                        <div class="title bold">
                             {{localize 'dishonored.actor.style.title'}}
                         </div>
                         <div class="stat row">
-                            <div class="field bold">{{localize 'dishonored.actor.skisty.mod'}}</div>
-                            <div class="text bold">{{localize 'dishonored.actor.style.name'}}</div>
+                            <div class="field bold head-text">{{localize 'dishonored.actor.skisty.mod'}}</div>
+                            <div class="text bold head-text">{{localize 'dishonored.actor.style.name'}}</div>
                             <div class="selector-space"></div>
                         </div>
+                        {{#each data.data.styles as |style key|}}
+                        <div class="stat row">
+                            <input class="field" id="{{key}}" name="data.styles.{{key}}.value" type="text" value="{{style.value}}" placeholder="Name" />
+                            <div class="text"> {{localize style.label}} </div>
+                            <input class="selector style" id="{{key}}.selector" type="checkbox" name="data.styles.{{key}}.selected" data-dtype="Boolean" {{checked style.selected}}>
+                        </div>
+                        {{/each}}
                         {{#each data.styles as |style key|}}
                         <div class="stat row">
                             <input class="field" id="{{key}}" name="data.styles.{{key}}.value" type="text" value="{{style.value}}" placeholder="Name" />
@@ -184,34 +209,69 @@
                     </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="column">
-                    <div class="section contacts">
-                        <div class="title">
-                            {{localize 'dishonored.actor.contact.title'}}
-                        </div>
-                        <div class="row item">
-                            <div class="image"></div>
-                            <div class="column-x2 bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
-                            <div class="column-x2 bold">{{localize 'dishonored.actor.contact.relation'}}</div>
-                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="contact"><i class="fas fa-plus"></i></a>
+            <nav class="sheet-tabs tabs" data-group="primary">
+                <a class="item" data-tab="focuses">{{localize 'dishonored.actor.focus.title'}}</a>
+                <a class="item" data-tab="abilities">Abilities</a>
+                <a class="item" data-tab="belongings">{{localize 'dishonored.actor.belonging.title'}}</a>
+                <a class="item" data-tab="biography">Biography</a>
+                <a class="item" data-tab="notes">{{localize 'dishonored.actor.note.title'}}</a>
+            </nav>
+        </div>
+        <section class="sheet-body">
+            <svg width="1920" height="451.40601" viewBox="0 0 507.99999 119.43451" style="width:100%; height:auto; position: absolute;">
+                <g id="layer1" transform="translate(0,-177.56548)">
+                    <path style="fill:#000000;stroke:none;stroke-width:0.27021405px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 251.29904,177.56549 c 0,0 -26.40321,8.3095 -42.27821,8.3095 H 14.552083 c -0.218435,-2.36895 -1.51998,-3.88442 7.9375,-7.9375 -17.5639082,4.05308 -19.8437497,13.49375 -19.8437497,13.49375 0,0 -0.79375,-2.91042 -1.3229166,-8.20209 -0.1012742,17.16706 -0.081664,41.29768 0.028154,62.4301 0,1.3512 3e-7,2.70239 -1.35107080000004,-2.70211 0,9.45749 0.05674275,1.38109 0,13.51066 0,12.15955 5.12274970000004,27.2468 13.22916710000004,40.75754 v -10.80869 c -4.0532084,-9.45731 -2.702139,-21.61693 -1.351068,-29.7235 -1.294766,-0.70358 -1.253477,-0.77596 -1.282109,-3.47799 l -0.01266,-1.19434 H 6.6145833 c -1.3510712,5e-5 -1.3510712,-2.64578 0,-2.64583 h 3.9687497 v -2.64584 H 6.6145833 c -1.3510644,-0.004 -1.3510712,-2.64583 0,-2.64583 h 3.9687497 v -2.64583 H 6.6145833 c -1.3510712,0 -1.3510712,-2.64584 0,-2.64584 H 7.9375 V 218.9479 c 0,0 -0.056305,-2.64583 2.645833,-2.64583 v -3.43958 c -1.5524816,-0.9712 -2.645829,-2.70808 -2.645829,-4.49792 0,-2.70225 2.589529,-5.29116 5.291667,-5.29167 l 220.927079,-1.4e-4 c 0,-9.26041 7.9375,-17.19791 17.19792,-17.19791 z M 8.9958333,189.84374 c 1.1294137,0 2.1728277,0.50947 2.9104167,1.32291 12.964583,0 150.16241,0.0877 210.34375,0 0.73381,-0.70494 1.81389,-1.30638 2.91042,-1.30638 2.11666,0 3.95831,1.90684 3.96353,3.98786 0.005,2.08102 -1.84687,3.93311 -3.96353,3.93311 -1.1186,0 -2.17391,-0.52272 -2.91042,-1.32292 H 11.90625 c -0.736313,0.79801 -1.793616,1.32292 -2.9104167,1.32292 -2.1166666,0 -3.96875,-1.85209 -3.96875,-3.96875 0,-2.11667 1.8520834,-3.96875 3.96875,-3.96875 z M 3.96875,250.6979 c 0.05139,1.99733 1.3408357,3.96875 3.96875,3.96875 0,1.70732 0,3.96875 1.0583333,3.96875 -1.5726561,6.93242 -2.38125,15.875 1.5874997,27.78125 v 1.32292 C 6.6145833,281.12499 4.7625,273.18749 3.3504756,265.30616 2.6458333,259.95832 2.6458333,255.98957 2.6458333,253.34374 v -5.29167 z" id="path1366"/>
+                    <ellipse style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.39883763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path836" cx="13.256729" cy="208.32764" rx="3.9883728" ry="3.9883788" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.77535379;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path822" r="1.9383832" cy="258.62711" cx="5.3950624" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47601172;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path822-6" r="1.1900285" cy="255.00548" cx="4.2051063" />
+                    <path style="fill:#000000;stroke:none;stroke-width:0.27021405px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 256.70096,177.56549 c 0,0 26.40321,8.3095 42.27821,8.3095 h 194.46874 c 0.21844,-2.36895 1.51998,-3.88442 -7.9375,-7.9375 17.56391,4.05308 19.84375,13.49375 19.84375,13.49375 0,0 0.79375,-2.91042 1.32292,-8.20209 0.10127,17.16706 0.0817,41.29768 -0.0282,62.4301 0,1.3512 0,2.70239 1.35107,-2.70211 0,9.45749 -0.0568,1.38109 0,13.51066 0,12.15955 -5.12275,27.2468 -13.22917,40.75754 v -10.80869 c 4.05321,-9.45731 2.70214,-21.61693 1.35107,-29.7235 1.29476,-0.70358 1.25347,-0.77596 1.28211,-3.47799 l 0.0127,-1.19434 h 3.96874 c 1.35107,5e-5 1.35107,-2.64578 0,-2.64583 h -3.96875 v -2.64584 h 3.96875 c 1.35107,-0.004 1.35107,-2.64583 0,-2.64583 h -3.96875 v -2.64583 h 3.96875 c 1.35107,0 1.35107,-2.64584 0,-2.64584 h -1.32291 V 218.9479 c 0,0 0.0563,-2.64583 -2.64584,-2.64583 v -3.43958 c 1.55249,-0.9712 2.64583,-2.70808 2.64583,-4.49792 0,-2.70225 -2.58953,-5.29116 -5.29166,-5.29167 l -220.92708,-1.4e-4 c 0,-9.26041 -7.9375,-17.19791 -17.19792,-17.19791 z m 242.3032,12.27825 c -1.12941,0 -2.17282,0.50947 -2.91041,1.32291 -12.96459,0 -150.16241,0.0877 -210.34375,0 -0.73381,-0.70494 -1.81389,-1.30638 -2.91042,-1.30638 -2.11666,0 -3.95831,1.90684 -3.96353,3.98786 -0.005,2.08102 1.84687,3.93311 3.96353,3.93311 1.1186,0 2.17391,-0.52272 2.91042,-1.32292 h 210.34375 c 0.73631,0.79801 1.79361,1.32292 2.91041,1.32292 2.11667,0 3.96875,-1.85209 3.96875,-3.96875 0,-2.11667 -1.85208,-3.96875 -3.96875,-3.96875 z m 5.02709,60.85416 c -0.0514,1.99733 -1.34084,3.96875 -3.96875,3.96875 0,1.70732 0,3.96875 -1.05834,3.96875 1.57266,6.93242 2.38125,15.875 -1.5875,27.78125 v 1.32292 c 3.96875,-6.61458 5.82084,-14.55208 7.23286,-22.43341 0.70464,-5.34784 0.70464,-9.31659 0.70464,-11.96242 v -5.29167 z" id="path1366-0"/>
+                    <ellipse style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.39883763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path836-6" cx="-494.74329" cy="208.32762" rx="3.9883728" ry="3.9883788" transform="scale(-1,1)" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.77535379;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path822-0" r="1.9383832" cy="258.62714" cx="-502.60495" transform="scale(-1,1)" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47601172;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path822-6-4" r="1.1900285" cy="255.00548" cx="-503.79489" transform="scale(-1,1)" />
+                </g>
+            </svg>
+            <div class="tab focuses active" data-group="primary" data-tab="focuses">
+                <div class="section focuses">
+                    <div class="row item">
+                        <div class="image"></div>
+                        <div class="column-x2-big bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
+                        <div class="column-x2-small bold">{{localize 'dishonored.actor.focus.rating'}}</div>
+                        <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="focus"><i class="fas fa-plus"></i></a>
+                    </div>
+                    {{#each items as |item id|}}
+                    {{#if (eq item.type "focus")}}
+                    <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                        <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                        <h4 class="column-x2-big">{{item.name}}</h4>
+                        <h4 class="column-x2-small">{{item.data.data.rating}}</h4>
+                        <div class="control">
+                            <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                            <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
                         </div>
-                        {{#each actor.items as |item id|}}
-                        {{#if (eq item.type "contact")}}
-                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
-                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
-                            <h4 class="column-x2">{{item.name}}</h4>
-                            <h4 class="column-x2">{{item.data.relationship}}</h4>
-                            <div class="control">
-                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
-                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
-                            </div>
-                        </li>
-                        {{/if}}
-                        {{/each}}
+                    </li>
+                    {{/if}}
+                    {{/each}}
+                </div>
+            </div>
+            <div class="tab abilities" data-group="primary" data-tab="abilities">
+                <svg width="1920" height="451.40601" viewBox="0 0 507.99999 119.43451" style="width:100%; height:auto; position: absolute;">
+                    <g id="layer1" transform="translate(0,-177.56548)">
+                        <path style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25369042;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="m 243.41667,203.33748 c 7.9375,24.19046 7.9375,48.00327 10.58333,71.81577 2.64583,-23.8125 2.64581,-47.62531 10.58333,-71.81577 -5.29168,3.02379 -7.94394,3.0171 -10.58333,3.0241 -2.65231,0.007 -5.29167,-2.6e-4 -10.58333,-3.0241 z m 5.29166,5.66994 c 2.64584,1.72672 3.96552,1.73048 5.29167,1.72651 1.31969,-0.003 2.64583,2.1e-4 5.29167,-1.72651 -3.96877,13.81402 -3.96877,27.41222 -5.29167,41.01041 -1.32291,-13.59819 -1.32291,-27.19639 -5.29167,-41.01041 z" id="svgColumnSeperator"/>
+                    </g>
+                </svg>
+                <div class="mana">
+                    <div class="column-x6 small"></div>
+                    <div class="column-x6 small"></div>
+                    <div class="column-x6 bold">{{localize 'dishonored.actor.abilities.mana'}}</div>
+                    <div class="column-x6 small">
+                        <div class="small"><input name="data.mana.value" type="text" value="{{data.mana.value}}" placeholder="0"/></div>
+                        <div class="advisory">/</div>
+                        <div class="small disabled"><input id="max-mana" name="data.mana.max" type="text" value="{{data.mana.max}}" readonly/></div>
                     </div>
+                    <div class="column-x6 small"></div>
+                    <div class="column-x6 small"></div>
                 </div>
-                <div class="column">
+                <div class="main">
                     <div class="section talents">
                         <div class="title">
                             {{localize 'dishonored.actor.talent.title'}}
@@ -221,7 +281,7 @@ <h4 class="column-x2">{{item.data.relationship}}</h4>
                             <div class="column-x1 bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
                             <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="talent"><i class="fas fa-plus"></i></a>
                         </div>
-                        {{#each actor.items as |item id|}}
+                        {{#each items as |item id|}}
                         {{#if (eq item.type "talent")}}
                         <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
                             <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
@@ -234,46 +294,6 @@ <h4 class="column-x1">{{item.name}}</h4>
                         {{/if}}
                         {{/each}}
                     </div>
-                </div>
-                <div class="column">
-                    <div class="section focuses">
-                        <div class="title">
-                            {{localize 'dishonored.actor.focus.title'}}
-                        </div>
-                        <div class="row item">
-                            <div class="image"></div>
-                            <div class="column-x2-big bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
-                            <div class="column-x2-small bold">{{localize 'dishonored.actor.focus.rating'}}</div>
-                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="focus"><i class="fas fa-plus"></i></a>
-                        </div>
-                        {{#each actor.items as |item id|}}
-                        {{#if (eq item.type "focus")}}
-                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
-                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
-                            <h4 class="column-x2-big">{{item.name}}</h4>
-                            <h4 class="column-x2-small">{{item.data.rating}}</h4>
-                            <div class="control">
-                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
-                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
-                            </div>
-                        </li>
-                        {{/if}}
-                        {{/each}}
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="column">
-                    <div class="section notes">
-                        <div class="title">
-                            {{localize 'dishonored.actor.note.title'}}
-                        </div>
-                        <div class="notes">
-                            {{editor content=data.notes target="data.notes" button=true owner=owner editable=editable}}
-                        </div>
-                    </div>
-                </div>
-                <div class="column">
                     <div class="section powers">
                         <div class="title">
                             {{localize 'dishonored.actor.power.title'}}
@@ -283,7 +303,7 @@ <h4 class="column-x2-small">{{item.data.rating}}</h4>
                             <div class="column-x1 bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
                             <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="power"><i class="fas fa-plus"></i></a>
                         </div>
-                        {{#each actor.items as |item type id|}}
+                        {{#each items as |item type id|}}
                         {{#if (eq item.type "power")}}
                         <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
                             <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
@@ -295,36 +315,34 @@ <h4 class="column-x1">{{item.name}}</h4>
                         </li>
                         {{/if}}
                         {{/each}}
-                        <div class="row item">
-                            <div class="small"><input name="data.mana.value" type="text" value="{{data.mana.value}}" placeholder="0"/></div>
-                            <div class="advisory">/</div>
-                            <div class="small disabled"><input id="max-mana" name="data.mana.max" type="text" value="{{data.mana.max}}" readonly/></div>
-                        </div>
                     </div>
                 </div>
-                <div class="column">
-                    <div class="section belongings">
-                        <div class="title">
-                            {{localize 'dishonored.actor.belonging.title'}}
-                        </div>
-                        <div class="row item">
-                            <div class="column-x4 bold">{{localize 'dishonored.actor.belonging.collectable.coin'}}</div>
-                            <div class="column-x4 small"><input name="data.coins" type="text" value="{{data.coins}}" placeholder="0"/></div>
-                            <div class="column-x4 bold">{{localize 'dishonored.actor.belonging.collectable.rune'}}</div>
-                            <div class="column-x4 small"><input name="data.runes" type="text" value="{{data.runes}}" placeholder="0"/></div>
+            </div>
+            <div class="tab belongings" data-group="primary" data-tab="belongings">
+                <div class="section belongings">
+                    <div class="currency row">
+                        <div class="column-x6 bold">{{localize 'dishonored.actor.belonging.collectable.bonecharm'}}</div>
+                        <div class="column-x6 small bonecharmCount">
+                            <span class="small bonecharm disabled"><input name="data.bonecharmequipped" type="text" value="{{data.bonecharmequipped}}" readonly/></span>/3
                         </div>
-                        <div class="row item">
+                        <div class="column-x6 bold">{{localize 'dishonored.actor.belonging.collectable.rune'}}</div>
+                        <div class="column-x6 small"><input name="data.runes" type="text" value="{{data.runes}}" placeholder="0"/></div>
+                        <div class="column-x6 bold">{{localize 'dishonored.actor.belonging.collectable.coin'}}</div>
+                        <div class="column-x6 small"><input name="data.coins" type="text" value="{{data.coins}}" placeholder="0"/></div>
+                    </div>
+                    <div class="main">
+                        <div class="row item equipable">
                             <div class="image"></div>
-                            <div class="column-x2-big advisory">{{localize 'dishonored.actor.belonging.weapon.title'}}</div>
-                            <div class="column-x2-small advisory">{{localize 'dishonored.actor.belonging.weapon.dmg'}}</div>
+                            <div class="column-x2-big bold">{{localize 'dishonored.actor.belonging.weapon.title'}}</div>
+                            <div class="column-x2-small bold">{{localize 'dishonored.actor.belonging.weapon.dmg'}}</div>
                             <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="weapon"><i class="fas fa-plus"></i></a>
                         </div>
-                        {{#each actor.items as |item type id|}}
+                        {{#each items as |item type id|}}
                         {{#if (eq item.type "weapon")}}
-                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                        <li class="row entry equipable" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
                             <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
                             <h4 class="column-x2-big">{{item.name}}</h4>
-                            <h4 class="column-x2-small">{{item.data.damage}}</h4>
+                            <h4 class="column-x2-small">{{item.data.data.damage}}</h4>
                             <div class="control">
                                 <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
                                 <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
@@ -334,18 +352,18 @@ <h4 class="column-x2-small">{{item.data.damage}}</h4>
                         {{/each}}
                         <div class="row item equipable">
                             <div class="image"></div>
-                            <div class="column-x2-big advisory">{{localize 'dishonored.actor.belonging.armor.title'}}</div>
-                            <div class="column-x2-small advisory">{{localize 'dishonored.actor.belonging.armor.protect'}}</div>
+                            <div class="column-x2-big bold">{{localize 'dishonored.actor.belonging.armor.title'}}</div>
+                            <div class="column-x2-small bold">{{localize 'dishonored.actor.belonging.armor.protect'}}</div>
                             <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="armor"><i class="fas fa-plus"></i></a>
                         </div>
-                        {{#each actor.items as |item type id|}}
+                        {{#each items as |item type id|}}
                         {{#if (eq item.type "armor")}}
-                        <li id="armor-{{item._id}}" class="row entry equipable" data-item-id="{{item._id}}" data-item-type="{{item.type}}" data-item-helmet="{{item.data.helmet}}" data-item-equipped="{{item.data.equipped}}">
+                        <li id="armor-{{item._id}}" class="row entry equipable" data-item-id="{{item._id}}" data-item-type="{{item.type}}" data-item-helmet="{{item.data.data.helmet}}" data-item-equipped="{{item.data.data.equipped}}">
                             <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
                             <h4 class="column-x2-big">{{item.name}}</h4>
-                            <h4 id="protectval-armor-{{item._id}}" class="column-x2-small">{{item.data.protection}}</h4>
+                            <h4 id="protectval-armor-{{item._id}}" class="column-x2-small">{{item.data.data.protection}}</h4>
                             <div class="control">
-                                {{#if (eq item.data.equipped true)}}
+                                {{#if (eq item.data.data.equipped true)}}
                                     <a class="control toggle"><i class="fas fa-toggle-on"></i></a>
                                 {{else}}
                                     <a class="control toggle"><i class="fas fa-toggle-off"></i></a>
@@ -357,37 +375,37 @@ <h4 id="protectval-armor-{{item._id}}" class="column-x2-small">{{item.data.prote
                         {{/if}}
                         {{/each}}
                         <div class="row item equipable">
-                            <div class="image bonecharmCount">
-                                <span class="small bonecharm disabled"><input name="data.bonecharmequipped" type="text" value="{{data.bonecharmequipped}}" readonly/></span>/3
-                            </div>
-                            <div class="column-x1">{{localize 'dishonored.actor.belonging.bonecharm.title'}}</div>
+                            <div class="image"></div>
+                            <div class="column-x2-big bold">{{localize 'dishonored.actor.belonging.bonecharm.title'}}</div>
+                            <div class="column-x2-small bold"></div>
                             <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="bonecharm"><i class="fas fa-plus"></i></a>
                         </div>
-                        {{#each actor.items as |item type id|}}
+                        {{#each items as |item type id|}}
                         {{#if (eq item.type "bonecharm")}}
                         <li class="row entry bonecharm equipable" data-item-id="{{item._id}}" data-item-type="{{item.type}}" >
                             <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
-                            <h4 class="column-x1">{{item.name}}</h4>
+                            <h4 class="column-x2-big">{{item.name}}</h4>
+                            <div class="column-x2-small"></div>
                             <div class="control">
-                                <a class="control toggle"><i class="fas fa-toggle-{{#if (eq item.data.equipped true)}}on{{else}}off{{/if}}"></i></a>
+                                <a class="control toggle"><i class="fas fa-toggle-{{#if (eq item.data.data.equipped true)}}on{{else}}off{{/if}}"></i></a>
                                 <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
                                 <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
                             </div>
                         </li>
                         {{/if}}
                         {{/each}}
-                        <div class="row item">
+                        <div class="row item equipable">
                             <div class="image"></div>
-                            <div class="column-x2-big advisory">{{localize 'dishonored.actor.belonging.other.title'}}</div>
-                            <div class="column-x2-small advisory">{{localize 'dishonored.actor.belonging.other.qty'}}</div>
+                            <div class="column-x2-big bold">{{localize 'dishonored.actor.belonging.other.title'}}</div>
+                            <div class="column-x2-small bold">{{localize 'dishonored.actor.belonging.other.qty'}}</div>
                             <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="item"><i class="fas fa-plus"></i></a>
                         </div>
-                        {{#each actor.items as |item type id|}}
+                        {{#each items as |item type id|}}
                         {{#if (eq item.type "item")}}
-                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                        <li class="row entry equipable" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
                             <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
                             <h4 class="column-x2-big">{{item.name}}</h4>
-                            <h4 class="column-x2-small">{{item.data.quantity}}</h4>
+                            <h4 class="column-x2-small">{{item.data.data.quantity}}</h4>
                             <div class="control">
                                 <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
                                 <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
@@ -398,6 +416,68 @@ <h4 class="column-x2-small">{{item.data.quantity}}</h4>
                     </div>
                 </div>
             </div>
-        </div>
+            <div class="tab biography" data-group="primary" data-tab="biography">
+                <svg width="1920" height="451.40601" viewBox="0 0 507.99999 119.43451" style="width:100%; height:auto; position: absolute;">
+                    <g id="layer1" transform="translate(0,-177.56548)">
+                        <path style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25369042;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="m 243.41667,203.33748 c 7.9375,24.19046 7.9375,48.00327 10.58333,71.81577 2.64583,-23.8125 2.64581,-47.62531 10.58333,-71.81577 -5.29168,3.02379 -7.94394,3.0171 -10.58333,3.0241 -2.65231,0.007 -5.29167,-2.6e-4 -10.58333,-3.0241 z m 5.29166,5.66994 c 2.64584,1.72672 3.96552,1.73048 5.29167,1.72651 1.31969,-0.003 2.64583,2.1e-4 5.29167,-1.72651 -3.96877,13.81402 -3.96877,27.41222 -5.29167,41.01041 -1.32291,-13.59819 -1.32291,-27.19639 -5.29167,-41.01041 z" id="svgColumnSeperator"/>
+                    </g>
+                </svg>
+                <div class="content">
+                    <div class="section truths">
+                        <div class="title">
+                            {{localize 'dishonored.actor.truth.title'}}
+                        </div>
+                        <div class="row item">
+                            <div class="image"></div>
+                            <div class="column-x1 bold">{{localize 'dishonored.actor.truth.content'}}</div>
+                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="truth"><i class="fas fa-plus"></i></a>
+                        </div>
+                        {{#each items as |item id|}}
+                        {{#if (eq item.type "truth")}}
+                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                            <h4 class="column-x1">{{item.name}}</h4>
+                            <div class="control">
+                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                            </div>
+                        </li>
+                        {{/if}}
+                        {{/each}}
+                    </div>
+                    <div class="section contacts">
+                        <div class="title">
+                            {{localize 'dishonored.actor.contact.title'}}
+                        </div>
+                        <div class="row item">
+                            <div class="image"></div>
+                            <div class="column-x2 bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
+                            <div class="column-x2 bold">{{localize 'dishonored.actor.contact.relation'}}</div>
+                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="contact"><i class="fas fa-plus"></i></a>
+                        </div>
+                        {{#each items as |item id|}}
+                        {{#if (eq item.type "contact")}}
+                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                            <h4 class="column-x2">{{item.name}}</h4>
+                            <h4 class="column-x2">{{item.data.data.relationship}}</h4>
+                            <div class="control">
+                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                            </div>
+                        </li>
+                        {{/if}}
+                        {{/each}}
+                    </div>
+                </div>
+            </div>
+            <div class="tab notes" data-group="primary" data-tab="notes">
+                <div class="section notes">
+                    <div class="notes">
+                        {{editor content=data.notes target="data.notes" button=true owner=owner editable=editable}}
+                    </div>
+                </div>
+            </div>
+        </section>
     </div>
 </form>
\ No newline at end of file
diff --git a/templates/actors/limited-sheet.html b/templates/actors/limited-sheet.html
index c9ccba1..fa51d6f 100644
--- a/templates/actors/limited-sheet.html
+++ b/templates/actors/limited-sheet.html
@@ -11,7 +11,7 @@
             </div>
             <div class="row">
                 <div class="column title" style="width:90%">
-                    <input name="name" type="text" value="{{actor.name}}" placeholder="Name" />
+                    <input name="name" type="text" value="{{name}}" placeholder="Name" />
                 </div>
                 <div class="column title" style="width:10%">
                     <input name="data.age" type="text" value="{{data.age}}" placeholder="21" />
@@ -28,7 +28,7 @@
                 </div>
                 <div class="column">
                     <div class="section img">
-                        <img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" />
+                        <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}" />
                     </div>
                 </div>
                 <div class="column">
diff --git a/templates/actors/npc-sheet.html b/templates/actors/npc-sheet.html
index 27f9e07..962f37b 100644
--- a/templates/actors/npc-sheet.html
+++ b/templates/actors/npc-sheet.html
@@ -51,42 +51,78 @@
             </div>
         </div>
         <div class="header-fields">
-            <div class="row">
-                <div class="column bold title" style="width:50%">
-                    {{localize 'dishonored.actor.character.name'}}
-                </div>
-                <div class="column bold title" style="width:40%">
-                    <div> {{localize 'dishonored.actor.character.truth'}} </div>
-                </div>
-                <div class="column bold title" style="width:10%">
-                    {{localize 'dishonored.actor.character.age'}}
+            <!-- <svg width="701" height="263" viewBox="0 0 211.66663 79.375012" id="svg8" class="background left">
+                <metadata id="metadata5" />
+                <g id="layer1" transform="translate(0,-217.62484)">
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 58.212875,256.12624 41.014958,217.76166 h -7.9375 l 18.520833,34.39583 c 0,0 3.96875,-1.32291 6.614584,3.96875 z" id="path3823" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 59.531249,278.62037 C 22.489583,217.7662 22.489583,217.7662 22.489583,217.7662 h -11.90625 z" id="path3825" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 0.13929219,218.02437 v 13.22916 L 27.920541,260.3577 c 0,0 -3.968749,-5.29162 1.322917,-2.64583 L 13.262521,235.91992 c -0.600082,0.34606 -1.280291,0.52903 -1.973006,0.53071 -2.1918793,0 -3.9687489,-1.77687 -3.9687489,-3.96875 0.0014,-1.10842 0.4662641,-2.16575 1.2820922,-2.9161 z" id="path3829" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 0.12716996,244.04689 v 7.93746 l 4.30981434,3.44785 c 0.6332598,-0.39981 1.3667213,-0.61229 2.1156332,-0.61288 2.19188,0 3.9687495,1.77687 3.9687495,3.96875 -0.0017,0.45188 -0.08048,0.90016 -0.233061,1.3255 l 16.297197,13.03745 h 5.291666 z" id="path3831" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 0.14533709,257.34868 v 7.93754 L 30.57242,278.51539 c 0,0 -5.291667,-2.64584 -5.291667,-3.96875 L 7.8678632,262.63259 c -0.4719416,0.19159 -0.9763504,0.29054 -1.4856973,0.29146 -2.1918801,0 -3.9687501,-1.77687 -3.9687501,-3.96875 7.435e-4,-0.0178 0.0016,-0.0355 0.00258,-0.0532 z" id="path3835" />
+                </g>
+            </svg>
+            <svg width="701" height="263" viewBox="0 0 211.66663 79.375012" id="svg8" class="background right">
+                <metadata id="metadata5" />
+                <g id="layer1" transform="translate(0,-217.62484)">
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.29959881px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 211.51311,225.37769 -9.84346,11.32039 a 2.995988,2.995988 0 0 1 1.17674,2.37573 2.995988,2.995988 0 0 1 -2.99599,2.99598 2.995988,2.995988 0 0 1 -2.10128,-0.86368 l -2.48691,2.86023 a 2.9959881,2.9959881 0 0 1 1.05679,2.28327 2.9959881,2.9959881 0 0 1 -2.99599,2.99599 2.9959881,2.9959881 0 0 1 -1.9901,-0.7607 l -2.99131,3.43953 a 2.9959881,2.9959881 0 0 1 0.7016,1.92224 2.9959881,2.9959881 0 0 1 -2.99599,2.99598 2.9959881,2.9959881 0 0 1 -1.58401,-0.45759 l -7.40396,8.51458 v 5.31788 l -14.97994,16.47793 h -3.97319 l -6.51277,7.48997 c 0,0 9.35611,-1.69482 30.12373,-23.25519 h -1.4348 l 31.23084,-31.23083 z" id="path4690" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 178.67724,217.76614 -15.875,39.6875 v 5.29167 l 26.45834,-44.97917 z" id="path4680" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 203.5945,217.7661 -13.22916,18.1901 v 1.65365 l -17.19792,23.8125 h -1.32292 l -10.58333,14.55208 v 5.29167 l 1.32292,-3.96875 11.90625,-14.55209 h 2.07067 l 23.8032,-28.81426 a 2.6458332,2.6458332 0 0 1 -1.02216,-2.08514 2.6458332,2.6458332 0 0 1 2.64583,-2.64583 2.6458332,2.6458332 0 0 1 1.74202,0.6568 l 7.8021,-9.4449 v -2.64583 z" id="path4684" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path4761" cx="158.87053" cy="285.02679" r="1.3229166" />
+                    <path style="fill:#000000;stroke:#000000;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 600,0 -20,190 22.95898,-87.24805 a 9.9999997,9.9999997 0 0 1 -4.71093,-8.472653 9.9999997,9.9999997 0 0 1 9.56836,-9.984375 l 5.34179,-20.300781 a 9.9999996,9.9999996 0 0 1 -4.23242,-8.160157 9.9999996,9.9999996 0 0 1 8.9961,-9.939453 l 4.0664,-15.453125 a 9.9999995,9.9999995 0 0 1 -6.26758,-9.269531 9.9999995,9.9999995 0 0 1 10,-10 9.9999995,9.9999995 0 0 1 1.31446,0.09766 L 630,0 Z" transform="matrix(0.26458333,0,0,0.26458333,0,217.62484)" id="path4767"/>
+                </g>
+            </svg> -->
+            <div class="slot">
+                <div class="row">
+                    <div class="column bold title" style="width:85%">
+                        {{localize 'dishonored.actor.character.name'}}
+                    </div>
+                    <div class="column bold title" style="width:15%">
+                        {{localize 'dishonored.actor.character.age'}}
+                    </div>
                 </div>
-            </div>
-            <div class="row">
-                <div class="column" style="width:50%">
-                    <input name="name" type="text" value="{{actor.name}}" placeholder="Name" />
+                <div class="row">
+                    <div class="column" style="width:85%">
+                        <input name="name" type="text" value="{{name}}" placeholder="Name" />
+                    </div>
+                    <div class="column" style="width:15%">
+                        <input name="data.age" type="text" value="{{data.age}}" placeholder="21" />
+                    </div>
                 </div>
-                <div class="column" style="width:40%">
-                    <input name="data.truth1" type="text" value="{{data.truth1}}" />
+                <div class="row">
+                    <div class="column bold title" style="width:100%">
+                        {{localize 'dishonored.actor.npc.types'}}
+                    </div>
                 </div>
-                <div class="column" style="width:10%">
-                    <input name="data.age" type="text" value="{{data.age}}" placeholder="21" />
+                <div class="row">
+                    <div class="column" style="width:100%">
+                        <select class="type" name="data.type" data-type="String">
+                            {{#select data.type}}
+                            {{#each data.types as |type key|}}
+                            <option value="{{localize type.label}}">{{localize type.label}}</option>
+                            {{/each}}
+                            {{/select}}
+                        </select>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="separator"></div>
-        <div class="main">
             <div class="row">
                 <div class="column">
                     <div class="section skill">
-                        <div class="title">
+                        <div class="title bold">
                             {{localize 'dishonored.actor.skill.title'}}
                         </div>
                         <div class="stat row">
                             <div class="selector-space"></div>
-                            <div class="text bold">{{localize 'dishonored.actor.skill.name'}}</div>
-                            <div class="field bold">{{localize 'dishonored.actor.skisty.mod'}}</div>
+                            <div class="text bold head-text">{{localize 'dishonored.actor.skill.name'}}</div>
+                            <div class="field bold head-text">{{localize 'dishonored.actor.skisty.mod'}}</div>
                         </div>
+                        {{#each data.data.skills as |skill key|}}
+                        <div class="stat row">
+                            <input class="selector skill" id="{{key}}.selector" type="checkbox" name="data.skills.{{key}}.selected" data-dtype="Boolean" {{checked skill.selected}}>
+                            <div class="text"> {{localize skill.label}} </div>
+                            <input class="field" id="{{key}}" name="data.skills.{{key}}.value" type="text" value="{{skill.value}}" />
+                        </div>
+                        {{/each}}
                         {{#each data.skills as |skill key|}}
                         <div class="stat row">
                             <input class="selector skill" id="{{key}}.selector" type="checkbox" name="data.skills.{{key}}.selected" data-dtype="Boolean" {{checked skill.selected}}>
@@ -95,6 +131,8 @@
                         </div>
                         {{/each}}
                         <div class="separator"></div>
+                        <div class="check-button btn" title="{{localize 'dishonored.actor.skisty.check'}}">{{localize 'dishonored.actor.skisty.check'}}</div>
+
                     </div>
                 </div>
                 <div class="column">
@@ -105,26 +143,32 @@
                         <div class="track">
                             <input type="hidden" id="total-stress" name="data.stress.value" value="{{data.stress.value}}" data-dtype="Number" />
                             <input type="hidden" id="max-stress" name="data.stress.max" value="{{data.stress.max}}" data-dtype="Number" />
-                            <div id="bar-stress-renderer" class="bar"></div>
+                            <div id="bar-stress-renderer" class=" bar"></div>
                         </div>
                     </div>
                     <div class="separator"></div>
                     <div class="section img">
-                        <img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" />
+                        <img class="profile-img" src="{{img}}" data-edit="img" title="{{actor.name}}" />
                     </div>
                     <div class="separator"></div>
-                    <div class="check-button btn" title="{{localize 'dishonored.actor.skisty.check'}}">{{localize 'dishonored.actor.skisty.check'}}</div>
                 </div>
                 <div class="column">
                     <div class="section style">
-                        <div class="title">
+                        <div class="title bold">
                             {{localize 'dishonored.actor.style.title'}}
                         </div>
                         <div class="stat row">
-                            <div class="field bold">{{localize 'dishonored.actor.skisty.mod'}}</div>
-                            <div class="text bold">{{localize 'dishonored.actor.style.name'}}</div>
+                            <div class="field bold head-text">{{localize 'dishonored.actor.skisty.mod'}}</div>
+                            <div class="text bold head-text">{{localize 'dishonored.actor.style.name'}}</div>
                             <div class="selector-space"></div>
                         </div>
+                        {{#each data.data.styles as |style key|}}
+                        <div class="stat row">
+                            <input class="field" id="{{key}}" name="data.styles.{{key}}.value" type="text" value="{{style.value}}" placeholder="Name" />
+                            <div class="text"> {{localize style.label}} </div>
+                            <input class="selector style" id="{{key}}.selector" type="checkbox" name="data.styles.{{key}}.selected" data-dtype="Boolean" {{checked style.selected}}>
+                        </div>
+                        {{/each}}
                         {{#each data.styles as |style key|}}
                         <div class="stat row">
                             <input class="field" id="{{key}}" name="data.styles.{{key}}.value" type="text" value="{{style.value}}" placeholder="Name" />
@@ -133,27 +177,75 @@
                         </div>
                         {{/each}}
                         <div class="separator"></div>
+                        <div class="check-button btn" title="{{localize 'dishonored.actor.skisty.check'}}">{{localize 'dishonored.actor.skisty.check'}}</div>
                     </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="column">
-                    <div class="section focuses">
+            <nav class="sheet-tabs tabs" data-group="primary">
+                <a class="item" data-tab="focuses">{{localize 'dishonored.actor.focus.title'}}</a>
+                <a class="item" data-tab="abilities">Abilities</a>
+                <a class="item" data-tab="belongings">{{localize 'dishonored.actor.belonging.title'}}</a>
+                <a class="item" data-tab="biography">Biography</a>
+                <a class="item" data-tab="notes">{{localize 'dishonored.actor.note.title'}}</a>
+            </nav>
+        </div>
+        <section class="sheet-body">
+            <svg width="1920" height="451.40601" viewBox="0 0 507.99999 119.43451" style="width:100%; height:auto; position: absolute;">
+                <g id="layer1" transform="translate(0,-177.56548)">
+                    <path style="fill:#000000;stroke:none;stroke-width:0.27021405px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 251.29904,177.56549 c 0,0 -26.40321,8.3095 -42.27821,8.3095 H 14.552083 c -0.218435,-2.36895 -1.51998,-3.88442 7.9375,-7.9375 -17.5639082,4.05308 -19.8437497,13.49375 -19.8437497,13.49375 0,0 -0.79375,-2.91042 -1.3229166,-8.20209 -0.1012742,17.16706 -0.081664,41.29768 0.028154,62.4301 0,1.3512 3e-7,2.70239 -1.35107080000004,-2.70211 0,9.45749 0.05674275,1.38109 0,13.51066 0,12.15955 5.12274970000004,27.2468 13.22916710000004,40.75754 v -10.80869 c -4.0532084,-9.45731 -2.702139,-21.61693 -1.351068,-29.7235 -1.294766,-0.70358 -1.253477,-0.77596 -1.282109,-3.47799 l -0.01266,-1.19434 H 6.6145833 c -1.3510712,5e-5 -1.3510712,-2.64578 0,-2.64583 h 3.9687497 v -2.64584 H 6.6145833 c -1.3510644,-0.004 -1.3510712,-2.64583 0,-2.64583 h 3.9687497 v -2.64583 H 6.6145833 c -1.3510712,0 -1.3510712,-2.64584 0,-2.64584 H 7.9375 V 218.9479 c 0,0 -0.056305,-2.64583 2.645833,-2.64583 v -3.43958 c -1.5524816,-0.9712 -2.645829,-2.70808 -2.645829,-4.49792 0,-2.70225 2.589529,-5.29116 5.291667,-5.29167 l 220.927079,-1.4e-4 c 0,-9.26041 7.9375,-17.19791 17.19792,-17.19791 z M 8.9958333,189.84374 c 1.1294137,0 2.1728277,0.50947 2.9104167,1.32291 12.964583,0 150.16241,0.0877 210.34375,0 0.73381,-0.70494 1.81389,-1.30638 2.91042,-1.30638 2.11666,0 3.95831,1.90684 3.96353,3.98786 0.005,2.08102 -1.84687,3.93311 -3.96353,3.93311 -1.1186,0 -2.17391,-0.52272 -2.91042,-1.32292 H 11.90625 c -0.736313,0.79801 -1.793616,1.32292 -2.9104167,1.32292 -2.1166666,0 -3.96875,-1.85209 -3.96875,-3.96875 0,-2.11667 1.8520834,-3.96875 3.96875,-3.96875 z M 3.96875,250.6979 c 0.05139,1.99733 1.3408357,3.96875 3.96875,3.96875 0,1.70732 0,3.96875 1.0583333,3.96875 -1.5726561,6.93242 -2.38125,15.875 1.5874997,27.78125 v 1.32292 C 6.6145833,281.12499 4.7625,273.18749 3.3504756,265.30616 2.6458333,259.95832 2.6458333,255.98957 2.6458333,253.34374 v -5.29167 z" id="path1366"/>
+                    <ellipse style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.39883763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path836" cx="13.256729" cy="208.32764" rx="3.9883728" ry="3.9883788" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.77535379;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path822" r="1.9383832" cy="258.62711" cx="5.3950624" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47601172;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path822-6" r="1.1900285" cy="255.00548" cx="4.2051063" />
+                    <path style="fill:#000000;stroke:none;stroke-width:0.27021405px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 256.70096,177.56549 c 0,0 26.40321,8.3095 42.27821,8.3095 h 194.46874 c 0.21844,-2.36895 1.51998,-3.88442 -7.9375,-7.9375 17.56391,4.05308 19.84375,13.49375 19.84375,13.49375 0,0 0.79375,-2.91042 1.32292,-8.20209 0.10127,17.16706 0.0817,41.29768 -0.0282,62.4301 0,1.3512 0,2.70239 1.35107,-2.70211 0,9.45749 -0.0568,1.38109 0,13.51066 0,12.15955 -5.12275,27.2468 -13.22917,40.75754 v -10.80869 c 4.05321,-9.45731 2.70214,-21.61693 1.35107,-29.7235 1.29476,-0.70358 1.25347,-0.77596 1.28211,-3.47799 l 0.0127,-1.19434 h 3.96874 c 1.35107,5e-5 1.35107,-2.64578 0,-2.64583 h -3.96875 v -2.64584 h 3.96875 c 1.35107,-0.004 1.35107,-2.64583 0,-2.64583 h -3.96875 v -2.64583 h 3.96875 c 1.35107,0 1.35107,-2.64584 0,-2.64584 h -1.32291 V 218.9479 c 0,0 0.0563,-2.64583 -2.64584,-2.64583 v -3.43958 c 1.55249,-0.9712 2.64583,-2.70808 2.64583,-4.49792 0,-2.70225 -2.58953,-5.29116 -5.29166,-5.29167 l -220.92708,-1.4e-4 c 0,-9.26041 -7.9375,-17.19791 -17.19792,-17.19791 z m 242.3032,12.27825 c -1.12941,0 -2.17282,0.50947 -2.91041,1.32291 -12.96459,0 -150.16241,0.0877 -210.34375,0 -0.73381,-0.70494 -1.81389,-1.30638 -2.91042,-1.30638 -2.11666,0 -3.95831,1.90684 -3.96353,3.98786 -0.005,2.08102 1.84687,3.93311 3.96353,3.93311 1.1186,0 2.17391,-0.52272 2.91042,-1.32292 h 210.34375 c 0.73631,0.79801 1.79361,1.32292 2.91041,1.32292 2.11667,0 3.96875,-1.85209 3.96875,-3.96875 0,-2.11667 -1.85208,-3.96875 -3.96875,-3.96875 z m 5.02709,60.85416 c -0.0514,1.99733 -1.34084,3.96875 -3.96875,3.96875 0,1.70732 0,3.96875 -1.05834,3.96875 1.57266,6.93242 2.38125,15.875 -1.5875,27.78125 v 1.32292 c 3.96875,-6.61458 5.82084,-14.55208 7.23286,-22.43341 0.70464,-5.34784 0.70464,-9.31659 0.70464,-11.96242 v -5.29167 z" id="path1366-0"/>
+                    <ellipse style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.39883763;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path836-6" cx="-494.74329" cy="208.32762" rx="3.9883728" ry="3.9883788" transform="scale(-1,1)" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.77535379;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path822-0" r="1.9383832" cy="258.62714" cx="-502.60495" transform="scale(-1,1)" />
+                    <circle style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.47601172;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path822-6-4" r="1.1900285" cy="255.00548" cx="-503.79489" transform="scale(-1,1)" />
+                </g>
+            </svg>
+            <div class="tab focuses active" data-group="primary" data-tab="focuses">
+                <div class="section focuses">
+                    <div class="row item">
+                        <div class="image"></div>
+                        <div class="column-x2-big bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
+                        <div class="column-x2-small bold">{{localize 'dishonored.actor.focus.rating'}}</div>
+                        <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="focus"><i class="fas fa-plus"></i></a>
+                    </div>
+                    {{#each items as |item id|}}
+                    {{#if (eq item.type "focus")}}
+                    <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                        <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                        <h4 class="column-x2-big">{{item.name}}</h4>
+                        <h4 class="column-x2-small">{{item.data.rating}}</h4>
+                        <div class="control">
+                            <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                            <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                        </div>
+                    </li>
+                    {{/if}}
+                    {{/each}}
+                </div>
+            </div>
+            <div class="tab abilities" data-group="primary" data-tab="abilities">
+                <svg width="1920" height="451.40601" viewBox="0 0 507.99999 119.43451" style="width:100%; height:auto; position: absolute;">
+                    <g id="layer1" transform="translate(0,-177.56548)">
+                        <path style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25369042;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="m 243.41667,203.33748 c 7.9375,24.19046 7.9375,48.00327 10.58333,71.81577 2.64583,-23.8125 2.64581,-47.62531 10.58333,-71.81577 -5.29168,3.02379 -7.94394,3.0171 -10.58333,3.0241 -2.65231,0.007 -5.29167,-2.6e-4 -10.58333,-3.0241 z m 5.29166,5.66994 c 2.64584,1.72672 3.96552,1.73048 5.29167,1.72651 1.31969,-0.003 2.64583,2.1e-4 5.29167,-1.72651 -3.96877,13.81402 -3.96877,27.41222 -5.29167,41.01041 -1.32291,-13.59819 -1.32291,-27.19639 -5.29167,-41.01041 z" id="svgColumnSeperator"/>
+                    </g>
+                </svg>
+                <div class="main">
+                    <div class="section talents">
                         <div class="title">
-                            {{localize 'dishonored.actor.focus.title'}}
+                            {{localize 'dishonored.actor.talent.title'}}
                         </div>
                         <div class="row item">
                             <div class="image"></div>
-                            <div class="column-x2-big bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
-                            <div class="column-x2-small bold">{{localize 'dishonored.actor.focus.rating'}}</div>
-                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="focus"><i class="fas fa-plus"></i></a>
+                            <div class="column-x1 bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
+                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="talent"><i class="fas fa-plus"></i></a>
                         </div>
-                        {{#each actor.items as |item id|}}
-                        {{#if (eq item.type "focus")}}
+                        {{#each items as |item id|}}
+                        {{#if (eq item.type "talent")}}
                         <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
                             <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
-                            <h4 class="column-x2-big">{{item.name}}</h4>
-                            <h4 class="column-x2-small">{{item.data.rating}}</h4>
+                            <h4 class="column-x1">{{item.name}}</h4>
                             <div class="control">
                                 <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
                                 <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
@@ -162,8 +254,6 @@ <h4 class="column-x2-small">{{item.data.rating}}</h4>
                         {{/if}}
                         {{/each}}
                     </div>
-                </div>
-                <div class="column">
                     <div class="section powers">
                         <div class="title">
                             {{localize 'dishonored.actor.power.title'}}
@@ -173,7 +263,7 @@ <h4 class="column-x2-small">{{item.data.rating}}</h4>
                             <div class="column-x1 bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
                             <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="power"><i class="fas fa-plus"></i></a>
                         </div>
-                        {{#each actor.items as |item type id|}}
+                        {{#each items as |item type id|}}
                         {{#if (eq item.type "power")}}
                         <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
                             <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
@@ -187,26 +277,19 @@ <h4 class="column-x1">{{item.name}}</h4>
                         {{/each}}
                     </div>
                 </div>
-                <div class="column">
-                    <div class="section belongings">
-                        <div class="title">
-                            {{localize 'dishonored.actor.belonging.title'}}
-                        </div>
-                        <div class="row item">
-                            <div class="column-x4 bold">{{localize 'dishonored.actor.belonging.collectable.coin'}}</div>
-                            <div class="column-x4 small"><input name="data.coins" type="text" value="{{data.coins}}" placeholder="0"/></div>
-                            <div class="column-x4 bold">{{localize 'dishonored.actor.belonging.collectable.rune'}}</div>
-                            <div class="column-x4 small"><input name="data.runes" type="text" value="{{data.runes}}" placeholder="0"/></div>
-                        </div>
-                        <div class="row item">
+            </div>
+            <div class="tab belongings" data-group="primary" data-tab="belongings">
+                <div class="section belongings">
+                    <div class="main">
+                        <div class="row item equipable">
                             <div class="image"></div>
-                            <div class="column-x2-big advisory">{{localize 'dishonored.actor.belonging.weapon.title'}}</div>
-                            <div class="column-x2-small advisory">{{localize 'dishonored.actor.belonging.weapon.dmg'}}</div>
+                            <div class="column-x2-big bold">{{localize 'dishonored.actor.belonging.weapon.title'}}</div>
+                            <div class="column-x2-small bold">{{localize 'dishonored.actor.belonging.weapon.dmg'}}</div>
                             <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="weapon"><i class="fas fa-plus"></i></a>
                         </div>
-                        {{#each actor.items as |item type id|}}
+                        {{#each items as |item type id|}}
                         {{#if (eq item.type "weapon")}}
-                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                        <li class="row entry equipable" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
                             <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
                             <h4 class="column-x2-big">{{item.name}}</h4>
                             <h4 class="column-x2-small">{{item.data.damage}}</h4>
@@ -217,52 +300,59 @@ <h4 class="column-x2-small">{{item.data.damage}}</h4>
                         </li>
                         {{/if}}
                         {{/each}}
-                        <div class="row item">
+                        <div class="row item equipable">
                             <div class="image"></div>
-                            <div class="column-x2-big advisory">{{localize 'dishonored.actor.belonging.armor.title'}}</div>
-                            <div class="column-x2-small advisory">{{localize 'dishonored.actor.belonging.armor.protect'}}</div>
+                            <div class="column-x2-big bold">{{localize 'dishonored.actor.belonging.armor.title'}}</div>
+                            <div class="column-x2-small bold">{{localize 'dishonored.actor.belonging.armor.protect'}}</div>
                             <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="armor"><i class="fas fa-plus"></i></a>
                         </div>
-                        {{#each actor.items as |item type id|}}
+                        {{#each items as |item type id|}}
                         {{#if (eq item.type "armor")}}
-                        <li id="armor-{{item._id}}" class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                        <li id="armor-{{item._id}}" class="row entry equipable" data-item-id="{{item._id}}" data-item-type="{{item.type}}" data-item-helmet="{{item.data.helmet}}" data-item-equipped="{{item.data.equipped}}">
                             <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
                             <h4 class="column-x2-big">{{item.name}}</h4>
                             <h4 id="protectval-armor-{{item._id}}" class="column-x2-small">{{item.data.protection}}</h4>
                             <div class="control">
+                                {{#if (eq item.data.equipped true)}}
+                                    <a class="control toggle"><i class="fas fa-toggle-on"></i></a>
+                                {{else}}
+                                    <a class="control toggle"><i class="fas fa-toggle-off"></i></a>
+                                {{/if}}
                                 <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
                                 <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
                             </div>
                         </li>
                         {{/if}}
                         {{/each}}
-                        <div class="row item">
-                            <div class="image">
-                            </div>
-                            <div class="column-x1 advisory">{{localize 'dishonored.actor.belonging.bonecharm.title'}}</div>
+                        <div class="row item equipable">
+                            <div class="image"></div>
+                            <div class="column-x2-big bold">{{localize 'dishonored.actor.belonging.bonecharm.title'}}</div>
+                            <div class="column-x2-small bold"></div>
                             <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="bonecharm"><i class="fas fa-plus"></i></a>
                         </div>
-                        {{#each actor.items as |item type id|}}
+                        {{#each items as |item type id|}}
                         {{#if (eq item.type "bonecharm")}}
-                        <li class="row entry bonecharm" data-item-id="{{item._id}}" data-item-type="{{item.type}}" >
+                        <li class="row entry bonecharm equipable" data-item-id="{{item._id}}" data-item-type="{{item.type}}" >
                             <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
-                            <h4 class="column-x1">{{item.name}}</h4>
+                            <h4 class="column-x2-big">{{item.name}}</h4>
+                            <div class="column-x2-small"></div>
                             <div class="control">
+                                <a class="control toggle"><i class="fas fa-toggle-{{#if (eq item.data.equipped true)}}on{{else}}off{{/if}}"></i></a>
                                 <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
                                 <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
                             </div>
                         </li>
                         {{/if}}
                         {{/each}}
-                        <div class="row item">
+                        <div class="row item equipable">
                             <div class="image"></div>
-                            <div class="column-x2-big advisory">{{localize 'dishonored.actor.belonging.other.title'}}</div>
-                            <div class="column-x2-small advisory">{{localize 'dishonored.actor.belonging.other.qty'}}</div>
+                            <div class="column-x2-big bold">{{localize 'dishonored.actor.belonging.other.title'}}</div>
+                            <div class="column-x2-small bold">{{localize 'dishonored.actor.belonging.other.qty'}}</div>
                             <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="item"><i class="fas fa-plus"></i></a>
                         </div>
-                        {{#each actor.items as |item type id|}}
+                        {{#each items as |item type id|}}
                         {{#if (eq item.type "item")}}
-                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                        <li class="row entry equipable" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
                             <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
                             <h4 class="column-x2-big">{{item.name}}</h4>
                             <h4 class="column-x2-small">{{item.data.quantity}}</h4>
@@ -276,16 +366,68 @@ <h4 class="column-x2-small">{{item.data.quantity}}</h4>
                     </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="section notes">
-                    <div class="title">
-                        {{localize 'dishonored.actor.note.title'}}
+            <div class="tab biography" data-group="primary" data-tab="biography">
+                <svg width="1920" height="451.40601" viewBox="0 0 507.99999 119.43451" style="width:100%; height:auto; position: absolute;">
+                    <g id="layer1" transform="translate(0,-177.56548)">
+                        <path style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.25369042;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="m 243.41667,203.33748 c 7.9375,24.19046 7.9375,48.00327 10.58333,71.81577 2.64583,-23.8125 2.64581,-47.62531 10.58333,-71.81577 -5.29168,3.02379 -7.94394,3.0171 -10.58333,3.0241 -2.65231,0.007 -5.29167,-2.6e-4 -10.58333,-3.0241 z m 5.29166,5.66994 c 2.64584,1.72672 3.96552,1.73048 5.29167,1.72651 1.31969,-0.003 2.64583,2.1e-4 5.29167,-1.72651 -3.96877,13.81402 -3.96877,27.41222 -5.29167,41.01041 -1.32291,-13.59819 -1.32291,-27.19639 -5.29167,-41.01041 z" id="svgColumnSeperator"/>
+                    </g>
+                </svg>
+                <div class="content">
+                    <div class="section truths">
+                        <div class="title">
+                            {{localize 'dishonored.actor.truth.title'}}
+                        </div>
+                        <div class="row item">
+                            <div class="image"></div>
+                            <div class="column-x1 bold">{{localize 'dishonored.actor.truth.content'}}</div>
+                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="truth"><i class="fas fa-plus"></i></a>
+                        </div>
+                        {{#each items as |item id|}}
+                        {{#if (eq item.type "truth")}}
+                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                            <h4 class="column-x1">{{item.name}}</h4>
+                            <div class="control">
+                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                            </div>
+                        </li>
+                        {{/if}}
+                        {{/each}}
                     </div>
+                    <div class="section contacts">
+                        <div class="title">
+                            {{localize 'dishonored.actor.contact.title'}}
+                        </div>
+                        <div class="row item">
+                            <div class="image"></div>
+                            <div class="column-x2 bold">{{localize 'dishonored.actor.genericitem.name'}}</div>
+                            <div class="column-x2 bold">{{localize 'dishonored.actor.contact.relation'}}</div>
+                            <a class="control create" title="{{localize 'dishonored.titles.createItem'}}" data-type="contact"><i class="fas fa-plus"></i></a>
+                        </div>
+                        {{#each items as |item id|}}
+                        {{#if (eq item.type "contact")}}
+                        <li class="row entry" data-item-id="{{item._id}}" data-item-type="{{item.type}}">
+                            <div class="image"><img class="rollable" src="{{item.img}}" title="{{item.name}}"/></div>
+                            <h4 class="column-x2">{{item.name}}</h4>
+                            <h4 class="column-x2">{{item.data.relationship}}</h4>
+                            <div class="control">
+                                <a class="control edit" title="{{localize 'dishonored.titles.editItem'}}"><i class="fas fa-edit"></i></a>
+                                <a class="control delete" title="{{localize 'dishonored.titles.deleteItem'}}"><i class="fas fa-trash"></i></a>
+                            </div>
+                        </li>
+                        {{/if}}
+                        {{/each}}
+                    </div>
+                </div>
+            </div>
+            <div class="tab notes" data-group="primary" data-tab="notes">
+                <div class="section notes">
                     <div class="notes">
                         {{editor content=data.notes target="data.notes" button=true owner=owner editable=editable}}
                     </div>
                 </div>
             </div>
-        </div>
+        </section>
     </div>
 </form>
\ No newline at end of file
diff --git a/templates/apps/tracker.html b/templates/apps/tracker.html
index a6e7861..47d7c18 100644
--- a/templates/apps/tracker.html
+++ b/templates/apps/tracker.html
@@ -1,32 +1,82 @@
-<div id="dishonored-chaos-tracker" class="dishonored tracker app chaos">
-    <div class="button-group">
-        <div id="dishonored-chaos-track-decrease" class="button dishonored-impermitable">
-            <i class="fas fa-minus"></i>
+<div id="dishonored-tracker-test" class="dishonored tracker panel">
+    <div class="dishonored tracker chaos header">
+        {{localize 'dishonored.tracker.chaos'}}
+    </div>
+    <input type="text" class="dishonored input tracker chaos number" id="dishonored-track-chaos" data-dtype="Number" />
+    <div id="dishonored-chaos-track-decrease" class="dishonored tracker button chaos decrease dishonored-impermitable">
+        <i class="fas fa-minus"></i>
+    </div>
+    <div id="dishonored-chaos-track-increase" class="dishonored tracker button chaos increase dishonored-impermitable" >
+        <i class="fas fa-plus"></i>
+    </div>
+    <div class="dishonored tracker momentum header">
+        {{localize 'dishonored.tracker.momentum'}}
+    </div>
+    <!-- <input type="text" class="input" id="dishonored-track-momentum" data-dtype="Number" /> -->
+    <svg preserveAspectRatio="xMidYMid meet" viewBox="0 0 460 100" width="690" height="150" id="svg326">
+        <path d="M 399.38086 6.8300781 C 382.13086 6.8300781 368.13086 20.699063 368.13086 37.789062 C 368.13086 54.879063 382.13086 68.75 399.38086 68.75 C 416.62086 68.75 430.61914 54.879063 430.61914 37.789062 C 430.61914 20.699062 416.62086 6.8300781 399.38086 6.8300781 z M 399.2168 14.570312 C 412.1468 14.570312 422.64648 24.971562 422.64648 37.789062 C 422.64648 50.606563 412.1468 61.009766 399.2168 61.009766 C 386.2793 61.009766 375.7793 50.606562 375.7793 37.789062 C 375.7793 24.971562 386.2793 14.570313 399.2168 14.570312 z " id="aHMuxnQlc" />
+        <path d="M 417.83203 6.2324219 C 417.66258 6.2254663 417.49859 6.231875 417.33984 6.25 L 417.99023 6.25 C 417.93824 6.2456315 417.88305 6.2345162 417.83203 6.2324219 z M 417.99023 6.25 C 420.52838 6.4632563 424.21968 9.3788292 429.07031 15.019531 C 433.47031 20.139531 436.7093 29.29 437.0293 37.5 C 437.3493 45.71 433.86945 58.330703 427.18945 64.220703 C 421.60945 69.140703 413.86086 75.520781 399.88086 75.800781 C 388.00086 76.040781 376.10992 71.13 369.41992 62.5 C 364.56992 56.25 361.95055 47.92 361.56055 37.5 L 361.56055 18.75 L 341.88086 18.75 C 344.44086 59.8 311.84055 80.64 244.06055 81.25 C 202.72055 81.62 178.13977 81.469219 162.00977 79.949219 C 151.24977 78.939219 146.52055 75.759922 147.81055 70.419922 L 131.88086 70.419922 C 123.40086 69.799922 119.03 66.75 118.75 61.25 C 118.47 55.75 118.47 52 118.75 50 L 10.470703 100 L 460 100 L 460 6.25 L 417.99023 6.25 z M 445.31055 12.5 C 449.45055 12.5 452.81055 15.86 452.81055 20 C 452.81055 24.14 449.45055 27.5 445.31055 27.5 C 441.17055 27.5 437.81055 24.14 437.81055 20 C 437.81055 15.86 441.17055 12.5 445.31055 12.5 z M 345 21.880859 L 359.38086 21.880859 L 359.38086 96.880859 L 28.75 96.880859 L 115 56.25 C 107.03 74.29 122.91039 83.660859 162.65039 84.380859 C 222.26039 85.440859 189.10984 85.240859 234.08984 84.380859 C 254.25984 83.990859 270.56953 83.920156 285.51953 80.660156 C 297.79953 77.990156 308.93969 74.689531 317.92969 69.769531 C 326.06969 65.309531 332.20055 59.760859 336.31055 53.130859 C 339.56055 48.420859 341.95047 43.21 343.48047 37.5 C 345.01047 31.79 345.52 26.580859 345 21.880859 z M 448.2793 34.380859 C 451.7293 34.380859 454.5293 37.180859 454.5293 40.630859 C 454.5293 44.070859 451.7293 46.880859 448.2793 46.880859 C 444.8293 46.880859 442.0293 44.070859 442.0293 40.630859 C 442.0293 37.180859 444.8293 34.380859 448.2793 34.380859 z M 443.43945 53.130859 C 446.19945 53.130859 448.43945 55.370859 448.43945 58.130859 C 448.43945 60.880859 446.19945 63.130859 443.43945 63.130859 C 440.67945 63.130859 438.43945 60.880859 438.43945 58.130859 C 438.43945 55.370859 440.67945 53.130859 443.43945 53.130859 z M 434.68945 65.630859 C 436.75945 65.630859 438.43945 67.310859 438.43945 69.380859 C 438.43945 71.440859 436.75945 73.130859 434.68945 73.130859 C 432.61945 73.130859 430.93945 71.440859 430.93945 69.380859 C 430.93945 67.310859 432.61945 65.630859 434.68945 65.630859 z M 130.4707 71.880859 C 131.8507 71.880859 132.9707 73.000859 132.9707 74.380859 C 132.9707 75.750859 131.8507 76.880859 130.4707 76.880859 C 129.0907 76.880859 127.9707 75.750859 127.9707 74.380859 C 127.9707 73.000859 129.0907 71.880859 130.4707 71.880859 z M 141.2793 71.880859 C 143.3493 71.880859 145.0293 73.560859 145.0293 75.630859 C 145.0293 77.690859 143.3493 79.380859 141.2793 79.380859 C 139.2093 79.380859 137.5293 77.690859 137.5293 75.630859 C 137.5293 73.560859 139.2093 71.880859 141.2793 71.880859 z M 424.06055 75 C 425.44055 75 426.56055 76.12 426.56055 77.5 C 426.56055 78.88 425.44055 80 424.06055 80 C 422.68055 80 421.56055 78.88 421.56055 77.5 C 421.56055 76.12 422.68055 75 424.06055 75 z " id="c5gxGpb0t" />
+    </svg>
+    <div class="dishonored tracker momentum track">
+        <div class="dishonored tracker momentum track item track-1">
+            <div id="dishonored-momentum-tracker-1-fg" class="dishonored tracker momentum track item foreground">1</div>
+            <svg class="dishonored tracker momentum track item background svg" width="83" height="114" viewBox="0 0 14.58 19.850002" version="1.1" id="svg5664">
+                <metadata id="metadata5661">
+                </metadata>
+                <g id="layer1" transform="translate(0,-277.15)">
+                    <path class="dishonored tracker momentum track item background slot track-1" d="M 55,49.115234 0.00195313,75.023438 H 55 Z" transform="matrix(0.26458333,0,0,0.26458333,0,277.15)" id="dishonored-momentum-tracker-1-bg" />
+                </g>
+            </svg>
         </div>
-        <div>
-            <input type="text" class="input" id="dishonored-track-chaos" data-dtype="Number" />
+        <div class="dishonored tracker momentum track item track-2">
+            <div id="dishonored-momentum-tracker-2-fg" class="dishonored tracker momentum track item foreground">2</div>
+            <svg class="dishonored tracker momentum track item background svg" width="83" height="114" viewBox="0 0 14.58 19.850002" version="1.1" id="svg5664">
+                <metadata id="metadata5661">
+                </metadata>
+                <g id="layer1" transform="translate(-14.58,-277.15)">
+                    <path class="dishonored tracker momentum track item background slot track-2" d="M 86.251953,34.392578 55,49.115234 v 25.908204 h 55 V 60.599609 C 88.067595,56.951912 80.14148,48.223546 86.251953,34.392578 Z" transform="matrix(0.26458333,0,0,0.26458333,0,277.15)" id="dishonored-momentum-tracker-2-bg"/>
+                </g>
+            </svg>
         </div>
-        <div id="dishonored-chaos-track-increase" class="button dishonored-impermitable">
-            <i class="fas fa-plus"></i>
+        <div class="dishonored tracker momentum track item track-3">
+            <div id="dishonored-momentum-tracker-3-fg" class="dishonored tracker momentum track item foreground">3</div>
+            <svg class="dishonored tracker momentum track item background svg" width="83" height="114" viewBox="0 0 14.58 19.850002" version="1.1" id="svg5664">
+                <metadata id="metadata5661">
+                </metadata>
+                <g id="layer1" transform="translate(-29.16,-277.15)">
+                    <path class="dishonored tracker momentum track item background slot track-3" d="m 110,60.599609 v 14.423829 h 55 v -11.91211 c -5.93383,-0.1143 -15.00246,-0.30168 -31.09766,-0.58789 C 124.63036,62.35545 116.67444,61.709671 110,60.599609 Z" transform="matrix(0.26458333,0,0,0.26458333,0,277.15)" id="dishonored-momentum-tracker-3-bg" />
+                </g>
+            </svg>
         </div>
-    </div>
-    <div class="header">
-        {{localize 'dishonored.tracker.chaos'}}
-    </div>
-</div>
-<div id="dishonored-momentum-tracker" class="dishonored tracker app momentum">
-    <div class="button-group">
-        <div id="dishonored-momentum-track-decrease" class="button dishonored-impermitable">
-            <i class="fas fa-minus"></i>
+        <div class="dishonored tracker momentum track item track-4">
+            <div id="dishonored-momentum-tracker-4-fg" class="dishonored tracker momentum track item foreground">4</div>
+            <svg class="dishonored tracker momentum track item background svg" width="83" height="114" viewBox="0 0 14.58 19.850002" version="1.1" id="svg5664">
+                <metadata id="metadata5661">
+                </metadata>
+                <g id="layer1" transform="translate(-43.74,-277.15)">
+                    <path class="dishonored tracker momentum track item background slot track-4" d="m 220,62.230469 c -4.66567,0.115337 -9.53548,0.193915 -14.6582,0.292969 -32.83503,0.627788 -24.29914,0.896911 -40.3418,0.58789 v 11.91211 h 55 z" transform="matrix(0.26458333,0,0,0.26458333,0,277.15)" id="dishonored-momentum-tracker-4-bg">
+                </g>
+            </svg>
         </div>
-        <div>
-            <input type="text" class="input" id="dishonored-track-momentum" data-dtype="Number" />
+        <div class="dishonored tracker momentum track item track-5">
+            <div id="dishonored-momentum-tracker-5-fg" class="dishonored tracker momentum track item foreground">5</div>
+            <svg class="dishonored tracker momentum track item background svg" width="83" height="114" viewBox="0 0 14.58 19.850002" version="1.1" id="svg5664">
+                <metadata id="metadata5661">
+                </metadata>
+                <g id="layer1" transform="translate(-58.32,-277.15)">
+                    <path class="dishonored tracker momentum track item background slot track-5" d="m 275,53.927734 c -5.6692,1.890723 -11.78594,3.474208 -18.22852,4.875 C 245.61844,61.234764 233.70477,61.89168 220,62.230469 v 12.792969 h 55 z" transform="matrix(0.26458333,0,0,0.26458333,0,277.15)" id="dishonored-momentum-tracker-5-bg"/>
+                </g>
+            </svg>
         </div>
-        <div id="dishonored-momentum-track-increase" class="button dishonored-impermitable">
-            <i class="fas fa-plus"></i>
+        <div class="dishonored tracker momentum track item track-6">
+            <div id="dishonored-momentum-tracker-6-fg" class="dishonored tracker momentum track item foreground">6</div>
+            <svg class="dishonored tracker momentum track item background svg" width="83" height="114" viewBox="0 0 14.58 19.850002" version="1.1" id="svg5664">
+                <metadata id="metadata5661">
+                </metadata>
+                <g id="layer1" transform="translate(-72.9,-277.15)">
+                    <path class="dishonored tracker momentum track item background slot track-6" d="m 316.2793,0.35546875 c 0.4612,4.61396835 -0.0524,9.70972625 -1.54688,15.28710925 -1.52999,5.709997 -3.91994,10.920888 -7.16992,15.63086 -4.11001,6.630009 -10.24086,12.178678 -18.38086,16.638671 -4.27349,2.338775 -9.04494,4.302496 -14.18164,6.015625 v 21.095704 h 55 V 0.35546875 Z" transform="matrix(0.26458333,0,0,0.26458333,0,277.15)" id="dishonored-momentum-tracker-6-bg" />
+                </g>
+            </svg>
         </div>
     </div>
-    <div class="header">
-        {{localize 'dishonored.tracker.momentum'}}
-    </div>
 </div>
\ No newline at end of file
diff --git a/templates/items/armor-sheet.html b/templates/items/armor-sheet.html
index 4b328cc..930bded 100644
--- a/templates/items/armor-sheet.html
+++ b/templates/items/armor-sheet.html
@@ -1,10 +1,10 @@
 <form class="{{cssClass}}" autocomplete="off">
     <div class="header-fields">
         <div class="row">
-            <img class="img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+            <img class="img" src="{{img}}" data-edit="img" title="{{name}}" />
             <div class="column-x4-big">
                 <label>{{localize 'dishonored.actor.genericitem.name'}}</label>
-                <input name="name" type="text" value="{{item.name}}" placeholder="Name" />
+                <input name="name" type="text" value="{{name}}" placeholder="Name" />
             </div>
             <div class="column-x2-x3-small">
                 <label>{{localize 'dishonored.item.armor.helmet'}}</label>
diff --git a/templates/items/bonecharm-sheet.html b/templates/items/bonecharm-sheet.html
index d13f368..585b999 100644
--- a/templates/items/bonecharm-sheet.html
+++ b/templates/items/bonecharm-sheet.html
@@ -1,10 +1,10 @@
 <form class="{{cssClass}}" autocomplete="off">
     <div class="header-fields">
         <div class="row">
-            <img class="img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+            <img class="img" src="{{img}}" data-edit="img" title="{{name}}" />
             <div class="column-x1">
                 <label>{{localize 'dishonored.actor.genericitem.name'}}</label>
-                <input name="name" type="text" value="{{item.name}}" placeholder="Name" />
+                <input name="name" type="text" value="{{name}}" placeholder="Name" />
             </div>
         </div>
     </div>
diff --git a/templates/items/contact-sheet.html b/templates/items/contact-sheet.html
index 3e6dc4a..2fafbbc 100644
--- a/templates/items/contact-sheet.html
+++ b/templates/items/contact-sheet.html
@@ -1,16 +1,16 @@
 <form class="{{cssClass}}" autocomplete="off">
     <div class="header-fields">
         <div class="row">
-            <img class="img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+            <img class="img" src="{{img}}" data-edit="img" title="{{name}}" />
             <div class="column-x2-big">
                 <label>{{localize 'dishonored.actor.genericitem.name'}}</label>
-                <input id="name" name="name" type="text" value="{{item.name}}" placeholder="Name" />
+                <input id="name" name="name" type="text" value="{{name}}" placeholder="Name" />
             </div>
             <div class="column-x2-x3-small">
                 <label>{{localize 'dishonored.actor.contact.relation'}}</label>
-                <select class="relationship" name="data.relationship"  data-type="String">
-                    {{#select item.data.relationship}}
-                    {{#each item.data.relationships as |relation key|}}
+                <select class="relationship" name="data.relationship" data-type="String">
+                    {{#select data.relationship}}
+                    {{#each data.relationships as |relation key|}}
                     <option value="{{localize relation.label}}">{{localize relation.label}}</option>
                     {{/each}}
                     {{/select}}
diff --git a/templates/items/focus-sheet.html b/templates/items/focus-sheet.html
index 4e27195..73d8414 100644
--- a/templates/items/focus-sheet.html
+++ b/templates/items/focus-sheet.html
@@ -1,10 +1,10 @@
 <form class="{{cssClass}}" autocomplete="off">
     <div class="header-fields">
         <div class="row">
-            <img class="img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+            <img class="img" src="{{img}}" data-edit="img" title="{{name}}" />
             <div class="column-x2-big">
                 <label>{{localize 'dishonored.actor.genericitem.name'}}</label>
-                <input name="name" type="text" value="{{item.name}}" placeholder="Name" />
+                <input name="name" type="text" value="{{name}}" placeholder="Name" />
             </div>
             <div class="column-x2-x3-small">
                 <label>{{localize 'dishonored.actor.focus.rating'}}</label>
diff --git a/templates/items/item-sheet.html b/templates/items/item-sheet.html
index 87d9aa1..51d0881 100644
--- a/templates/items/item-sheet.html
+++ b/templates/items/item-sheet.html
@@ -1,10 +1,10 @@
 <form class="{{cssClass}}" autocomplete="off">
     <div class="header-fields">
         <div class="row">
-            <img class="img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+            <img class="img" src="{{img}}" data-edit="img" title="{{name}}" />
             <div class="column-x3-big">
                 <label>{{localize 'dishonored.actor.genericitem.name'}}</label>
-                <input name="name" type="text" value="{{item.name}}" placeholder="Name" />
+                <input name="name" type="text" value="{{name}}" placeholder="Name" />
             </div>
             <div class="column-x2-x3-small">
                 <label>{{localize 'dishonored.actor.belonging.other.quantity'}}</label>
diff --git a/templates/items/limited-sheet.html b/templates/items/limited-sheet.html
index 201fad2..5a70956 100644
--- a/templates/items/limited-sheet.html
+++ b/templates/items/limited-sheet.html
@@ -1,10 +1,10 @@
 <form class="{{cssClass}}" autocomplete="off">
     <div class="header-fields">
         <div class="row">
-            <img class="img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+            <img class="img" src="{{img}}" data-edit="img" title="{{name}}" />
             <div class="column-x1">
                 <label>{{localize 'dishonored.actor.genericitem.name'}}</label>
-                <input name="name" type="text" value="{{item.name}}" placeholder="Name" />
+                <input name="name" type="text" value="{{name}}" placeholder="Name" />
             </div>
         </div>
     </div>
diff --git a/templates/items/power-sheet.html b/templates/items/power-sheet.html
index d584685..6e55296 100644
--- a/templates/items/power-sheet.html
+++ b/templates/items/power-sheet.html
@@ -1,10 +1,10 @@
 <form class="{{cssClass}}" autocomplete="off">
     <div class="header-fields">
         <div class="row">
-            <img class="img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+            <img class="img" src="{{img}}" data-edit="img" title="{{name}}" />
             <div class="column-x3-big">
                 <label>{{localize 'dishonored.actor.genericitem.name'}}</label>
-                <input name="name" type="text" value="{{item.name}}" placeholder="Name" />
+                <input name="name" type="text" value="{{name}}" placeholder="Name" />
             </div>
             <div class="column-x2-x3-small">
                 <label>{{localize 'dishonored.actor.power.mana'}}</label>
diff --git a/templates/items/talent-sheet.html b/templates/items/talent-sheet.html
index 39b8a5c..7b6f322 100644
--- a/templates/items/talent-sheet.html
+++ b/templates/items/talent-sheet.html
@@ -1,10 +1,10 @@
 <form class="{{cssClass}}" autocomplete="off">
     <div class="header-fields">
         <div class="row">
-            <img class="img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+            <img class="img" src="{{img}}" data-edit="img" title="{{name}}" />
             <div class="column-x2">
                 <label>{{localize 'dishonored.actor.genericitem.name'}}</label>
-                <input name="name" type="text" value="{{item.name}}" placeholder="Name" />
+                <input name="name" type="text" value="{{name}}" placeholder="Name" />
             </div>
             <div class="column-x2">
                 <label>{{localize 'dishonored.actor.talent.type'}}</label>
diff --git a/templates/items/truth-sheet.html b/templates/items/truth-sheet.html
new file mode 100644
index 0000000..b81dc6d
--- /dev/null
+++ b/templates/items/truth-sheet.html
@@ -0,0 +1,11 @@
+<form class="{{cssClass}}" autocomplete="off">
+    <div class="header-fields">
+        <div class="row">
+            <img class="img" src="{{img}}" data-edit="img" title="{{name}}" />
+            <div class="column-x1">
+                <label>{{localize 'dishonored.item.truth'}}</label>
+                <input name="name" type="text" value="{{name}}" placeholder="Name" />
+            </div>
+        </div>
+    </div>
+</form>
\ No newline at end of file
diff --git a/templates/items/weapon-sheet.html b/templates/items/weapon-sheet.html
index 53d58be..6d10668 100644
--- a/templates/items/weapon-sheet.html
+++ b/templates/items/weapon-sheet.html
@@ -1,10 +1,10 @@
 <form class="{{cssClass}}" autocomplete="off">
     <div class="header-fields">
         <div class="row">
-            <img class="img" src="{{item.img}}" data-edit="img" title="{{item.name}}" />
+            <img class="img" src="{{img}}" data-edit="img" title="{{name}}" />
             <div class="column-x2-big">
                 <label>{{localize 'dishonored.actor.genericitem.name'}}</label>
-                <input name="name" type="text" value="{{item.name}}" placeholder="Name" />
+                <input name="name" type="text" value="{{name}}" placeholder="Name" />
             </div>
             <div class="column-x2-x3-small">
                 <label>{{localize 'dishonored.actor.genericitem.cost'}}</label>