diff --git a/src/apps/actor/base-sheet.js b/src/apps/actor/base-sheet.js
index 149ad806..b24e4f53 100644
--- a/src/apps/actor/base-sheet.js
+++ b/src/apps/actor/base-sheet.js
@@ -7,7 +7,7 @@
 /**
  * The base sheet class for DS4 Actor Sheets
  */
-export class DS4ActorSheet extends foundry.applications.api.DocumentSheetV2 {
+export class DS4ActorSheet extends foundry.applications.api.HandlebarsApplicationMixin(foundry.applications.sheets.ActorSheetV2) {
   static DEFAULT_OPTIONS = {
     classes: ["sheet", "ds4-actor-sheet", "themed"],
     tag: "form",
@@ -68,6 +68,7 @@ export class DS4ActorSheet extends foundry.applications.api.DocumentSheetV2 {
     return templatePath;
   }
 
+
   /** @override */
   async _renderHTML(context) {
     return await foundry.applications.handlebars.renderTemplate(this.template, context);
@@ -78,6 +79,8 @@ export class DS4ActorSheet extends foundry.applications.api.DocumentSheetV2 {
     content.innerHTML = result;
   }
 
+
+
   /** @override */
   async _prepareContext(options) {
     const context = await super._prepareContext(options);
@@ -612,7 +615,8 @@ export class DS4ActorSheet extends foundry.applications.api.DocumentSheetV2 {
    * @param {Event} event - The triggering event
    * @param {HTMLElement} target - The target element
    */
-  async _onEditImage(event, target) {
+
+  async _onEditImage(_event, _target) {
     const attr = "img";
     const current = this.document.img;
 
diff --git a/src/apps/item-sheet.js b/src/apps/item-sheet.js
index 9231dad1..c72eccc4 100644
--- a/src/apps/item-sheet.js
+++ b/src/apps/item-sheet.js
@@ -7,7 +7,7 @@
 /**
  * The Sheet class for DS4 Items
  */
-export class DS4ItemSheet extends foundry.applications.sheets.ItemSheetV2 {
+export class DS4ItemSheet extends foundry.applications.api.HandlebarsApplicationMixin(foundry.applications.sheets.ItemSheetV2) {
   static DEFAULT_OPTIONS = {
     classes: ["sheet", "ds4-item-sheet", "themed"],
     tag: "form",
diff --git a/src/documents/actor/actor.js b/src/documents/actor/actor.js
index ebe57245..265995b6 100644
--- a/src/documents/actor/actor.js
+++ b/src/documents/actor/actor.js
@@ -491,7 +491,7 @@ export class DS4Actor extends Actor {
       }),
       ok: {
         label: getGame().i18n.localize("DS4.GenericOkButton"),
-        callback: (event, button, dialog) => {
+        callback: (_event, button, _dialog) => {
           const selectedAttribute = button.form.elements[attributeIdentifier].value;
           if (!isAttribute(selectedAttribute)) {
             throw new Error(
diff --git a/src/documents/item/weapon/weapon.js b/src/documents/item/weapon/weapon.js
index 9bcbbdbd..99dca7fe 100644
--- a/src/documents/item/weapon/weapon.js
+++ b/src/documents/item/weapon/weapon.js
@@ -96,7 +96,7 @@ export class DS4Weapon extends DS4Item {
       }),
       ok: {
         label: getGame().i18n.localize("DS4.GenericOkButton"),
-        callback: (event, button, dialog) => {
+        callback: (_event, button, _dialog) => {
           const selectedAttackType = button.form.elements[identifier].value;
           if (selectedAttackType !== "melee" && selectedAttackType !== "ranged") {
             throw new Error(