diff --git a/package.json b/package.json
index 9076a769..810d9fbf 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
         "eslint": "^7.20.0",
         "eslint-config-prettier": "^7.2.0",
         "eslint-plugin-prettier": "^3.3.1",
-        "foundry-vtt-types": "https://github.com/League-of-Foundry-Developers/foundry-vtt-types.git#commit=884d738b51a6cc4801ee2316eb060aafa0aff642",
+        "foundry-vtt-types": "github:League-of-Foundry-Developers/foundry-vtt-types#foundry-0.7.9",
         "fs-extra": "^9.1.0",
         "gulp": "^4.0.2",
         "gulp-sass": "^4.1.0",
@@ -63,7 +63,7 @@
         "json-stringify-pretty-compact": "^2.0.0",
         "lint-staged": "^10.5.4",
         "prettier": "^2.2.1",
-        "sass": "^1.32.7",
+        "sass": "^1.32.8",
         "ts-jest": "^26.5.1",
         "typescript": "^4.1.5",
         "yargs": "^16.2.0"
diff --git a/src/module/item/item-sheet.ts b/src/module/item/item-sheet.ts
index 41a5862c..8cd2c32e 100644
--- a/src/module/item/item-sheet.ts
+++ b/src/module/item/item-sheet.ts
@@ -53,7 +53,7 @@ export class DS4ItemSheet extends ItemSheet<ItemSheet.Data<DS4Item>> {
     }
 
     /** @override */
-    setPosition(options: Partial<Application.Position> = {}): Application.Position {
+    setPosition(options: Partial<Application.Position> = {}): Application.Position & { height: number } {
         const position = super.setPosition(options);
         if ("find" in this.element) {
             const sheetBody = this.element.find(".sheet-body");
diff --git a/src/module/rolls/check-factory.ts b/src/module/rolls/check-factory.ts
index 43d8efaa..eb68789d 100644
--- a/src/module/rolls/check-factory.ts
+++ b/src/module/rolls/check-factory.ts
@@ -7,7 +7,7 @@ class DefaultCheckOptions implements DS4CheckFactoryOptions {
     readonly maxCritSuccess = 1;
     readonly minCritFailure = 20;
     readonly useSlayingDice = false;
-    readonly rollMode: DS4RollMode = "roll";
+    readonly rollMode: Const.DiceRollMode = "roll";
 
     mergeWith(other: Partial<DS4CheckFactoryOptions>): DS4CheckFactoryOptions {
         return { ...this, ...other };
@@ -191,7 +191,7 @@ function parseDialogFormData(formData: HTMLFormElement): Partial<IntermediateGmM
  */
 interface GmModifierData {
     gmModifier: number;
-    rollMode: DS4RollMode;
+    rollMode: Const.DiceRollMode;
 }
 
 /**
@@ -216,7 +216,7 @@ interface IntermediateGmModifierData extends GmModifierData {
     minCritFailure: number;
     // TODO: In final version from system settings
     useSlayingDice: boolean;
-    rollMode: DS4RollMode;
+    rollMode: Const.DiceRollMode;
 }
 
 /**
@@ -226,12 +226,5 @@ export interface DS4CheckFactoryOptions {
     maxCritSuccess: number;
     minCritFailure: number;
     useSlayingDice: boolean;
-    rollMode: DS4RollMode;
+    rollMode: Const.DiceRollMode;
 }
-
-/**
- * Defines all possible roll modes, both for iterating and typing.
- */
-const rollModes = ["roll", "gmroll", "blindroll", "selfroll"] as const;
-type DS4RollModeTuple = typeof rollModes;
-export type DS4RollMode = DS4RollModeTuple[number];
diff --git a/yarn.lock b/yarn.lock
index e1ba9b5a..36b0f201 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2800,7 +2800,7 @@ __metadata:
     eslint: ^7.20.0
     eslint-config-prettier: ^7.2.0
     eslint-plugin-prettier: ^3.3.1
-    foundry-vtt-types: "https://github.com/League-of-Foundry-Developers/foundry-vtt-types.git#commit=884d738b51a6cc4801ee2316eb060aafa0aff642"
+    foundry-vtt-types: "github:League-of-Foundry-Developers/foundry-vtt-types#foundry-0.7.9"
     fs-extra: ^9.1.0
     gulp: ^4.0.2
     gulp-sass: ^4.1.0
@@ -2811,7 +2811,7 @@ __metadata:
     json-stringify-pretty-compact: ^2.0.0
     lint-staged: ^10.5.4
     prettier: ^2.2.1
-    sass: ^1.32.7
+    sass: ^1.32.8
     ts-jest: ^26.5.1
     typescript: ^4.1.5
     yargs: ^16.2.0
@@ -3603,9 +3603,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"foundry-vtt-types@https://github.com/League-of-Foundry-Developers/foundry-vtt-types.git#commit=884d738b51a6cc4801ee2316eb060aafa0aff642":
+"foundry-vtt-types@github:League-of-Foundry-Developers/foundry-vtt-types#foundry-0.7.9":
   version: 0.1.0
-  resolution: "foundry-vtt-types@https://github.com/League-of-Foundry-Developers/foundry-vtt-types.git#commit=884d738b51a6cc4801ee2316eb060aafa0aff642"
+  resolution: "foundry-vtt-types@https://github.com/League-of-Foundry-Developers/foundry-vtt-types.git#commit=254bd502a8c68cb1fb4bb363a0b86a2ddd846e80"
   dependencies:
     "@types/howler": 2.2.1
     "@types/jquery": 3.5.1
@@ -3614,7 +3614,7 @@ __metadata:
     pixi.js: 5.3.4
     tinymce: 5.6.2
     typescript: ^4.1.4
-  checksum: dec3800ff6f8824e59db77356b91fbc99a69ca155893be6c3ae95ee00cd5533710040f5342ca08e17eba27cfd823ba689dcb62bed96166c6f7083fa5e0185581
+  checksum: a2d88ed8b75ed10bd7b42d1da76bbeca8e4494db09265c71cbd36918230c9603bbdb1649dca14bdcab8b5c5613f426087b04f5210d45bf4728cf8ebdbcdd36e8
   languageName: node
   linkType: hard
 
@@ -7454,14 +7454,14 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"sass@npm:^1.32.7":
-  version: 1.32.7
-  resolution: "sass@npm:1.32.7"
+"sass@npm:^1.32.8":
+  version: 1.32.8
+  resolution: "sass@npm:1.32.8"
   dependencies:
     chokidar: ">=2.0.0 <4.0.0"
   bin:
     sass: sass.js
-  checksum: 92c785120b1e9c4a6e7591ca323876bb40dbade8ebfafac0c353ea665bb3c421585788bc6233e9efe649a20c3a607b84ee95f81f7cadfadf3a8cc005ec9c9653
+  checksum: d319b3d7459451b6532b492984e3cbb37381e6c6379622f668900b196c0d545f5a2c32819cf02b5405fb2ef79720fe1f8f16b7614a2fef3fb7af8dfec83a6597
   languageName: node
   linkType: hard