164 changed files with 711 additions and 4616 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,13 +2,8 @@ node_modules/
 *.tmp
 *.bak.*
 references.txt
-references/
-/.*/
-!/.vscode/
-!/.github/
-/*.ref.*
-*.lock
-*.zip
+.styles/
+/foundry.js

 # Ignore all of the binaries and stuff that gets built for Foundry from the raw
 # JSON data because it's annoying seeing it in my git changes when it isn't actually
--- a/.vscode/components.html-data.json
+++ b/.vscode/components.html-data.json
@ -1,27 +0,0 @@
-{
-	"version": 1.1,
-	"tags": [
-		{
-			"name": "dd-incrementer",
-			"description": "A number input that allows more flexible increase/decrease buttons",
-			"attributes": [
-				{ "name": "value", "description": "The initial value to put in the input" },
-				{ "name": "name", "description": "The form name to use when this input is used to submit data" },
-				{ "name": "min", "description": "The minimum value that this input can contain" },
-				{ "name": "max", "description": "The maximum value that this input can contain" },
-				{ "name": "smallStep", "description": "The value that the input is changed by when clicking a delta button or using the up/down arrow key" },
-				{ "name": "largeStep", "description": "The value that the input is changed by when clicking a delta button with control held or using the page up/ page down arrow key" }
-			]
-		},
-		{
-			"name": "dd-icon",
-			"description": "Loads an icon asynchronously, caching the result for future uses",
-			"attributes": [
-				{ "name": "name", "description": "The name of the icon, this is relative to the assets folder of the dotdungeon system" },
-				{ "name": "path", "description": "The full path of the icon, this will only be used if `name` isn't provided or fails to fetch." }
-			]
-		}
-	],
-	"globalAttributes": [],
-	"valueSets": []
-}
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -1,19 +1,11 @@
 {
 	"files.autoSave": "onWindowChange",
 	"editor.tabSize": 2,
+	"[javascript]": {
+		"editor.tabSize": 4
+	},
 	"[yaml,yml]": {
 		"editor.insertSpaces": true,
 		"editor.tabSize": 2
-	},
-	"git.branchProtection": [],
-	"files.exclude": {
-		"dotdungeon.lock": true,
-		".styles": true,
-		"node_modules": true,
-		"packs": true,
-		".gitattributes": true,
-	},
-	"html.customData": [
-		"./.vscode/components.html-data.json"
-	]
-}
+	}
+}
--- a/assets/caret-right.svg
+++ b/assets/caret-right.svg
@ -0,0 +1,3 @@
+<svg width="100%" height="100%" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" fill="currentColor">
+ <path d="m82.137 50.016c-0.003907 2.6133-1.1172 5.1055-3.0664 6.8477l-44.16 40.445c-1.8984 1.75-4.3867 2.7227-6.9688 2.7266-1.4727 0-2.9297-0.30859-4.2773-0.90234-3.5078-1.4531-5.7969-4.875-5.8008-8.668v-80.93c0.019531-3.7812 2.3047-7.1875 5.8008-8.6367 3.7734-1.6836 8.1836-0.98047 11.246 1.793l44.172 40.457c1.9492 1.75 3.0625 4.25 3.0547 6.8672z"/>
+</svg>
--- a/assets/chat-bubble.svg
+++ b/assets/chat-bubble.svg
@ -0,0 +1,3 @@
+<svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" fill="currentColor">
+  <path d="M 61.24 9 L 42.776 9 C 21.393 9 4.095 26.336 4.095 47.679 C 2.013 74.103 34.856 91.236 48.486 97.153 C 51.236 98.362 54.278 96.319 54.278 93.319 L 54.278 84.775 C 54.278 82.482 56.154 80.606 58.447 80.606 L 61.197 80.606 C 80.995 80.606 97 64.561 97 44.804 C 97 25.046 80.954 9 61.197 9 L 61.24 9 Z M 32.854 54.389 C 29.813 54.389 27.354 51.93 27.354 48.888 C 27.354 45.844 29.813 43.388 32.854 43.388 C 35.899 43.388 38.358 45.844 38.358 48.888 C 38.358 51.93 35.899 54.389 32.854 54.389 Z M 50.527 54.389 C 47.486 54.389 45.025 51.93 45.025 48.888 C 45.025 45.844 47.486 43.388 50.527 43.388 C 53.571 43.388 56.03 45.844 56.03 48.888 C 56.03 51.93 53.571 54.389 50.527 54.389 Z M 68.202 54.389 C 65.158 54.389 62.697 51.93 62.697 48.888 C 62.697 45.844 65.158 43.388 68.202 43.388 C 71.242 43.388 73.703 45.844 73.703 48.888 C 73.703 51.93 71.242 54.389 68.202 54.389 Z"/>
+</svg>
--- a/assets/close.svg
+++ b/assets/close.svg
@ -0,0 +1,3 @@
+<svg width="100%" height="100%" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+ <path d="m96.293 83.457c3.543 3.5469 3.543 9.2891 0 12.836-3.5469 3.543-9.2891 3.543-12.836 0l-31.992-31.992c-0.80859-0.8125-2.1211-0.8125-2.9297 0l-31.992 31.992c-3.5469 3.543-9.2891 3.543-12.836 0-3.543-3.5469-3.543-9.2891 0-12.836l31.992-31.988c0.8125-0.8125 0.8125-2.125 0-2.9336l-31.992-31.992c-3.543-3.5469-3.543-9.2891 0-12.836 3.5469-3.543 9.2891-3.543 12.836 0l31.992 31.996c0.80859 0.80859 2.1211 0.80859 2.9297 0l31.992-31.996c3.5469-3.543 9.2891-3.543 12.836 0 3.543 3.5469 3.543 9.2891 0 12.836l-31.992 31.992c-0.8125 0.80859-0.8125 2.1211 0 2.9336z"/>
+</svg>
--- a/assets/ui/plus.svg
+++ b/assets/ui/plus.svg
--- a/assets/dice/d10.svg
+++ b/assets/dice/d10.svg
@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M52.348 11.457a3.021 3.021 0 0 0-3.84 0l-36.53 30.484a3.005 3.005 0 0 0-1.079 2.3v10.95c0 .879.39 1.719 1.059 2.289l36.535 31.043a3.01 3.01 0 0 0 3.883 0L89.118 57.48a3.02 3.02 0 0 0 1.058-2.29l-.004-10.94c0-.89-.398-1.739-1.078-2.309zm31.824 39.934-15.445-3.93-10.316-23.188L84.184 45.66zm-33.73 3.52-12.258-6.29 12.258-27.496L62.7 48.621zm-16.508-1.723 13.508 6.93v19.636L20.266 56.668zm19.504 6.93 13.508-6.93 13.797 3.52-27.305 23.065zM42.442 24.343 32.145 47.45 16.899 51.34v-5.68z"/></svg>
+<svg width="100%" height="100%" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+ <path d="m52.348 11.457c-1.1094-0.91797-2.7305-0.91797-3.8398 0l-36.531 30.484c-0.67969 0.57031-1.0781 1.4102-1.0781 2.3008v10.949c0 0.87891 0.39062 1.7188 1.0586 2.2891l36.535 31.043c0.55859 0.48047 1.25 0.71094 1.9414 0.71094s1.3789-0.23828 1.9414-0.71094l36.742-31.043c0.66797-0.57031 1.0586-1.4102 1.0586-2.2891l-0.003906-10.941c0-0.89062-0.39844-1.7383-1.0781-2.3086zm31.824 39.934-15.445-3.9297-10.316-23.188 25.773 21.387zm-33.73 3.5195-12.258-6.2891 12.258-27.496 12.258 27.496zm-16.508-1.7227 13.508 6.9297v19.637l-27.176-23.086zm19.504 6.9297 13.508-6.9297 13.797 3.5195-27.305 23.066zm-10.996-35.773-10.297 23.105-15.246 3.8906v-5.6797z"/>
+</svg>
--- a/assets/dice/d12.svg
+++ b/assets/dice/d12.svg
@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M85.484 37.672 73.066 20.574a3.024 3.024 0 0 0-1.5-1.09l-20.098-6.527c-.602-.2-1.25-.2-1.852 0l-20.098 6.527c-.601.2-1.128.578-1.5 1.09L15.596 37.672a2.998 2.998 0 0 0-.57 1.758v21.125c0 .629.2 1.25.57 1.758L28.014 79.41c.371.511.899.89 1.5 1.09l20.098 6.527a2.988 2.988 0 0 0 1.86 0L71.57 80.5a3.024 3.024 0 0 0 1.5-1.09l12.414-17.093c.37-.512.57-1.13.57-1.758V39.434c0-.633-.203-1.25-.57-1.762zm-7.059.492-9.34 4.008L53.54 30.875v-10.93l15.238 4.95zM59.59 63.957H41.491l-5.59-17.207L50.54 36.113 65.176 46.75zM32.292 24.895l15.238-4.949v10.938L31.991 42.173l-9.34-4.008zM21.026 59.59V43.992l8.918 3.828 6.008 18.484-5.347 6.457zm29.512 21.445-14.969-4.86 5.149-6.218h19.625l5.148 6.219zm19.938-8.27L65.13 66.31l6.007-18.484 8.919-3.828v15.598z"/></svg>
+<svg width="100%" height="100%" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+ <path d="m85.484 37.672-12.418-17.098c-0.37109-0.51172-0.89844-0.89062-1.5-1.0898l-20.098-6.5273c-0.60156-0.19922-1.25-0.19922-1.8516 0l-20.098 6.5273c-0.60156 0.19922-1.1289 0.57812-1.5 1.0898l-12.422 17.098c-0.37109 0.51172-0.57031 1.1289-0.57031 1.7578v21.125c0 0.62891 0.19922 1.25 0.57031 1.7578l12.418 17.098c0.37109 0.51172 0.89844 0.89062 1.5 1.0898l20.098 6.5273c0.30078 0.10156 0.60938 0.14844 0.92969 0.14844 0.32031 0 0.62891-0.050781 0.92969-0.14844l20.098-6.5273c0.60156-0.19922 1.1289-0.57812 1.5-1.0898l12.414-17.094c0.37109-0.51172 0.57031-1.1289 0.57031-1.7578v-21.125c0-0.63281-0.20313-1.25-0.57031-1.7617zm-7.0586 0.49219-9.3398 4.0078-15.547-11.297v-10.93l15.238 4.9492zm-18.836 25.793h-18.098l-5.5898-17.207 14.637-10.637 14.637 10.637zm-27.297-39.062 15.238-4.9492v10.938l-15.539 11.289-9.3398-4.0078zm-11.266 34.695v-15.598l8.918 3.8281 6.0078 18.484-5.3477 6.457zm29.512 21.445-14.969-4.8594 5.1484-6.2188h19.625l5.1484 6.2188zm19.938-8.2695-5.3477-6.457 6.0078-18.484 8.918-3.8281v15.598z"/>
+</svg>
--- a/assets/dice/d20.svg
+++ b/assets/dice/d20.svg
@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M82.172 32.355c-.02-.148-.031-.3-.07-.441-.04-.13-.102-.239-.149-.372-.039-.109-.07-.218-.129-.32-.011-.012-.02-.02-.02-.031-.07-.11-.16-.211-.237-.32-.079-.102-.149-.211-.239-.301-.078-.078-.18-.14-.27-.211-.109-.09-.218-.192-.35-.262a.113.113 0 0 1-.04-.031L51.356 13.87a2.985 2.985 0 0 0-3 .059L19.68 31.227c-.02.011-.031.03-.05.039-.122.07-.22.171-.329.261-.09.078-.191.149-.281.239-.078.09-.148.199-.219.289-.078.109-.172.218-.23.34a.113.113 0 0 1-.032.039c-.05.101-.07.199-.101.3-.05.13-.11.25-.14.391s-.04.281-.051.418c-.012.101-.04.2-.04.309l.63 33.484c.019 1.07.609 2.05 1.55 2.57L49.72 86.113c.45.25.95.37 1.45.37.538 0 1.07-.14 1.55-.429L81.403 68.77a2.994 2.994 0 0 0 1.45-2.629l-.63-33.484c0-.101-.039-.203-.05-.3zM60.246 60.007l-8.879 15.816-9.469-15.477zm-18.926-6.2 8.879-15.815 9.469 15.477zm-5.36-2.706-9.437-14.605 18.258-1.11zm29.306.027-9.758-15.945 18.617.418zM53.05 29.124l-.09-7.488 14.129 7.808zm-6 .11-13.828.84 13.746-8.29zM32.08 56.148l-7.34 5.34-.327-17.196zm3.29 5.019 9.386 15.348-17.336-9.578zm31.105-.012 7.707 4.961-15.848 9.547zm2.96-5.238 6.989-12.258.32 16.965z"/></svg>
+<svg width="100%" height="100%" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+ <path d="m82.172 32.355c-0.019531-0.14844-0.03125-0.30078-0.070313-0.44141-0.039062-0.12891-0.10156-0.23828-0.14844-0.37109-0.039063-0.10938-0.070313-0.21875-0.12891-0.32031-0.011719-0.011718-0.019531-0.019531-0.019531-0.03125-0.070313-0.10938-0.16016-0.21094-0.23828-0.32031-0.078125-0.10156-0.14844-0.21094-0.23828-0.30078-0.078125-0.078124-0.17969-0.14062-0.26953-0.21094-0.10938-0.089844-0.21875-0.19141-0.35156-0.26172-0.019531-0.011718-0.03125-0.019531-0.039062-0.03125l-29.312-16.195c-0.94141-0.51953-2.0781-0.5-3 0.058594l-28.676 17.297c-0.019532 0.011719-0.03125 0.03125-0.050782 0.039063-0.12109 0.070313-0.21875 0.17188-0.32812 0.26172-0.089843 0.078125-0.19141 0.14844-0.28125 0.23828-0.078125 0.089844-0.14844 0.19922-0.21875 0.28906-0.078125 0.10937-0.17188 0.21875-0.23047 0.33984-0.011718 0.019531-0.019531 0.03125-0.03125 0.039063-0.050781 0.10156-0.070312 0.19922-0.10156 0.30078-0.050781 0.12891-0.10938 0.25-0.14062 0.39062s-0.039063 0.28125-0.050781 0.41797c-0.011719 0.10156-0.039063 0.19922-0.039063 0.30859l0.62891 33.484c0.019531 1.0703 0.60937 2.0508 1.5508 2.5703l29.332 16.207c0.44922 0.25 0.94922 0.37109 1.4492 0.37109 0.53906 0 1.0703-0.14062 1.5508-0.42969l28.684-17.285c0.91797-0.55078 1.4688-1.5508 1.4492-2.6289l-0.62891-33.484c0-0.10156-0.039062-0.20312-0.050781-0.30078zm-21.926 27.652-8.8789 15.816-9.4688-15.477zm-18.926-6.1992 8.8789-15.816 9.4688 15.477zm-5.3594-2.707-9.4375-14.605 18.258-1.1094zm29.305 0.027344-9.7578-15.945 18.617 0.41797zm-12.215-22.004-0.089843-7.4883 14.129 7.8086zm-6 0.10938-13.828 0.83984 13.746-8.2891zm-14.969 26.914-7.3398 5.3398-0.32813-17.195zm3.2891 5.0195 9.3867 15.348-17.336-9.5781zm31.105-0.011719 7.707 4.9609-15.848 9.5469zm2.9609-5.2383 6.9883-12.258 0.32031 16.965z"/>
+</svg>
--- a/assets/dice/d4.svg
+++ b/assets/dice/d4.svg
@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M52.91 11.938a3.005 3.005 0 0 0-4.758 0L10.38 60.887a2.993 2.993 0 0 0-.578 2.371c.149.828.649 1.57 1.371 2.008l37.781 23.516a3.028 3.028 0 0 0 3.18 0l37.78-23.516a3.02 3.02 0 0 0 1.372-2.008 3.03 3.03 0 0 0-.578-2.371zm-5.371 10.629v58.277L17.156 61.926zm6 58.266V22.567L83.922 61.93z"/></svg>
+<svg width="100%" height="100%" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+ <path d="m52.91 11.938c-0.57031-0.73828-1.4492-1.168-2.3789-1.168s-1.8086 0.42969-2.3789 1.168l-37.773 48.949c-0.51953 0.66797-0.73047 1.5312-0.57812 2.3711 0.14844 0.82813 0.64844 1.5703 1.3711 2.0078l37.781 23.516c0.48828 0.30078 1.0391 0.44922 1.5898 0.44922s1.1016-0.14844 1.5898-0.44922l37.781-23.516c0.71875-0.44922 1.2188-1.1797 1.3711-2.0078 0.14844-0.82812-0.058594-1.6914-0.57812-2.3711zm-5.3711 10.629v58.277l-30.383-18.918zm6 58.266v-58.266l30.383 39.363z"/>
+</svg>
--- a/assets/dice/d6.svg
+++ b/assets/dice/d6.svg
@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M83.664 28.203 51.711 14.676c-.75-.32-1.59-.32-2.34 0L17.418 28.203a3.006 3.006 0 0 0-1.828 2.738v37.622c0 1.191.711 2.27 1.8 2.75l31.954 13.996c.379.172.789.25 1.2.25.41 0 .82-.078 1.198-.25l31.953-13.996a3.012 3.012 0 0 0 1.801-2.75l-.004-37.598v-.02a3 3 0 0 0-1.828-2.742zm-33.125-7.508 24.375 10.316-24.375 10.68-24.375-10.676zm-28.965 14.86L47.539 46.92v31.055l-25.965-11.37zm31.965 42.417v-31.05l25.953-11.368V66.61z"/></svg>
+<svg width="100%" height="100%" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+ <path d="m83.664 28.203-31.953-13.527c-0.75-0.32031-1.5898-0.32031-2.3398 0l-31.953 13.527c-1.1016 0.46875-1.8203 1.5508-1.8281 2.7383v0.019532 37.602c0 1.1914 0.71094 2.2695 1.8008 2.75l31.953 13.996c0.37891 0.17188 0.78906 0.25 1.1992 0.25 0.41016 0 0.82031-0.078125 1.1992-0.25l31.953-13.996c1.0898-0.48047 1.8008-1.5586 1.8008-2.75l-0.003906-37.598v-0.019532c-0.007813-1.1914-0.71875-2.2695-1.8281-2.7422zm-33.125-7.5078 24.375 10.316-24.375 10.68-24.375-10.676zm-28.965 14.859 25.965 11.367v31.055l-25.965-11.371zm31.965 42.418v-31.051l25.953-11.367v31.055z"/>
+</svg>
--- a/assets/dice/d8.svg
+++ b/assets/dice/d8.svg
@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M80.785 31.625 52.738 14.676a3.004 3.004 0 0 0-3-.059l-28.691 15.81a2.999 2.999 0 0 0-1.55 2.57l-.65 32.762a3.013 3.013 0 0 0 1.45 2.629L48.34 85.333c.48.289 1.012.43 1.55.43.5 0 1-.122 1.45-.372l28.695-15.816a2.999 2.999 0 0 0 1.55-2.57l.65-32.762a2.98 2.98 0 0 0-1.45-2.617zm-4.969 23.793L58.66 25.254l17.535 10.598zm-2.41 7.91-45.199-.449 22.566-39.363zM42.863 25.254 25.035 56.348l.43-21.504zm7.086 54.04L32.785 68.925l35.352.352z"/></svg>
+<svg width="100%" height="100%" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+ <path d="m80.785 31.625-28.047-16.949c-0.91797-0.55078-2.0586-0.57812-3-0.058593l-28.691 15.809c-0.94141 0.51953-1.5312 1.5-1.5508 2.5703l-0.64844 32.762c-0.019531 1.0703 0.53125 2.0703 1.4492 2.6289l28.043 16.945c0.48047 0.28906 1.0117 0.42969 1.5508 0.42969 0.5 0 1-0.12109 1.4492-0.37109l28.695-15.816c0.94141-0.51953 1.5312-1.5 1.5508-2.5703l0.64844-32.762c0.019531-1.0703-0.53125-2.0703-1.4492-2.6172zm-4.9688 23.793-17.156-30.164 17.535 10.598zm-2.4102 7.9102-45.199-0.44922 22.566-39.363zm-30.543-38.074-17.828 31.094 0.42969-21.504zm7.0859 54.039-17.164-10.367 35.352 0.35156z"/>
+</svg>
--- a/assets/edit.svg
+++ b/assets/edit.svg
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg fill="currentColor" width="100%" height="100%" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+ <g>
+  <path d="m67.5 12.801c-3.1992-3.1992-8.3984-3.1992-11.602 0l-38.797 38.801c-2.3008 2.3008-2.3008 6.1016 0 8.3984l21.5 21.5c2.3008 2.3008 6.1016 2.3008 8.3984 0l38.801-38.801c3.1992-3.1992 3.1992-8.3984 0-11.602z"/>
+  <path d="m18.602 88.102h0.19922l10.301-0.30078c3.1016-0.10156 4.6016-3.8984 2.3984-6.1016l-14.699-14.699c-2.1992-2.1992-6-0.69922-6.1016 2.3984l-0.30078 10.301c-0.10156 2.3008 0.80078 4.5 2.3984 6.1016 1.5039 1.5 3.6016 2.3008 5.8047 2.3008z"/>
+ </g>
+</svg>
--- a/assets/garbage-bin.svg
+++ b/assets/garbage-bin.svg
@ -0,0 +1,6 @@
+<svg width="100%" height="100%" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" fill="currentColor">
+ <g>
+  <path d="m82.199 25.301h-64.398c-1.3008 0-2.3008 1.1016-2.1992 2.3984l7.5 62.398c0.5 4.1992 4.1016 7.3984 8.3984 7.3984h37c4.3008 0 7.8984-3.1992 8.3984-7.3984l7.5-62.398c0.10156-1.3008-0.89844-2.3984-2.1992-2.3984zm-45.301 57.699h-0.19922c-1.1992 0-2.1992-0.89844-2.3008-2.1016l-4.1016-38.699c-0.10156-1.3008 0.80078-2.3984 2.1016-2.5 1.3008-0.10156 2.3984 0.80078 2.5 2.1016l4.1016 38.699c0.10156 1.3008-0.80078 2.3984-2.1016 2.5zm15.402-2.3008c0 1.3008-1 2.3008-2.3008 2.3008s-2.3008-1-2.3008-2.3008v-38.699c0-1.3008 1-2.3008 2.3008-2.3008s2.3008 1 2.3008 2.3008zm13.301 0.30078c-0.10156 1.1992-1.1016 2.1016-2.3008 2.1016h-0.19922c-1.3008-0.10156-2.1992-1.3008-2.1016-2.5l4.1016-38.699c0.10156-1.3008 1.3008-2.1992 2.5-2.1016 1.3008 0.10156 2.1992 1.3008 2.1016 2.5z"/>
+  <path d="m86.602 10.801h-19.301l-4.6016-6.3984c-0.80078-1.1992-2.1992-1.8984-3.6992-1.8984l-18-0.003906c-1.5 0-2.8008 0.69922-3.6992 1.8984l-4.6016 6.3984-19.301 0.003906c-2.3984 0-4.3008 1.8984-4.3008 4.3008 0 2.3984 1.8984 4.3008 4.3008 4.3008h73.199c2.3984 0 4.3008-1.8984 4.3008-4.3008 0-2.4023-1.8984-4.3008-4.2969-4.3008z"/>
+ </g>
+</svg>
--- a/assets/minus.svg
+++ b/assets/minus.svg
@ -0,0 +1,3 @@
+<svg width="100%" height="100%" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" fill="currentColor">
+ <path d="m12.633 38.727h74.734c6.2578 0 11.336 6.2266 11.336 11.273 0 6.2266-5.0742 11.273-11.336 11.273h-74.734c-6.2578 0-11.336-6.2266-11.336-11.273 0-6.2266 5.0742-11.273 11.336-11.273z" fill-rule="evenodd"/>
+</svg>
--- a/assets/sheet.svg
+++ b/assets/sheet.svg
@ -0,0 +1,8 @@
+<svg height="100%" width="100%" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1.0666639804840088, 0, 0, 1.0666639804840088, -4.5322370529174805, -4.2468461990356445)">
+    <path d="m16.086 76.617c0 1.3672 1.1133 2.4805 2.4805 2.4805h49.793c1.3672 0 2.4805-1.1133 2.4805-2.4805v-66.324c0-1.3672-1.1133-2.4805-2.4805-2.4805h-35.352v12.695c0 2.2812-1.8555 4.1328-4.1367 4.1328l-12.785 0.003906zm7.6328-48.016h39.492c0.45703 0 0.82812 0.36719 0.82812 0.82813 0 0.46094-0.36719 0.82812-0.82812 0.82812h-39.492c-0.45703 0-0.82812-0.36719-0.82812-0.82812 0-0.46094 0.37109-0.82813 0.82812-0.82813zm0 10.609h39.492c0.45703 0 0.82812 0.36719 0.82812 0.82812 0 0.46094-0.36719 0.82813-0.82812 0.82813h-39.492c-0.45703 0-0.82812-0.36719-0.82812-0.82813 0-0.45703 0.37109-0.82812 0.82812-0.82812zm0 10.617h39.492c0.45703 0 0.82812 0.36719 0.82812 0.82812s-0.36719 0.82812-0.82812 0.82812h-39.492c-0.45703 0-0.82812-0.36719-0.82812-0.82812s0.37109-0.82812 0.82812-0.82812zm0 10.613h39.492c0.45703 0 0.82812 0.36719 0.82812 0.82812 0 0.46094-0.36719 0.82812-0.82812 0.82812h-39.492c-0.45703 0-0.82812-0.36719-0.82812-0.82812 0-0.46094 0.37109-0.82812 0.82812-0.82812z"/>
+    <path d="m74.898 14.355h-2.3984v62.258c0 2.2812-1.8555 4.1328-4.1328 4.1328h-45.746v2.4102c0 1.3672 1.1133 2.4805 2.4805 2.4805h49.793c1.3672 0 2.4805-1.1133 2.4805-2.4805l0.003906-66.32c0-1.3633-1.1133-2.4805-2.4805-2.4805z"/>
+    <path d="m31.352 20.508v-11.531l-14.09 14.016h11.609c1.3711 0 2.4805-1.1172 2.4805-2.4844z"/>
+    <path d="m29.16 87.297v2.4102c0 1.3672 1.1133 2.4805 2.4805 2.4805h49.793c1.3672 0 2.4805-1.1133 2.4805-2.4805v-66.324c0-1.3672-1.1133-2.4805-2.4805-2.4805h-2.3984v62.258c0 2.2812-1.8555 4.1328-4.1328 4.1328h-45.742z"/>
+  </g>
+</svg>
--- a/assets/sources.txt
+++ b/assets/sources.txt
@ -1,15 +1,11 @@
-Disclaimer:
-	All icons included in this repo have been scaled and optimized as needed.
-
 Amer Alamer
-	ui/caret/right.svg (https://thenounproject.com/icon/arrow-caret-right-1143917/)
-	ui/caret/down.svg (https://thenounproject.com/icon/arrow-caret-down-1143911/)
+	caret-right.svg (https://thenounproject.com/icon/arrow-caret-right-1143917/)

 Alice Design:
-	ui/garbage-bin.svg (https://thenounproject.com/icon/garbage-2025492/)
+	garbage-bin.svg (https://thenounproject.com/icon/garbage-2025492/)

 zapesicon:
-	ui/chat-bubble.svg (https://thenounproject.com/icon/chat-6423186/)
+	chat-bubble.svg (https://thenounproject.com/icon/chat-6423186/)

 Fritz Duggan:
 	dice/d4.svg (https://thenounproject.com/icon/d4-4570604/)
@ -20,19 +16,21 @@ Fritz Duggan:
 	dice/d20.svg (https://thenounproject.com/icon/d20-4570607/)

 Landan Lloyd:
-	ui/plus.svg (https://thenounproject.com/icon/create-1447560/)
+	create.svg (https://thenounproject.com/icon/create-1447560/)

 Bismillah
-	ui/minus.svg (https://thenounproject.com/icon/minus-1727966/)
+	minus.svg (https://thenounproject.com/icon/minus-1727966/)

 Rokhman Kharis:
-	ui/close.svg (https://thenounproject.com/icon/close-4996834/)
+	close.svg (https://thenounproject.com/icon/close-4996834/)

 Athok:
-	ui/sheet.svg (https://thenounproject.com/icon/sheet-5939348/)
+	sheet.svg (https://thenounproject.com/icon/sheet-5939348/)

 Icon Depot:
-	ui/pencil.svg (https://thenounproject.com/icon/edit-1489252/)
+	edit.svg (https://thenounproject.com/icon/edit-1489252/)

-Muhammad Ahsanu Nadia:
-	ui/help.svg (https://thenounproject.com/icon/help-6778522/)
+Oliver Akins:
+	chat-bubble.svg : Scaling
+	create.svg : Scaling, Optimization
+	sheet.svg : Scaling
--- a/assets/ui/caret/down.svg
+++ b/assets/ui/caret/down.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 100 100"><path d="M50.016 82.137a9.195 9.195 0 0 1-6.844-3.066L2.692 34.91a10.286 10.286 0 0 1-2.691-6.97c0-1.472.304-2.929.898-4.276a9.404 9.404 0 0 1 8.637-5.801h80.93a9.404 9.404 0 0 1 8.637 5.8A10.424 10.424 0 0 1 97.31 34.91L56.853 79.082a9.201 9.201 0 0 1-6.836 3.055z"/></svg>
--- a/assets/ui/caret/right.svg
+++ b/assets/ui/caret/right.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 100 100"><path d="M82.137 50.016a9.203 9.203 0 0 1-3.066 6.848L34.91 97.309a10.306 10.306 0 0 1-6.97 2.726c-1.472 0-2.929-.308-4.276-.902a9.396 9.396 0 0 1-5.801-8.668V9.535a9.404 9.404 0 0 1 5.8-8.637A10.424 10.424 0 0 1 34.91 2.691l44.172 40.457a9.198 9.198 0 0 1 3.055 6.867z"/></svg>
--- a/assets/ui/chat-bubble.svg
+++ b/assets/ui/chat-bubble.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 100 100"><path d="M61.24 9H42.776C21.393 9 4.095 26.336 4.095 47.679 2.013 74.103 34.856 91.236 48.486 97.153c2.75 1.209 5.792-.834 5.792-3.834v-8.544a4.181 4.181 0 0 1 4.169-4.169h2.75C80.995 80.606 97 64.561 97 44.804 97 25.046 80.954 9 61.197 9h.043ZM32.854 54.389a5.496 5.496 0 0 1-5.5-5.501c0-3.044 2.459-5.5 5.5-5.5a5.495 5.495 0 0 1 5.504 5.5 5.497 5.497 0 0 1-5.504 5.501Zm17.673 0a5.498 5.498 0 0 1-5.502-5.501c0-3.044 2.461-5.5 5.502-5.5a5.494 5.494 0 0 1 5.503 5.5 5.496 5.496 0 0 1-5.503 5.501Zm17.675 0a5.498 5.498 0 0 1-5.505-5.501c0-3.044 2.461-5.5 5.505-5.5a5.495 5.495 0 0 1 5.501 5.5 5.497 5.497 0 0 1-5.501 5.501Z"/></svg>
--- a/assets/ui/close.svg
+++ b/assets/ui/close.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M96.293 83.457a9.08 9.08 0 0 1 0 12.836 9.08 9.08 0 0 1-12.836 0L51.465 64.301a2.065 2.065 0 0 0-2.93 0L16.543 96.293a9.08 9.08 0 0 1-12.836 0 9.08 9.08 0 0 1 0-12.836L35.7 51.469a2.07 2.07 0 0 0 0-2.934L3.707 16.543a9.08 9.08 0 0 1 0-12.836 9.08 9.08 0 0 1 12.836 0l31.992 31.996a2.072 2.072 0 0 0 2.93 0L83.457 3.707a9.08 9.08 0 0 1 12.836 0 9.08 9.08 0 0 1 0 12.836L64.301 48.535a2.07 2.07 0 0 0 0 2.934z"/></svg>
--- a/assets/ui/garbage-bin.svg
+++ b/assets/ui/garbage-bin.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 100 100"><path d="M82.199 25.301H17.801c-1.3 0-2.3 1.102-2.2 2.398l7.5 62.398c.5 4.2 4.102 7.399 8.4 7.399h37c4.3 0 7.898-3.2 8.398-7.399l7.5-62.398a2.204 2.204 0 0 0-2.2-2.398zM36.898 83h-.2c-1.198 0-2.198-.898-2.3-2.102L30.296 42.2c-.101-1.3.801-2.398 2.102-2.5 1.3-.101 2.398.801 2.5 2.102L39 80.5c.101 1.3-.801 2.398-2.102 2.5zM52.3 80.7c0 1.3-1 2.3-2.3 2.3s-2.302-1-2.302-2.3V42c0-1.3 1-2.3 2.301-2.3s2.301 1 2.301 2.3zm13.301.3a2.296 2.296 0 0 1-2.3 2.102h-.2c-1.3-.102-2.2-1.301-2.102-2.5l4.102-38.7c.102-1.3 1.3-2.199 2.5-2.101 1.3.102 2.2 1.3 2.102 2.5zM86.602 10.801H67.301l-4.602-6.398C61.9 3.203 60.5 2.504 59 2.504L41 2.5c-1.5 0-2.8.7-3.699 1.899l-4.602 6.398-19.3.004a4.269 4.269 0 0 0-4.301 4.3c0 2.4 1.898 4.302 4.3 4.302h73.2c2.398 0 4.3-1.899 4.3-4.301S89 10.8 86.601 10.8z"/></svg>
--- a/assets/ui/help.svg
+++ b/assets/ui/help.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M50 9.375a40.635 40.635 0 0 0-28.727 11.898 40.63 40.63 0 0 0 0 57.454 40.63 40.63 0 0 0 57.454 0A40.63 40.63 0 0 0 90.625 50a40.658 40.658 0 0 0-11.914-28.711A40.66 40.66 0 0 0 50 9.375zm0 75a34.39 34.39 0 0 1-24.309-10.066 34.386 34.386 0 0 1 0-48.618 34.386 34.386 0 0 1 48.618 0A34.386 34.386 0 0 1 84.375 50a34.407 34.407 0 0 1-10.082 24.293A34.41 34.41 0 0 1 50 84.375z"/><path d="M50 25a15.641 15.641 0 0 0-15.625 15.625v3.125a3.124 3.124 0 1 0 6.25 0v-3.125c0-5.176 4.2-9.375 9.375-9.375s9.375 4.2 9.375 9.375v.457a6.217 6.217 0 0 1-3.438 5.59l-2.136 1.066a12.432 12.432 0 0 0-6.926 11.18v6.707a3.124 3.124 0 1 0 6.25 0v-6.707a6.223 6.223 0 0 1 3.453-5.59l2.137-1.066a12.434 12.434 0 0 0 6.91-11.18v-.457A15.641 15.641 0 0 0 50 25zM53.125 75c0 4.168-6.25 4.168-6.25 0s6.25-4.168 6.25 0"/></svg>
--- a/assets/ui/minus.svg
+++ b/assets/ui/minus.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 100 100"><path fill-rule="evenodd" d="M12.633 38.727h74.734c6.258 0 11.336 6.227 11.336 11.273 0 6.227-5.074 11.273-11.336 11.273H12.633C6.375 61.273 1.297 55.046 1.297 50c0-6.227 5.074-11.273 11.336-11.273z"/></svg>
--- a/assets/ui/pencil.svg
+++ b/assets/ui/pencil.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 100 100"><path d="M67.5 12.801c-3.2-3.2-8.398-3.2-11.602 0L17.101 51.602c-2.3 2.3-2.3 6.102 0 8.398l21.5 21.5c2.3 2.301 6.102 2.301 8.398 0L85.8 42.7c3.2-3.2 3.2-8.399 0-11.603zM18.602 88.102h.2l10.3-.3c3.102-.102 4.602-3.9 2.399-6.102L16.8 67c-2.199-2.199-6-.699-6.101 2.399L10.4 79.7c-.102 2.3.8 4.5 2.398 6.102 1.504 1.5 3.601 2.3 5.804 2.3z"/></svg>
--- a/assets/ui/sheet.svg
+++ b/assets/ui/sheet.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><path d="M12.626 77.478a2.65 2.65 0 0 0 2.646 2.646h53.112a2.65 2.65 0 0 0 2.646-2.646V6.732a2.65 2.65 0 0 0-2.646-2.646H30.676v13.542a4.414 4.414 0 0 1-4.413 4.408l-13.637.004zm8.142-51.217h42.124c.488 0 .884.391.884.883a.878.878 0 0 1-.884.883H20.768a.881.881 0 0 1-.884-.883c0-.492.396-.883.884-.883zm0 11.316h42.124c.488 0 .884.392.884.883a.878.878 0 0 1-.884.884H20.768a.884.884 0 0 1 0-1.767zm0 11.325h42.124c.488 0 .884.391.884.883s-.392.883-.884.883H20.768c-.488 0-.884-.391-.884-.883s.396-.883.884-.883zm0 11.32h42.124c.488 0 .884.392.884.884a.878.878 0 0 1-.884.883H20.768a.881.881 0 0 1-.884-.883c0-.492.396-.884.884-.884z"/><path d="M75.359 11.065H72.8v66.408a4.413 4.413 0 0 1-4.408 4.409H19.597v2.57a2.65 2.65 0 0 0 2.645 2.647h53.113A2.65 2.65 0 0 0 78 84.453l.004-70.741a2.652 2.652 0 0 0-2.646-2.646zM28.91 17.628v-12.3L13.88 20.28h12.383a2.65 2.65 0 0 0 2.646-2.65z"/><path d="M26.572 88.87v2.57a2.65 2.65 0 0 0 2.646 2.646H82.33a2.65 2.65 0 0 0 2.646-2.645V20.695a2.65 2.65 0 0 0-2.646-2.646h-2.558v66.409a4.413 4.413 0 0 1-4.409 4.408H26.572z"/></svg>
--- a/augments.d.ts
+++ b/augments.d.ts
@ -1,9 +0,0 @@
-interface Actor {
-	/** The system-specific data */
-	system: any;
-};
-
-interface Item {
-	/** The system-specific data */
-	system: any;
-};
--- a/jsconfig.json
+++ b/jsconfig.json
@ -1,7 +0,0 @@
-{
-	"compilerOptions": {
-		"types": [
-			"./augments.d.ts"
-		]
-	}
-}
--- a/langs/en-ca.2.json
+++ b/langs/en-ca.2.json
@ -1,129 +0,0 @@
-{
-	"dotdungeon": {
-		"stat": {
-			"build": "Build",
-			"meta": "Meta",
-			"presence": "Presence",
-			"hands": "Hands",
-			"tilt": "Tilt",
-			"rng": "RNG"
-		},
-		"skills": {
-			"defense": "Defense",
-			"magic": "Magic",
-			"melee": "Melee",
-			"platforming": "Platforming",
-			"strength": "Strength",
-			"alchemy": "Alchemy",
-			"arcanum": "Arcanum",
-			"dreams": "Dreams",
-			"lore": "Lore",
-			"navigation": "Navigation",
-			"animal_handling": "Animal Handling",
-			"perception": "Perception",
-			"sneak": "Sneak",
-			"speech": "Speech",
-			"vibes": "Vibes",
-			"accuracy": "Accuracy",
-			"crafting": "Crafting",
-			"engineering": "Engineering",
-			"explosives": "Explosives",
-			"piloting": "Piloting"
-		},
-		"trainingLevel": {
-			"untrained": "Untrained",
-			"trained": "Trained",
-			"expert": "Expert",
-			"locked": "Locked"
-		},
-		"die": {
-			"d4": "d4",
-			"d6": "d6",
-			"d8": "d8",
-			"d10": "d10",
-			"d12": "d12",
-			"d20": "d20"
-		},
-		"sheet": {
-			"actor": {
-				"v2": {
-					"stat-not-chosen": "Select a dice to see the {name} skills",
-					"skill-roll-locked": "@dotdungeon.trainingLevel.locked",
-					"toggle-item-information": "Toggle the item's extra information visibility",
-					"create-item": "Create @TYPES.Item.{type}"
-				}
-			},
-			"item": {
-				"untyped": {
-					"quantity": "Quantity",
-					"usage": "Usage Cost",
-					"rarity": "Tier",
-					"no-description": "This item hasn't been described yet..."
-				}
-			}
-		},
-		"rarity": {
-			"simple": "Simple",
-			"greater": "Greater",
-			"rare": "Rare",
-			"legendary": "Legendary"
-		},
-		"location": {
-			"unknown": "@dotdungeon.common.empty",
-			"inventory": "Inventory",
-			"equipped": "Equipped",
-			"storage": "Storage"
-		},
-		"default": {
-			"name": "(Unnamed @TYPES.{document}.{type})"
-		},
-		"common": {
-			"send-to-chat": "Send to Chat",
-			"edit": "Edit",
-			"delete": "Delete",
-			"reset": "Reset",
-			"empty": "---",
-			"help": "Help",
-			"gm": "Server",
-			"view-larger": "View Larger"
-		},
-		"sheet-names": {
-			"*DataSheet": "Data Sheet"
-		},
-		"help-tooltips": {
-			"calculated-capacity": {
-				"title": "What is Calculated Capacity?",
-				"content": "<p>The calculated capacity is how much space in your inventory that the item will take up, the way it is calculated is determined by the item. Usually the main thing that affects the capacity is the item's quantity, but this can be turned off by the @dotdungeon.common.gm, which means that no matter the quantity it will only use up one capacity. The @dotdungeon.common.gm can also entirely disable capacity usage which will make the used capacity always be zero.</p>"
-			}
-		},
-		"delete": {
-			"ActiveEffect": {
-				"title": "Delete Effect",
-				"content": "<p>Are you sure you would like to delete the active effect: {name}</p>"
-			}
-		}
-	},
-	"TYPES": {
-		"Actor": {
-			"player": "Player",
-			"sync": "Sync"
-		},
-		"Item": {
-			"aspect": "Aspect",
-			"weapon": "Weapon",
-			"armour": "Armour",
-			"equipment": "Equipment",
-			"foil": "Foil",
-			"pet": "Pet",
-			"structure": "Structure",
-			"service": "Service",
-			"material": "Materials",
-			"legendaryItem": "Legendary Item",
-			"spell": "Spell",
-			"untyped": "Custom"
-		},
-		"ActiveEffect": {
-			"base": "Effect"
-		}
-	}
-}
--- a/langs/en-ca.json
+++ b/langs/en-ca.json
@ -78,10 +78,7 @@
 			}
 		},
 		"sheet-names": {
-			"PlayerSheet": {
-				"MVP": "MVP PC Sheet",
-				"v2": "PC Sheet"
-			},
+			"PlayerSheet": "PC/PUG Sheet",
 			"SyncSheet": {
 				"basic": "Theme: Basic"
 			},
--- a/module/components/icon.mjs
+++ b/module/components/icon.mjs
@ -1,125 +0,0 @@
-import { StyledShadowElement } from "./mixins/Styles.mjs";
-
-/**
-Attributes:
-@property {string} name - The name of the icon, takes precedence over the path
-@property {string} path - The path of the icon file
-*/
-export class DotDungeonIcon extends StyledShadowElement(HTMLElement) {
-	static elementName = `dd-icon`;
-	static formAssociated = false;
-
-	/* Stuff for the mixin to use */
-	static _stylePath = `v3/components/icon.css`;
-
-
-	static _cache = new Map();
-	#container;
-	/** @type {null | string} */
-	_name;
-	/** @type {null | string} */
-	_path;
-
-	/* Stored IDs for all of the hooks that are in this component */
-	#svgHmr;
-
-	constructor() {
-		super();
-		// this._shadow = this.attachShadow({ mode: `open`, delegatesFocus: true });
-
-		this.#container = document.createElement(`div`);
-		this._shadow.appendChild(this.#container);
-	};
-
-	_mounted = false;
-	async connectedCallback() {
-		super.connectedCallback();
-		if (this._mounted) return;
-
-		this._name = this.getAttribute(`name`);
-		this._path = this.getAttribute(`path`);
-
-		/*
-		This converts all of the double-dash prefixed properties on the element to
-		CSS variables so that they don't all need to be provided by doing style=""
-		*/
-		for (const attrVar of this.attributes) {
-			if (attrVar.name?.startsWith(`var:`)) {
-				const prop = attrVar.name.replace(`var:`, ``);
-				this.style.setProperty(`--` + prop, attrVar.value);
-			};
-		};
-
-		/*
-		Try to retrieve the icon if it isn't present, try the path then default to
-		the slot content, as then we can have a default per-icon usage
-		*/
-		let content;
-		if (this._name) {
-			content = await this.#getIcon(`./systems/dotdungeon/assets/${this._name}.svg`);
-		};
-
-		if (this._path && !content) {
-			content = await this.#getIcon(this._path);
-		};
-
-		if (content) {
-			this.#container.appendChild(content.cloneNode(true));
-		};
-
-		/*
-		This is so that when we get an HMR event from Foundry we can appropriately
-		handle it using our logic to update the component and the icon cache.
-		*/
-		if (game.settings.get(`dotdungeon`, `devMode`)) {
-			this.#svgHmr = Hooks.on(`dd-hmr:svg`, (iconName, data) => {
-				if (this._name === iconName || this._path?.endsWith(data.path)) {
-					const svg = this.#parseSVG(data.content);
-					this.constructor._cache.set(iconName, svg);
-					this.#container.replaceChildren(svg.cloneNode(true));
-				};
-			});
-		};
-
-		this._mounted = true;
-	};
-
-	disconnectedCallback() {
-		super.disconnectedCallback();
-		if (!this._mounted) return;
-
-		Hooks.off(`dd-hmr:svg`, this.#svgHmr);
-
-		this._mounted = false;
-	};
-
-	async #getIcon(path) {
-		// Cache hit!
-		if (this.constructor._cache.has(path)) {
-			console.debug(`.dungeon | Icon ${path} cache hit`);
-			return this.constructor._cache.get(path);
-		};
-
-		const r = await fetch(path);
-		switch (r.status) {
-			case 200:
-			case 201:
-				break;
-			default:
-				console.error(`.dungeon | Failed to fetch icon: ${path}`);
-				return;
-		};
-
-		console.debug(`.dungeon | Adding icon ${path} to the cache`);
-		const svg = this.#parseSVG(await r.text());
-		this.constructor._cache.set(path, svg);
-		return svg;
-	};
-
-	/** Takes an SVG string and returns it as a DOM node */
-	#parseSVG(content) {
-		const temp = document.createElement(`div`);
-		temp.innerHTML = content;
-		return temp.querySelector(`svg`);
-	};
-};
--- a/module/components/incrementer.mjs
+++ b/module/components/incrementer.mjs
@ -1,149 +0,0 @@
-import { DotDungeonIcon } from "./icon.mjs";
-import { StyledShadowElement } from "./mixins/Styles.mjs";
-
-/**
-Attributes:
-@property {string} name - The path to the value to update
-@property {number} value - The actual value of the input
-@property {number} min - The minimum value of the input
-@property {number} max - The maximum value of the input
-@property {number?} smallStep - The step size used for the buttons and arrow keys
-@property {number?} largeStep - The step size used for the buttons + Ctrl and page up / down
-
-Styling:
- `--height`: Controls the height of the element + the width of the buttons (default: 1.25rem)
- `--width`: Controls the width of the number input (default 50px)
-*/
-export class DotDungeonIncrementer extends StyledShadowElement(HTMLElement) {
-	static elementName = `dd-incrementer`;
-	static formAssociated = true;
-
-	static _stylePath = `v3/components/incrementer.css`;
-
-	_internals;
-	#input;
-
-	_min;
-	_max;
-	_smallStep;
-	_largeStep;
-
-	constructor() {
-		super();
-
-		// Form internals
-		this._internals = this.attachInternals();
-		this._internals.role = `spinbutton`;
-	};
-
-	get form() {
-		return this._internals.form;
-	}
-
-	get name() {
-		return this.getAttribute(`name`);
-	}
-	set name(value) {
-		this.setAttribute(`name`, value);
-	}
-
-	get value() {
-		return this.getAttribute(`value`);
-	};
-	set value(value) {
-		this.setAttribute(`value`, value);
-	};
-
-	get type() {
-		return `number`;
-	}
-
-	connectedCallback() {
-		super.connectedCallback();
-		this.replaceChildren();
-
-		// Attribute parsing / registration
-		const value = this.getAttribute(`value`);
-		this._min = parseInt(this.getAttribute(`min`) ?? 0);
-		this._max = parseInt(this.getAttribute(`max`) ?? 0);
-		this._smallStep = parseInt(this.getAttribute(`smallStep`) ?? 1);
-		this._largeStep = parseInt(this.getAttribute(`largeStep`) ?? 5);
-
-		this._internals.ariaValueMin = this._min;
-		this._internals.ariaValueMax = this._max;
-
-		const container = document.createElement(`div`);
-
-		// The input that the user can see / modify
-		const input = document.createElement(`input`);
-		this.#input = input;
-		input.type = `number`;
-		input.ariaHidden = true;
-		input.min = this.getAttribute(`min`);
-		input.max = this.getAttribute(`max`);
-		input.addEventListener(`change`, this.#updateValue.bind(this));
-		input.value = value;
-
-		// plus button
-		const increment = document.createElement(DotDungeonIcon.elementName);
-		increment.setAttribute(`name`, `ui/plus`);
-		increment.setAttribute(`var:size`, `0.75rem`);
-		increment.setAttribute(`var:fill`, `currentColor`);
-		increment.ariaHidden = true;
-		increment.classList.value = `increment`;
-		increment.addEventListener(`mousedown`, this.#increment.bind(this));
-
-		// minus button
-		const decrement = document.createElement(DotDungeonIcon.elementName);
-		decrement.setAttribute(`name`, `ui/minus`);
-		decrement.setAttribute(`var:size`, `0.75rem`);
-		decrement.setAttribute(`var:fill`, `currentColor`);
-		decrement.ariaHidden = true;
-		decrement.classList.value = `decrement`;
-		decrement.addEventListener(`mousedown`, this.#decrement.bind(this));
-
-		// Construct the DOM
-		container.appendChild(decrement);
-		container.appendChild(input);
-		container.appendChild(increment);
-		this._shadow.appendChild(container);
-
-		/*
-		This converts all of the namespace prefixed properties on the element to
-		CSS variables so that they don't all need to be provided by doing style=""
-		*/
-		for (const attrVar of this.attributes) {
-			if (attrVar.name?.startsWith(`var:`)) {
-				const prop = attrVar.name.replace(`var:`, ``);
-				this.style.setProperty(`--` + prop, attrVar.value);
-			};
-		};
-	};
-
-	#updateValue() {
-		let value = parseInt(this.#input.value);
-		if (this.getAttribute(`min`)) value = Math.max(this._min, value);
-		if (this.getAttribute(`max`)) value = Math.min(this._max, value);
-		this.#input.value = value;
-		this.value = value;
-		this.dispatchEvent(new Event(`change`, { bubbles: true }));
-	};
-
-	/** @param {Event} $e */
-	#increment($e) {
-		$e.preventDefault();
-		let value = parseInt(this.#input.value);
-		value += $e.ctrlKey ? this._largeStep : this._smallStep;
-		this.#input.value = value;
-		this.#updateValue();
-	};
-
-	/** @param {Event} $e */
-	#decrement($e) {
-		$e.preventDefault();
-		let value = parseInt(this.#input.value);
-		value -= $e.ctrlKey ? this._largeStep : this._smallStep;
-		this.#input.value = value;
-		this.#updateValue();
-	};
-};
--- a/module/components/index.mjs
+++ b/module/components/index.mjs
@ -1,23 +0,0 @@
-import { DotDungeonIncrementer } from "./incrementer.mjs";
-import { DotDungeonIcon } from "./icon.mjs";
-
-const components = [
-	DotDungeonIcon,
-	DotDungeonIncrementer,
-];
-
-export function registerCustomComponents() {
-	(CONFIG.CACHE ??= {}).componentListeners ??= [];
-	for (const component of components) {
-		if (!window.customElements.get(component.elementName)) {
-			console.debug(`.dungeon | Registering component "${component.elementName}"`);
-			window.customElements.define(
-				component.elementName,
-				component
-			);
-			if (component.formAssociated) {
-				CONFIG.CACHE.componentListeners.push(component.elementName);
-			}
-		};
-	}
-};
--- a/module/components/mixins/Styles.mjs
+++ b/module/components/mixins/Styles.mjs
@ -1,80 +0,0 @@
-/**
- * @param {HTMLElement} Base
- */
-export function StyledShadowElement(Base) {
-	return class extends Base {
-		/**
-		 * The path to the CSS that is loaded
-		 * @type {string}
-		 */
-		static _stylePath;
-
-		/**
-		 * The stringified CSS to use
-		 * @type {string}
-		 */
-		static _styles;
-
-		/**
-		 * The HTML element of the stylesheet
-		 * @type {HTMLStyleElement}
-		 */
-		_style;
-
-		/** @type {ShadowRoot} */
-		_shadow;
-
-		/**
-		 * The hook ID for this element's CSS hot reload
-		 * @type {number}
-		 */
-		#cssHmr;
-
-		constructor() {
-			super();
-
-			this._shadow = this.attachShadow({ mode: `open` });
-			this._style = document.createElement(`style`);
-			this._shadow.appendChild(this._style);
-		};
-
-		#mounted = false;
-		connectedCallback() {
-			if (this.#mounted) return;
-
-			this._getStyles();
-
-			if (game.settings.get(`dotdungeon`, `devMode`)) {
-				this.#cssHmr = Hooks.on(`dd-hmr:css`, (data) => {
-					if (data.path.endsWith(this.constructor._stylePath)) {
-						this._style.innerHTML = data.content;
-					};
-				});
-			};
-
-			this.#mounted = true;
-		};
-
-		disconnectedCallback() {
-			if (!this.#mounted) return;
-			if (this.#cssHmr != null) {
-				Hooks.off(`dd-hmr:css`, this.#cssHmr);
-				this.#cssHmr = null;
-			};
-			this.#mounted = false;
-		};
-
-		_getStyles() {
-			if (this.constructor._styles) {
-				this._style.innerHTML = this.constructor._styles;
-			} else {
-				fetch(`./systems/dotdungeon/.styles/${this.constructor._stylePath}`)
-				.then(r => r.text())
-				.then(t => {
-					this.constructor._styles = t;
-					this._style.innerHTML = t;
-				});
-			}
-		};
-	};
-};
--- a/module/config.mjs
+++ b/module/config.mjs
@ -1,11 +1,6 @@
 export const statDice = [ `d4`, `d6`, `d8`, `d10`, `d12`, `d20` ];

-export const trainingLevels = [
-	{ key: "locked", label: "dotdungeon.trainingLevel.locked", value: -1 },
-	{ key: "untrained", label: "dotdungeon.trainingLevel.untrained", value: 0 },
-	{ key: "trained", label: "dotdungeon.trainingLevel.trained", value: 2 },
-	{ key: "expert", label: "dotdungeon.trainingLevel.expert", value: 4 },
-];
+export const trainingLevels = [``, `locked`, `+2`, `+4`];

 export const damageTypes = [ `slashing`, `piercing`, `smashing`, `gun`, `neon`, `shadow`, `solar` ];

@ -32,12 +27,9 @@ export const skills = {
 	hands: handsSkills,
 };

-export const defaultItemTier = `simple`;
 export const itemTiers = [
-	{ value: `simple`, label: `dotdungeon.rarity.simple` },
-	{ value: `greater`, label: `dotdungeon.rarity.greater` },
-	{ value: `rare`, label: `dotdungeon.rarity.rare` },
-	{ value: `legendary`, label: `dotdungeon.rarity.legendary` },
+	`simple`, `greater`,
+	`rare`, `legendary`
 ];

 export const syncMilestones = [
@ -50,24 +42,6 @@ export const syncMilestones = [

 export const syncDice = `1d20`;

-export const localizerConfig = {
-	subKeyPattern: /@(?<key>[a-zA-Z\.]+)/gm,
-	maxDepth: 10,
-};
-
-export const itemFilters = [
-	`material`,
-	`untyped`,
-	`aspect`,
-	`weapon`,
-	`armour`,
-	`equipment`,
-	`foil`,
-	`pet`,
-	`structure`,
-	`service`,
-];
-
 export default {
 	stats,
 	statDice,
@ -80,10 +54,7 @@ export default {
 	handsSkills,
 	allSkills,
 	skills,
-	defaultItemTier,
 	itemTiers,
 	syncMilestones,
 	syncDice,
-	localizerConfig,
-	itemFilters,
 };
--- a/module/dialogs/DiceList.mjs
+++ b/module/dialogs/DiceList.mjs
@ -12,7 +12,7 @@ export class DiceList extends GenericDialog {
 	};

 	static get defaultOptions() {
-		const opts = foundry.utils.mergeObject({
+		const opts = mergeObject({
 			...super.defaultOptions,
 			template: `systems/dotdungeon/templates/dialogs/diceList.hbs`,
 			width: 275,
--- a/module/documents/ActiveEffect/GenericActiveEffect.mjs
+++ b/module/documents/ActiveEffect/GenericActiveEffect.mjs
@ -1,7 +0,0 @@
-export class DotDungeonActiveEffect extends ActiveEffect {
-
-	// Invert the logic of the disabled property so it's easier to modify via
-	// embedded controls
-	get enabled() { return !this.disabled };
-	set enabled(newValue) { this.disabled = !newValue };
-};
--- a/module/documents/ActiveEffect/_proxy.mjs
+++ b/module/documents/ActiveEffect/_proxy.mjs
@ -1,42 +0,0 @@
-import { DotDungeonActiveEffect } from "./GenericActiveEffect.mjs";
-
-const classes = {};
-
-const defaultClass = DotDungeonActiveEffect;
-
-export const ActiveEffectProxy = new Proxy(function () {}, {
-	construct(target, args) {
-		const [data] = args;
-
-		if (!classes.hasOwnProperty(data.type)) {
-			return new defaultClass(...args);
-		}
-
-		return new classes[data.type](...args);
-	},
-	get(target, prop, receiver) {
-
-		if (["create", "createDocuments"].includes(prop)) {
-			return function (data, options) {
-				if (data.constructor === Array) {
-					return data.map(i => ActiveEffectProxy.create(i, options))
-				}
-
-				if (!classes.hasOwnProperty(data.type)) {
-					return defaultClass.create(data, options);
-				}
-
-				return classes[data.type].create(data, options);
-			};
-		};
-
-		if (prop == Symbol.hasInstance) {
-			return function (instance) {
-				if (instance instanceof defaultClass) return true;
-				return Object.values(classes).some(i => instance instanceof i);
-			};
-		};
-
-		return defaultClass[prop];
-	},
-});
--- a/module/documents/Actor/GenericActor.mjs
+++ b/module/documents/Actor/GenericActor.mjs
@ -1,49 +0,0 @@
-export class DotDungeonActor extends Actor {
-
-	/*
-	Using this to take a "snapshot" of the system data prior to applying AE's so
-	that the inputs can still have the non-modified value in them, while we still
-	provide all that data to AE's without needing to disable any inputs.
-	*/
-	prepareEmbeddedDocuments() {
-		this.preAE = foundry.utils.deepClone(this.system);
-		super.prepareEmbeddedDocuments();
-	};
-
-	async createEmbeddedItem(defaults, opts = {}) {
-		let items = await this.createEmbeddedDocuments(`Item`, defaults);
-		if (!Array.isArray(items)) items = items ? [items] : [];
-		if (items.length == 0) {
-			throw new Error(`Failed to create any items`);
-		};
-		this.sheet.render();
-		if (
-			game.settings.get(`dotdungeon`, `openEmbeddedOnCreate`)
-			&& !opts.overrideSheetOpen
-		) {
-			for (const item of items) {
-				item.sheet.render(true);
-			};
-		};
-	};
-
-	async preItemEmbed(item) {
-
-		// Increases the quantity of already present items if they match via source
-		let embedded = this.itemTypes[item.type].find(i => {
-			return i.getFlag(`core`, `sourceId`) === `Item.${item.id}`
-		});
-		if (embedded) {
-			await embedded.update({"system.quantity": embedded.system.quantity + 1});
-			ui.notifications.info(
-				game.i18n.format(
-					`dotdungeon.notification.info.increased-item-quantity`,
-					{ name: embedded.name, quantity: embedded.system.quantity }
-				),
-				{ console: false }
-			);
-			return false;
-		};
-		return true;
-	};
-};
--- a/module/documents/Actor/Handler.mjs
+++ b/module/documents/Actor/Handler.mjs
@ -0,0 +1,104 @@
+import PlayerActor from "./Player.mjs";
+import MobActor from "./Mob.mjs";
+import SyncActor from "./Sync.mjs";
+
+/** @extends {Actor} */
+export class ActorHandler extends Actor {
+	proxyTargets = {
+		player: PlayerActor,
+		mob: MobActor,
+		sync: SyncActor,
+	};
+
+	constructor(data, ctx) {
+		super(data, ctx);
+	};
+
+	/** @type {class|undefined} */
+	get fn() {
+		return this.proxyTargets[this.type];
+	};
+
+	async proxyFunction(funcName, ...args) {
+		if (!this.fn?.[funcName]) return;
+		return await this.fn?.[funcName].bind(this)(...args);
+	};
+
+	async openEmbeddedSheet($event) {
+		if (this.fn?.openEmbeddedSheet) {
+			this.fn.openEmbeddedSheet.bind(this)($event);
+		} else {
+			const data = $event.target.dataset;
+			let item = await fromUuid(data.embeddedEdit);
+			item?.sheet.render(true);
+		};
+	};
+
+	async genericEmbeddedUpdate($event) {
+		if (this.fn?.genericEmbeddedUpdate) {
+			return this.fn.genericEmbeddedUpdate.bind(this)($event);
+		};
+		const target = $event.delegateTarget;
+		const data = target.dataset;
+		const item = await fromUuid(data.embeddedId);
+
+		let value = target.value;
+		switch (target.type) {
+			case "checkbox": value = target.checked; break;
+		};
+
+		await item?.update({ [data.embeddedUpdate]: value });
+	};
+
+	async genericEmbeddedDelete($event) {
+		if (!this.fn?.genericEmbeddedDelete) return;
+		this.fn.genericEmbeddedDelete.bind(this)($event);
+	};
+
+	async genericEmbeddedCreate($event) {
+		const data = $event.currentTarget.dataset;
+		if (!this.fn?.[`createCustom${data.embeddedCreate}`]) return;
+		this.fn?.[`createCustom${data.embeddedCreate}`].bind(this)($event);
+	};
+
+	async genericSendToChat($event) {
+		const data = $event.currentTarget.dataset;
+		const type = data.messageType;
+		if (this.fn?.[`send${type}ToChat`]) {
+			return await this.fn?.[`send${type}ToChat`].bind(this)($event);
+		};
+		if (!data.messageContent) {
+			console.warn(`.dungeon | Tried to send a chat message with no content`);
+			return;
+		};
+		let message = await ChatMessage.create({
+			content: data.messageContent,
+			flavor: data.messageFlavor,
+			speaker: { actor: this.actor }
+		});
+		message.render();
+	};
+
+	/**
+	 * @param {ItemHandler} item
+	 * @returns {boolean} true to allow the document to be embedded
+	 */
+	async preItemEmbed(item) {
+		let type = item.type[0].toUpperCase() + item.type.slice(1);
+		if (this.fn?.[`pre${type}Embed`]) {
+			return await this.fn?.[`pre${type}Embed`].bind(this)(item);
+		};
+		return true;
+	};
+
+	_preUpdate(...args) {
+		return this.proxyFunction("_preUpdate", ...args);
+	};
+
+	getRollData() {
+		if (!this.fn?.getRollData) return {};
+		return this.fn?.getRollData.bind(this)();
+	};
+
+	useRestDie() {return this.proxyFunction("useRestDie")};
+};
--- a/module/documents/Actor/Mob.mjs
+++ b/module/documents/Actor/Mob.mjs
@ -1,10 +1,11 @@
-import { DotDungeonActor } from "./GenericActor.mjs";
-
-export class Mob extends DotDungeonActor {
-	getRollData() {
-		const data = {
-			initiative: this.system.initiative ?? 0,
-		};
-		return data;
+/** @this {Actor} */
+function getRollData() {
+	const data = {
+		initiative: this.system.initiative ?? 0,
 	};
+	return data;
+};
+
+export default {
+	getRollData,
 };
--- a/module/documents/Actor/Player.mjs
+++ b/module/documents/Actor/Player.mjs
@ -1,51 +1,155 @@
-import { DotDungeonActor } from "./GenericActor.mjs";
+import { ItemHandler } from "../Item/Handler.mjs";

-export class Player extends DotDungeonActor {
+/** @this {Actor} */
+async function genericEmbeddedDelete($event) {
+	let data = $event.currentTarget.dataset;
+	let item = await fromUuid(data.embeddedId);

-	applyActiveEffects() {
-		super.applyActiveEffects();
-
-		/*
-		These are the (groups of) fields that ActiveEffects may modify safely and
-		remain editable in the sheet. This needs to be done because of default
-		Foundry behaviour that otherwise prevents these fields from being edited.
-		The deletes must use optional chaining otherwise they can cause issues
-		during the document preparation lifecycle as an actor with no AE's affecting
-		anything in one of these areas will result in these paths being undefined.
-		*/
-		delete this.overrides.system?.stats;
-		delete this.overrides.system?.skills;
-	};
-
-	async createCustomPet() {
-		const body = new URLSearchParams({
-			number: 1,
-			animal: `Cat`,
-			"X-Requested-With": "fetch"
-		});
-		const r = await fetch(
-			`https://randommer.io/pet-names`,
-			{
-				method: "POST",
-				body
-			}
+	if (!item) {
+		ui.notifications.error(
+			`dotdungeon.notification.error.item-not-found`,
+			{ console: false }
 		);
-		await this.createEmbeddedItem([{
-			type: `pet`,
-			name: (await r.json())[0] ?? game.i18n.localize(`dotdungeon.defaults.pet.name`),
-		}]);
+		return;
 	};

-	get atAspectLimit() {
-		let limit = game.settings.get(`dotdungeon`, `aspectLimit`);
-		return this.itemTypes.aspect.length >= limit;
-	};
+	Dialog.confirm({
+		title: game.i18n.format(
+			`dotdungeon.dialogs.${item.type}.delete.title`,
+			item
+		),
+		content: game.i18n.format(
+			`dotdungeon.dialogs.${item.type}.delete.content`,
+			item
+		),
+		yes: () => {
+			item.delete();
+		},
+		defaultYes: false,
+	});
+};

-	getRollData() {
-		const data = {
-			initiative: this.system.stats.hands ?? 0,
-			stats: this.system.stats,
+/** @this {Actor} */
+async function createCustomItem(defaults, opts = {}) {
+	let items = await this.createEmbeddedDocuments(`Item`, defaults);
+	if (items.length == 0) {
+		throw new Error();
+	};
+	this.sheet.render();
+	if (
+		game.settings.get(`dotdungeon`, `openEmbeddedOnCreate`)
+		&& !opts.overrideSheetOpen
+	) {
+		for (const item of items) {
+			item.sheet.render(true);
 		};
-		return data;
 	};
 };
+
+/** @this {Actor} */
+async function createCustomUntyped() {
+	await createCustomItem.bind(this)([{
+		type: `untyped`,
+		name: game.i18n.format(`dotdungeon.defaults.untyped.name`),
+	}]);
+};
+
+/** @this {Actor} */
+async function createCustomAspect() {
+	await createCustomItem.bind(this)([{
+		type: `aspect`,
+		name: game.i18n.format(`dotdungeon.defaults.aspect.name`),
+	}]);
+};
+
+/** @this {Actor} */
+async function createCustomSpell() {
+	await createCustomItem.bind(this)([{
+		type: `spell`,
+		name: game.i18n.format(`dotdungeon.defaults.spell.name`),
+	}]);
+};
+
+/** @this {Actor} */
+async function createCustomPet() {
+	const body = new URLSearchParams({
+		number: 1,
+		animal: `Cat`,
+		"X-Requested-With": "fetch"
+	})
+	const r = await fetch(
+		`https://randommer.io/pet-names`,
+		{
+			method: "POST",
+			body
+		}
+	);
+	await createCustomItem.bind(this)([{
+		type: `pet`,
+		name: (await r.json())[0] ?? game.i18n.localize(`dotdungeon.defaults.pet.name`),
+	}]);
+};
+
+/** @this {Actor} */
+async function atAspectLimit() {
+	let limit = game.settings.get(`dotdungeon`, `aspectLimit`);
+	return this.itemTypes.aspect.length >= limit;
+};
+
+/**
+ * @param {ItemHandler} item
+ * @this {Actor}
+ */
+async function preAspectEmbed(item) {
+	if (await atAspectLimit.bind(this)()) {
+		ui.notifications.error(
+			game.i18n.format(
+				`dotdungeon.notification.error.aspect-limit-reached`,
+				{ limit: game.settings.get(`dotdungeon`, `aspectLimit`) }
+			),
+			{ console: false }
+		);
+		return false;
+	};
+};
+
+/**
+ * @param {ItemHandler} item
+ * @this {Actor}
+ */
+async function preUntypedEmbed(item) {
+	let inventoryItem = this.itemTypes.untyped.find(i => i.name === item.name);
+	if (inventoryItem) {
+		inventoryItem.update({"system.quantity": inventoryItem.system.quantity + 1});
+		ui.notifications.info(
+			game.i18n.format(
+				`dotdungeon.notification.info.increased-item-quantity`,
+				{ name: inventoryItem.name }
+			),
+			{ console: false }
+		);
+		return false;
+	};
+};
+
+/** @this {Actor} */
+function getRollData() {
+	const data = {
+		initiative: this.system.stats.hands ?? 0,
+		stats: this.system.stats,
+	};
+	return data;
+};
+
+export default {
+	atAspectLimit,
+	createCustomItem,
+	createCustomUntyped,
+	createCustomAspect,
+	createCustomSpell,
+	createCustomPet,
+	genericEmbeddedDelete,
+	preAspectEmbed,
+	preUntypedEmbed,
+	getRollData,
+};
--- a/module/documents/Actor/Sync.mjs
+++ b/module/documents/Actor/Sync.mjs
@ -1,56 +1,60 @@
-import { DotDungeonActor } from "./GenericActor.mjs";
-import { syncMilestones } from "../../config.mjs";
+import { syncMilestones, syncDice } from "../../config.mjs";

-export class Sync extends DotDungeonActor {
-	async useRestDie() {
-		let addToSync = await (new Roll(syncDice)).evaluate();
-		await addToSync.toMessage({
-			speaker: ChatMessage.getSpeaker({ actor: this.actor }),
-			flavor: `Sync Restoration`,
-		});
-		this.update({
-			"system.rest_dice": this.system.rest_dice - 1,
-			"system.value": this.system.value + addToSync.total,
-		});
-	};
+/** @this {Actor} */
+async function useRestDie() {
+	let addToSync = await (new Roll(syncDice)).evaluate();
+	await addToSync.toMessage({
+		speaker: ChatMessage.getSpeaker({ actor: this.actor }),
+		flavor: `Sync Restoration`,
+	});
+	this.update({
+		"system.rest_dice": this.system.rest_dice - 1,
+		"system.value": this.system.value + addToSync.total,
+	});
+};

-	async _preUpdate(data, options) {
-		if (options.diff) {
-			if (data.system?.value != null) {
-				let currentSync = this.system.value;
-				let newSync = data.system.value;
+/** @this {Actor} */
+async function _preUpdate(data, options) {
+	if (options.diff) {
+		if (data.system?.value != null) {
+			let currentSync = this.system.value;
+			let newSync = data.system.value;

-				let minSync = Math.min(currentSync, newSync);
-				let maxSync = Math.max(currentSync, newSync);
-				let milestones = syncMilestones.filter(
-					m => minSync < m.value && m.value <= maxSync
-				);
+			let minSync = Math.min(currentSync, newSync);
+			let maxSync = Math.max(currentSync, newSync);
+			let milestones = syncMilestones.filter(
+				m => minSync < m.value && m.value <= maxSync
+			);

-				if (milestones.length > 0) data.system.rest_dice ??= this.system.rest_dice;
+			if (milestones.length > 0) data.system.rest_dice ??= this.system.rest_dice;

-				for (const milestone of milestones) {
-					// Damage
-					if (newSync < currentSync) {
-						if (!this.system.milestones_hit.has(milestone.value)) {
-							data.system.rest_dice += 1;
-							this.system.milestones_hit.add(milestone.value);
-						};
-					}
+			for (const milestone of milestones) {
+				// Damage
+				if (newSync < currentSync) {
+					if (!this.system.milestones_hit.has(milestone.value)) {
+						data.system.rest_dice += 1;
+						this.system.milestones_hit.add(milestone.value);
+					};
+				}

-					// Healing
-					else if (newSync > currentSync) {
-						if (
-							this.system.milestones_hit.has(milestone.value)
-							&& milestone.andReturn
-							&& milestone.value <= newSync
-						) {
-							this.system.milestones_hit.delete(milestone.value);
-						};
+				// Healing
+				else if (newSync > currentSync) {
+					if (
+						this.system.milestones_hit.has(milestone.value)
+						&& milestone.andReturn
+						&& milestone.value <= newSync
+					) {
+						this.system.milestones_hit.delete(milestone.value);
 					};
 				};
-
-				data.system.milestones_hit = [ ...this.system.milestones_hit ];
 			};
+
+			data.system.milestones_hit = [ ...this.system.milestones_hit ];
 		};
 	};
 };
+
+export default {
+	_preUpdate,
+	useRestDie,
+};
--- a/module/documents/Actor/_proxy.mjs
+++ b/module/documents/Actor/_proxy.mjs
@ -1,49 +0,0 @@
-import { DotDungeonActor } from "./GenericActor.mjs";
-import { Player } from "./Player.mjs";
-import { Sync } from "./Sync.mjs";
-import { Mob } from "./Mob.mjs";
-
-const classes = {
-	player: Player,
-	mob: Mob,
-	sync: Sync,
-};
-
-const defaultClass = DotDungeonActor;
-
-export const ActorProxy = new Proxy(function () {}, {
-	construct(target, args) {
-		const [data] = args;
-
-		if (!classes.hasOwnProperty(data.type)) {
-			return new defaultClass(...args);
-		}
-
-		return new classes[data.type](...args);
-	},
-	get(target, prop, receiver) {
-
-		if (["create", "createDocuments"].includes(prop)) {
-			return function (data, options) {
-				if (data.constructor === Array) {
-					return data.map(i => ActorProxy.create(i, options))
-				}
-
-				if (!classes.hasOwnProperty(data.type)) {
-					return defaultClass.create(data, options);
-				}
-
-				return classes[data.type].create(data, options);
-			};
-		};
-
-		if (prop == Symbol.hasInstance) {
-			return function (instance) {
-				if (instance instanceof defaultClass) return true;
-				return Object.values(classes).some(i => instance instanceof i);
-			};
-		};
-
-		return defaultClass[prop];
-	},
-});
--- a/module/documents/Item/Aspect.mjs
+++ b/module/documents/Item/Aspect.mjs
@ -1,42 +1,10 @@
-import { DotDungeonItem } from "./GenericItem.mjs";
-
-const secondsInAMinute = 60;
-const secondsInAnHour = 60 * secondsInAMinute;
-
-export class Aspect extends DotDungeonItem {
-	async _preCreate() {
-		if (this.isEmbedded) {
-			if (this.actor.atAspectLimit) {
-				ui.notifications.error(
-					game.i18n.format(
-						`dotdungeon.notification.error.aspect-limit-reached`,
-						{ limit: game.settings.get(`dotdungeon`, `aspectLimit`) }
-					),
-					{ console: false }
-				);
-				return false;
-			};
-
-			return await this.actor?.preItemEmbed(this);
-		};
-	};
-
-	get friendlyDuration() {
-		let friendly = ``;
-		let duration = this.system.deactivateAfter;
-		if (duration >= secondsInAnHour) {
-			let hours = Math.floor(duration / secondsInAnHour);
-			friendly += `${hours}h`;
-			duration -= hours * secondsInAnHour;
-		};
-		if (duration >= secondsInAMinute) {
-			let minutes = Math.floor(duration / secondsInAMinute);
-			friendly += `${minutes}m`;
-			duration -= minutes * secondsInAMinute;
-		};
-		if (duration > 0) {
-			friendly += `${duration}s`;
-		};
-		return friendly;
+/** @this {ItemHandler} */
+async function _preCreate(_data, _options, _user) {
+	if (this.isEmbedded) {
+		return await this.actor?.preItemEmbed(this);
 	};
 };
+
+export default {
+	_preCreate,
+};
--- a/module/documents/Item/GenericItem.mjs
+++ b/module/documents/Item/GenericItem.mjs
@ -1,24 +0,0 @@
-export class DotDungeonItem extends Item {
-	async _preCreate() {
-		if (this.isEmbedded) {
-			return await this.actor?.preItemEmbed(this);
-		};
-	};
-
-	get usedCapacity() {
-		if (!this.system.uses_inventory_slot) return 0;
-		if (!this.system.quantity_affects_used_capacity) {
-			return 1;
-		};
-		return this.system.quantity;
-	};
-
-	get availableLocations() {
-		return [
-			{ value: null, label: `dotdungeon.location.unknown` },
-			{ value: `inventory`, label: `dotdungeon.location.inventory` },
-			{ value: `equipped`, label: `dotdungeon.location.equipped` },
-			{ value: `storage`, label: `dotdungeon.location.storage` },
-		];
-	};
-};
--- a/module/documents/Item/Handler.mjs
+++ b/module/documents/Item/Handler.mjs
@ -0,0 +1,30 @@
+import AspectItem from "./Aspect.mjs";
+import SpellItem from "./Spell.mjs";
+
+/** @extends {Item} */
+export class ItemHandler extends Item {
+	proxyTargets = {
+		aspect: AspectItem,
+		spell: SpellItem,
+	};
+
+	constructor(data, ctx) {
+		super(data, ctx);
+	};
+
+	/** @type {class|undefined} */
+	get fn() {
+		return this.proxyTargets[this.type];
+	};
+
+	async proxyFunction(funcName, ...args) {
+		if (!this.fn?.[funcName]) return;
+		return await this.fn?.[funcName].bind(this)(...args);
+	};
+
+	async _preCreate(...args) {
+		if (this.fn?._preCreate) return this.fn?._preCreate.bind(this)(...args);
+		if (this.isEmbedded) return await this.actor?.preItemEmbed(this);
+		return;
+	};
+};
--- a/module/documents/Item/Material.mjs
+++ b/module/documents/Item/Material.mjs
@ -1,15 +0,0 @@
-import { DotDungeonItem } from "./GenericItem.mjs";
-
-export class Material extends DotDungeonItem {
-	get usedCapacity() {
-		let affects = game.settings.get(`dotdungeon`, `materialsAffectCapacity`);
-		return affects ? super.usedCapacity : 0;
-	};
-
-	get availableLocations() {
-		return [
-			{ value: null, label: `dotdungeon.location.unknown` },
-			{ value: `inventory`, label: `dotdungeon.location.inventory` },
-		];
-	};
-};
--- a/module/documents/Item/Spell.mjs
+++ b/module/documents/Item/Spell.mjs
@ -0,0 +1 @@
+export default {};
--- a/module/documents/Item/_proxy.mjs
+++ b/module/documents/Item/_proxy.mjs
@ -1,47 +0,0 @@
-import { DotDungeonItem } from "./GenericItem.mjs";
-import { Aspect } from "./Aspect.mjs";
-import { Material } from "./Material.mjs";
-
-const classes = {
-	aspect: Aspect,
-	material: Material,
-};
-
-const defaultClass = DotDungeonItem;
-
-export const ItemProxy = new Proxy(function () {}, {
-	construct(target, args) {
-		const [data] = args;
-
-		if (!classes.hasOwnProperty(data.type)) {
-			return new defaultClass(...args);
-		}
-
-		return new classes[data.type](...args);
-	},
-	get(target, prop, receiver) {
-
-		if (["create", "createDocuments"].includes(prop)) {
-			return function (data, options) {
-				if (data.constructor === Array) {
-					return data.map(i => ItemProxy.create(i, options))
-				}
-
-				if (!classes.hasOwnProperty(data.type)) {
-					return defaultClass.create(data, options);
-				}
-
-				return classes[data.type].create(data, options);
-			};
-		};
-
-		if (prop == Symbol.hasInstance) {
-			return function (instance) {
-				if (instance instanceof defaultClass) return true;
-				return Object.values(classes).some(i => instance instanceof i);
-			};
-		};
-
-		return defaultClass[prop];
-	},
-});
--- a/module/dotdungeon.mjs
+++ b/module/dotdungeon.mjs
@ -1,7 +1,5 @@
 // Data Models
 import { DescribedItemData } from "./models/Item/DescribedItemData.mjs";
-import { CommonItemData } from "./models/Item/CommonItemData.mjs";
-import { WeaponItemData } from "./models/Item/Weapon.mjs";
 import { AspectItemData } from "./models/Item/Aspect.mjs";
 import { SpellItemData } from "./models/Item/Spell.mjs";
 import { PlayerData } from "./models/Actor/Player.mjs";
@ -10,9 +8,8 @@ import { SyncData } from "./models/Actor/Sync.mjs";
 import { MobData } from "./models/Actor/Mob.mjs";

 // Main Documents
-import { ActiveEffectProxy } from "./documents/ActiveEffect/_proxy.mjs";
-import { ActorProxy } from "./documents/Actor/_proxy.mjs";
-import { ItemProxy } from "./documents/Item/_proxy.mjs";
+import { ActorHandler } from "./documents/Actor/Handler.mjs";
+import { ItemHandler } from "./documents/Item/Handler.mjs";

 // Item Sheets
 import { UntypedItemSheet } from "./sheets/Items/UntypedItemSheet.mjs";
@ -22,8 +19,7 @@ import { PetSheet } from "./sheets/Items/PetSheet.mjs";

 // Actor Sheets
 import { BasicSyncSheet } from "./sheets/SyncVariations/BasicSyncSheet.mjs";
-import { PlayerSheetv2 } from "./sheets/Actors/PC/PlayerSheetV2.mjs";
-import { MVPPCSheet } from "./sheets/MVPPCSheet.mjs";
+import { PlayerSheet } from "./sheets/PlayerSheet.mjs";
 import { MobSheet } from "./sheets/MobSheet.mjs";

 // Utility imports
@ -33,15 +29,12 @@ import * as hbs from "./handlebars.mjs";
 import "./hooks/hotReload.mjs";

 // Misc Imports
-import { registerCustomComponents } from "./components/index.mjs";
 import loadSettings from "./settings/index.mjs";
-import { devInit } from "./hooks/devInit.mjs";
 import DOTDUNGEON from "./config.mjs";


 Hooks.once(`init`, async () => {
 	console.debug(`.dungeon | Initializing`);
-	CONFIG.ActiveEffect.legacyTransferral = false;

 	loadSettings();

@ -49,28 +42,19 @@ Hooks.once(`init`, async () => {
 	CONFIG.Actor.dataModels.sync = SyncData;
 	CONFIG.Actor.dataModels.mob = MobData;
 	CONFIG.Item.dataModels.untyped = DescribedItemData;
-	CONFIG.Item.dataModels.material = CommonItemData;
-	CONFIG.Item.dataModels.foil = DescribedItemData;
-	CONFIG.Item.dataModels.weapon = WeaponItemData;
 	CONFIG.Item.dataModels.aspect = AspectItemData;
 	CONFIG.Item.dataModels.spell = SpellItemData;
 	CONFIG.Item.dataModels.pet = PetItemData;
-	CONFIG.Actor.documentClass = ActorProxy;
-	CONFIG.Item.documentClass = ItemProxy;
-	CONFIG.ActiveEffect.documentClass = ActiveEffectProxy;
+	CONFIG.Actor.documentClass = ActorHandler;
+	CONFIG.Item.documentClass = ItemHandler;

 	CONFIG.DOTDUNGEON = DOTDUNGEON;


-	Actors.registerSheet("dotdungeon", MVPPCSheet, {
+	Actors.registerSheet("dotdungeon", PlayerSheet, {
 		makeDefault: true,
 		types: ["player"],
-		label: "dotdungeon.sheet-names.PlayerSheet.MVP"
-	});
-	Actors.registerSheet("dotdungeon", PlayerSheetv2, {
-		makeDefault: false,
-		types: ["player"],
-		label: "dotdungeon.sheet-names.PlayerSheet.v2"
+		label: "dotdungeon.sheet-names.PlayerSheet"
 	});
 	Actors.registerSheet("dotdungeon", MobSheet, {
 		makeDefault: true,
@ -106,13 +90,12 @@ Hooks.once(`init`, async () => {
 		label: "dotdungeon.sheet-names.PetSheet"
 	});

-	if (true || game.settings.get(`dotdungeon`, `devMode`)) {
-		devInit();
-	};

 	hbs.registerHandlebarsHelpers();
 	hbs.preloadHandlebarsTemplates();
-	registerCustomComponents();
+
+	CONFIG.CACHE = {};
+	CONFIG.CACHE.icons = await hbs.preloadIcons();
 });


--- a/module/handlebars.mjs
+++ b/module/handlebars.mjs
@ -7,7 +7,7 @@ export const partials = [
 	`partials/panel.hbs`,
 	`items/aspect.hbs`,

-	// All of the partials for the PC MVP sheet panels
+	// All of the partials for the PC sheet panels
 	`actors/char-sheet-mvp/panels/aspect.pc.hbs`,
 	`actors/char-sheet-mvp/panels/backpack.pc.hbs`,
 	`actors/char-sheet-mvp/panels/mounts.pc.hbs`,
@ -18,30 +18,25 @@ export const partials = [
 	`actors/char-sheet-mvp/panels/pets.pc.hbs`,
 	`actors/char-sheet-mvp/panels/sync.pc.hbs`,
 	`actors/char-sheet-mvp/panels/weapons.pc.hbs`,
-
-	// The v2 PC sheet partials
-	`actors/char-sheet/v2/partials/stats.v2.pc.hbs`,
-	`actors/char-sheet/v2/partials/effects.v2.pc.hbs`,
-	`actors/char-sheet/v2/partials/inventory/inventory.v2.pc.hbs`,
-	`actors/char-sheet/v2/partials/inventory/player.v2.pc.hbs`,
-	`actors/char-sheet/v2/partials/inventory/item-list.v2.pc.hbs`,
-	`actors/char-sheet/v2/partials/inventory/storage.v2.pc.hbs`,
-	`actors/char-sheet/v2/partials/inventory/items/material.v2.pc.hbs`,
-	`actors/char-sheet/v2/partials/inventory/items/untyped.v2.pc.hbs`,
-	`actors/char-sheet/v2/partials/inventory/items/aspect.v2.pc.hbs`,
-	`actors/char-sheet/v2/partials/inventory/items/weapon.v2.pc.hbs`,
-	`actors/char-sheet/v2/partials/inventory/items/pet.v2.pc.hbs`,
-
-	// The v2 Untyped sheet partials
-	`items/untyped/v2/tabs/general.v2.untyped.hbs`,
-	`items/untyped/v2/tabs/details.v2.untyped.hbs`,
-	`items/untyped/v2/tabs/effects.v2.untyped.hbs`,
-	`items/untyped/v2/tabs/settings.v2.untyped.hbs`,
 ];

-export const preAliasedPartials = {
-	"dotdungeon.pc.v2.foil": "actors/char-sheet/v2/partials/inventory/items/untyped.v2.pc.hbs",
-};
+export const icons = [
+	`caret-right.svg`,
+	`garbage-bin.svg`,
+	`chat-bubble.svg`,
+	`dice/d4.svg`,
+	`dice/d6.svg`,
+	`dice/d8.svg`,
+	`dice/d10.svg`,
+	`dice/d12.svg`,
+	`dice/d20.svg`,
+	`create.svg`,
+	`close.svg`,
+	`edit.svg`,
+	`sheet.svg`,
+	`minus.svg`,
+];
+

 export async function registerHandlebarsHelpers() {
 	Handlebars.registerHelper(helpers);
@ -53,10 +48,6 @@ export async function preloadHandlebarsTemplates() {

 	const paths = {};

-	for (const alias in preAliasedPartials) {
-		paths[alias] = `${pathPrefix}${preAliasedPartials[alias]}`;
-	};
-
 	for ( const partial of partials ) {
 		console.debug(`Loading partial: ${partial}`);
 		const path = `${pathPrefix}${partial}`;
@ -78,3 +69,38 @@ export async function preloadHandlebarsTemplates() {
 	console.groupEnd();
 	return loadTemplates(paths);
 };
+
+/**
+ * Loads all of the icons that are needed in the handlebars templating to make
+ * the sheet look nicer.
+ *
+ * @returns An object containing icon names to the corresponding HTML data for
+ *   displaying the icon
+ */
+export async function preloadIcons() {
+	const pathPrefix = `systems/dotdungeon/assets/`
+	const parsedIcons = {};
+
+	for (const icon of icons) {
+		const iconName = icon.split(`/`).slice(-1)[0].slice(0, -4);
+		if (icon.endsWith(`.svg`)) {
+			try {
+				const response = await fetchWithTimeout(`${pathPrefix}${icon}`);
+				if (response.status !== 200) { continue };
+				const svgData = await response.text();
+				parsedIcons[iconName] = svgData;
+			} catch {
+				console.error(`.dungeon | Failed to fetch/parse icon: ${icon}`);
+				continue;
+			};
+		}
+		else if (icon.endsWith(`.png`)) {
+			parsedIcons[iconName] = `<img alt="" src="${pathPrefix}${icon}">`;
+		}
+		else {
+			console.warn(`.dungeon | Icon "${icon}" failed to be handled by a loader`)
+		};
+	};
+
+	return parsedIcons;
+};
--- a/module/helpers/index.mjs
+++ b/module/helpers/index.mjs
@ -2,24 +2,20 @@ import { schemaOptions } from "./schemaOptions.mjs";
 import { createArray } from "./createArray.mjs";
 import { detailsExpanded } from "./detailsExpanded.mjs";
 import { objectValue } from "./objectValue.mjs";
-import { handlebarsLocalizer, localizer } from "../utils/localizer.mjs";
-import { options } from "./options.mjs";
+import { toFriendlyDuration } from "./toFriendlyDuration.mjs";

 export default {

 	// Complex helpers
 	"dd-schemaOptions": schemaOptions,
 	"dd-array": createArray,
+	"dd-toFriendlyDuration": toFriendlyDuration,
 	"dd-objectValue": objectValue,
 	"dd-expanded": detailsExpanded,
-	"dd-i18n": handlebarsLocalizer,
-	"dd-options": options,

 	// Simple helpers
 	"dd-stringify": v => JSON.stringify(v, null, `  `),
 	"dd-empty": v => v.length == 0,
-	"dd-set-has": (s, k) => s.has(k),
-	"dd-empty-state": (v) => v ?? localizer(`dotdungeon.common.empty`),

 	// Logic helpers
 	"eq": (a, b) => a == b,
--- a/module/helpers/options.mjs
+++ b/module/helpers/options.mjs
@ -1,35 +0,0 @@
-import { localizer } from "../utils/localizer.mjs";
-
-/**
- * @typedef {object} Option
- * @property {string} [label]
- * @property {string|number} value
- * @property {boolean} [disabled]
- */
-
-/**
- * @param {string | number} selected
- * @param {Array<Option | string>} opts
- */
-export function options(selected, opts, meta) {
-	const { localize = false } = meta.hash;
-	selected = Handlebars.escapeExpression(selected);
-	const htmlOptions = [];
-
-	for (let opt of opts) {
-		if (foundry.utils.getType(opt) === "string") {
-			opt = { label: opt, value: opt };
-		};
-		opt.value = Handlebars.escapeExpression(opt.value);
-		htmlOptions.push(
-			`<option
-				value="${opt.value}"
-				${selected === opt.value ? "selected" : ""}
-				${opt.disabled ? "disabled" : ""}
-			>
-				${localize ? localizer(opt.label) : opt.label}
-			</option>`
-		);
-	};
-	return htmlOptions.join(`\n`);
-};
--- a/module/helpers/toFriendlyDuration.mjs
+++ b/module/helpers/toFriendlyDuration.mjs
@ -0,0 +1,26 @@
+const secondsInAMinute = 60;
+const secondsInAnHour = 60 * secondsInAMinute;
+
+
+/**
+ * Converts a duration into a more human-friendly format
+ * @param {number} duration The length of time in seconds
+ * @returns The human-friendly time string
+ */
+export function toFriendlyDuration(duration) {
+	let friendly = ``;
+	if (duration >= secondsInAnHour) {
+		let hours = Math.floor(duration / secondsInAnHour);
+		friendly += `${hours}h`;
+		duration -= hours * secondsInAnHour;
+	};
+	if (duration >= secondsInAMinute) {
+		let minutes = Math.floor(duration / secondsInAMinute);
+		friendly += `${minutes}m`;
+		duration -= minutes * secondsInAMinute;
+	};
+	if (duration > 0) {
+		friendly += `${duration}s`;
+	};
+	return friendly;
+};
--- a/module/hooks/devInit.mjs
+++ b/module/hooks/devInit.mjs
@ -1,27 +0,0 @@
-/*
-Initialization of dev-specific features for the init hook, this is primarily
-used to register all of the data sheets of various entity types.
-*/
-
-import { GroupDataSheet } from "../sheets/Datasheets/GroupDataSheet.mjs";
-import { UntypedDataSheet } from "../sheets/Datasheets/UntypedDataSheet.mjs";
-
-export function devInit() {
-	Items.registerSheet(
-		`dotdungeon`,
-		UntypedDataSheet,
-		{
-			types: [`untyped`, `foil`],
-			label: `dotdungeon.sheet-names.*DataSheet`,
-		}
-	);
-
-	Actors.registerSheet(
-		`dotdungeon`,
-		GroupDataSheet,
-		{
-			types: [`sync`],
-			label: `dotdungeon.sheet-names.*DataSheet`,
-		}
-	);
-};
--- a/module/hooks/hotReload.mjs
+++ b/module/hooks/hotReload.mjs
@ -3,8 +3,8 @@ import * as hbs from "../handlebars.mjs";
 const loaders = {
 	svg(data) {
 		const iconName = data.path.split(`/`).slice(-1)[0].slice(0, -4);
-		console.debug(`.dungeon | hot-reloading icon: ${iconName}`);
-		Hooks.call(`dd-hmr:svg`, iconName, data);
+		console.log(`.dungeon | hot-reloading icon: ${iconName}`);
+		CONFIG.CACHE.icons[iconName] = data.content;
 	},
 	hbs(data) {
 		if (!hbs.partials.some(p => data.path.endsWith(p))) {
@ -33,12 +33,6 @@ const loaders = {

 		return false;
 	},
-	js() {window.location.reload()},
-	mjs() {window.location.reload()},
-	css(data) {
-		console.debug(`.dungeon | Hot-reloading CSS: ${data.path}`);
-		Hooks.call(`dd-hmr:css`, data);
-	},
 };

 Hooks.on(`hotReload`, async (data) => {
--- a/module/models/Actor/Player.mjs
+++ b/module/models/Actor/Player.mjs
@ -1,4 +1,4 @@
-import DOTDUNGEON from "../../config.mjs";
+import { MappingField } from "../fields/MappingField.mjs";

 function diceChoiceField() {
 	return new foundry.data.fields.StringField({
@ -6,17 +6,33 @@ function diceChoiceField() {
 		blank: true,
 		trim: true,
 		options() {
-			return DOTDUNGEON.statDice;
+			return CONFIG.DOTDUNGEON.statDice;
 		},
 	});
 };

 function trainingLevelField() {
-	return new foundry.data.fields.NumberField({
-		initial: 0,
-		min: -1,
-		integer: true,
-		options: Object.values(DOTDUNGEON.trainingLevels),
+	return new foundry.data.fields.StringField({
+		initial: ``,
+		blank: true,
+		trim: true,
+		options: CONFIG.DOTDUNGEON.trainingLevels,
+	});
+};
+
+function weaponDamageTypeField() {
+	return new foundry.data.fields.StringField({
+		initial: ``,
+		blank: true,
+		options: [ ``, ...CONFIG.DOTDUNGEON.damageTypes ],
+	});
+};
+
+function ammoTypeField() {
+	return new foundry.data.fields.StringField({
+		initial: ``,
+		blank: true,
+		options: [ ``, ...CONFIG.DOTDUNGEON.ammoTypes ],
 	});
 };

@ -24,14 +40,6 @@ export class PlayerData extends foundry.abstract.TypeDataModel {
 	static defineSchema() {
 		const fields = foundry.data.fields;
 		return {
-			/*
-			These are special data properties that will be used by ActiveEffects
-			to modify certain limits within the actor, allowing for neat hacks
-			that change these
-			*/
-			weapon_slots: new fields.NumberField({ initial: 2 }),
-			inventory_slots: new fields.NumberField({ initial: 0 }),
-
 			bytes: new fields.NumberField({
 				initial: 0,
 				min: 0,
@ -75,18 +83,65 @@ export class PlayerData extends foundry.abstract.TypeDataModel {
 					piloting: trainingLevelField(),
 				})
 			}),
-			// ! Delete
+			aspect: new fields.SchemaField({
+				name: new fields.StringField({ blank: true, trim: true }),
+				description: new fields.StringField({ blank: true, trim: true }),
+				deactivateAfter: new fields.NumberField({ min: 0, integer: true}),
+				used: new fields.BooleanField(),
+			}),
 			roles: new fields.SchemaField({
 				r1: new fields.StringField({ blank: true, trim: true }),
 				r2: new fields.StringField({ blank: true, trim: true }),
 				r3: new fields.StringField({ blank: true, trim: true }),
 				r4: new fields.StringField({ blank: true, trim: true }),
 			}),
+			weapon: new fields.SchemaField({
+				mainHand: new fields.SchemaField({
+					name: new fields.StringField({ initial: ``, blank: true, trim: true }),
+					damage: weaponDamageTypeField(),
+					ranged: new fields.BooleanField({ initial: false }),
+					scope: new fields.BooleanField({ initial: false }),
+					ammo: ammoTypeField(),
+				}),
+				offHand: new fields.SchemaField({
+					name: new fields.StringField({ initial: ``, blank: true, trim: true }),
+					damage: weaponDamageTypeField(),
+					ranged: new fields.BooleanField({ initial: false }),
+					scope: new fields.BooleanField({ initial: false }),
+					ammo: ammoTypeField(),
+				}),
+				ammo: new fields.SchemaField({
+					quivers: new fields.NumberField({ min: 0, max: 10, integer: true }),
+					mags: new fields.NumberField({ min: 0, max: 10, integer: true }),
+					cells: new fields.NumberField({ min: 0, max: 10, integer: true }),
+				}),
+			}),
 			supplies: new fields.NumberField({
 				initial: 0,
 				min: 0,
 				integer: true
 			}),
+			materials: new fields.NumberField({
+				initial: 0,
+				min: 0,
+				integer: true
+			}),
+			pet: new fields.SchemaField({
+				name: new fields.StringField(),
+				info: new fields.StringField(),
+			}),
+			transport: new fields.SchemaField({
+				name: new fields.StringField(),
+				upkeep: new fields.NumberField({ min: 0, integer: true }),
+				info: new fields.StringField(),
+			}),
+			spells: new MappingField(
+				new fields.SchemaField({
+					name: new fields.StringField({ initial: ``, blank: true, trim: true }),
+					cost: new fields.NumberField({ initial: 0, min: 0 }),
+					info: new fields.StringField({ initial: ``, blank: true, trim: true }),
+				})
+			),
 			respawns: new fields.SchemaField({
 				r1: new fields.BooleanField(),
 				r2: new fields.BooleanField(),
@ -97,6 +152,7 @@ export class PlayerData extends foundry.abstract.TypeDataModel {
 				integer: true,
 				initial: 0,
 			}),
+			inventoryString: new fields.StringField({ blank: true, trim: true }),
 		};
 	};
 };
--- a/module/models/Item/Aspect.mjs
+++ b/module/models/Item/Aspect.mjs
@ -1,19 +1,11 @@
-import { DescribedItemData } from "./DescribedItemData.mjs";
-
-export class AspectItemData extends DescribedItemData {
+export class AspectItemData extends foundry.abstract.TypeDataModel {
 	static defineSchema() {
 		const fields = foundry.data.fields;
-		const parentSchema = super.defineSchema();
-
-		// Purge fields that I don't want in this schema
-		delete parentSchema.quantity;
-		delete parentSchema.quantity_affects_used_capacity;
-		delete parentSchema.usage_cost;
-
-		return foundry.utils.mergeObject(parentSchema, {
+		return {
 			used: new fields.BooleanField({ initial: false }),
 			/** The number of seconds that the effect of the aspect stays */
 			deactivateAfter: new fields.NumberField({ nullable: true }),
-		});
+			info: new fields.HTMLField({ nullable: true, blank: false, trim: true }),
+		};
 	};
 };
--- a/module/models/Item/CommonItemData.mjs
+++ b/module/models/Item/CommonItemData.mjs
@ -10,14 +10,6 @@ export class CommonItemData extends foundry.abstract.TypeDataModel {
 				nullable: false,
 				integer: true,
 			}),
-			uses_inventory_slot: new fields.BooleanField({
-				initial: true,
-				nullable: false,
-			}),
-			quantity_affects_used_capacity: new fields.BooleanField({
-				initial: true,
-				nullable: false,
-			}),
 			buy: new fields.NumberField({
 				initial: null,
 				nullable: true,
@ -29,21 +21,9 @@ export class CommonItemData extends foundry.abstract.TypeDataModel {
 				integer: true,
 			}),
 			tier: new fields.StringField({
-				initial: DOTDUNGEON.defaultItemTier,
-				nullable: false,
-				choices: DOTDUNGEON.itemTiers.map(tier => tier.value),
-			}),
-			/*
-			If this property is set to true, the item will be shown in the combat tab
-			list of items. This is shown whether or not the item is marked as "equipped".
-			*/
-			combat_relevant: new fields.BooleanField({
-				initial: false,
-				nullable: false,
-			}),
-			location: new fields.StringField({
-				initial: "",
+				initial: `simple`,
 				nullable: false,
+				choices: DOTDUNGEON.itemTiers,
 			}),
 		};
 	};
--- a/module/models/Item/DescribedItemData.mjs
+++ b/module/models/Item/DescribedItemData.mjs
@ -3,7 +3,7 @@ import { CommonItemData } from "./CommonItemData.mjs";
 export class DescribedItemData extends CommonItemData {
 	static defineSchema() {
 		const fields = foundry.data.fields;
-		return foundry.utils.mergeObject(super.defineSchema(), {
+		return mergeObject(super.defineSchema(), {
 			description: new fields.StringField({
 				initial: ``,
 				blank: true,
--- a/module/models/Item/Equipment.mjs
+++ b/module/models/Item/Equipment.mjs
@ -3,6 +3,12 @@ import { DescribedItemData } from "./DescribedItemData.mjs";
 export class EquipmentItemData extends DescribedItemData {
 	static defineSchema() {
 		const fields = foundry.data.fields;
-		return foundry.utils.mergeObject(super.defineSchema(), {});
+		return mergeObject(super.defineSchema(), {
+			extra_inventory: new fields.NumberField({
+				initial: null,
+				nullable: true,
+				required: false,
+			}),
+		});
 	};
 };
--- a/module/models/Item/Pet.mjs
+++ b/module/models/Item/Pet.mjs
@ -3,13 +3,7 @@ import { DescribedItemData } from "./DescribedItemData.mjs";
 export class PetItemData extends DescribedItemData {
 	static defineSchema() {
 		const fields = foundry.data.fields;
-		const parentSchema = super.defineSchema();
-
-		delete parentSchema.quantity;
-		delete parentSchema.quantity_affects_used_capacity;
-		delete parentSchema.usage_cost;
-
-		return foundry.utils.mergeObject(parentSchema, {
+		return mergeObject(super.defineSchema(), {
 			upkeep: new fields.NumberField({ initial: null, nullable: true }),
 			pokeballd: new fields.BooleanField({ initial: true }),
 		});
--- a/module/models/Item/Spell.mjs
+++ b/module/models/Item/Spell.mjs
@ -4,7 +4,7 @@ import DOTDUNGEON from "../../config.mjs";
 export class SpellItemData extends DescribedItemData {
 	static defineSchema() {
 		const fields = foundry.data.fields;
-		return foundry.utils.mergeObject(super.defineSchema(), {
+		return mergeObject(super.defineSchema(), {
 			skill: new fields.StringField({
 				initial: ``,
 				blank: true,
--- a/module/models/Item/Transportation.mjs
+++ b/module/models/Item/Transportation.mjs
@ -0,0 +1,28 @@
+import { DescribedItemData } from "./DescribedItemData.mjs";
+
+export class TransportationItemData extends DescribedItemData {
+	static defineSchema() {
+		const fields = foundry.data.fields;
+		return mergeObject(super.defineSchema(), {
+			single_trip: new fields.NumberField({
+				initial: null,
+				nullable: true,
+			}),
+			upkeep: new fields.NumberField({
+				initial: null,
+				nullable: true,
+			}),
+			can_be_in_inventory: new fields.BooleanField({
+				initial: false,
+			}),
+			inventory_slots: new fields.NumberField({
+				initial: 0,
+				min: 0,
+			}),
+			logon_bonus: new fields.NumberField({
+				initial: null,
+				nullable: true,
+			})
+		});
+	};
+};
--- a/module/models/Item/Weapon.mjs
+++ b/module/models/Item/Weapon.mjs
@ -1,24 +0,0 @@
-import { DescribedItemData } from "./DescribedItemData.mjs";
-import DOTDUNGEON from "../../config.mjs";
-
-export class WeaponItemData extends DescribedItemData {
-	static defineSchema() {
-		const fields = foundry.data.fields;
-		return foundry.utils.mergeObject(super.defineSchema(), {
-			damage: new fields.StringField({
-				initial: null,
-				nullable: true,
-				blank: true,
-				options: DOTDUNGEON.damageTypes,
-			}),
-			ranged: new fields.BooleanField({ initial: false, }),
-			scoped: new fields.BooleanField({ initial: false, }),
-			ammo: new fields.StringField({
-				initial: null,
-				nullable: true,
-				blank: true,
-				options: DOTDUNGEON.ammoTypes,
-			}),
-		});
-	};
-};
--- a/module/models/template.mjs
+++ b/module/models/template.mjs
@ -3,7 +3,7 @@ import { DescribedItemData } from "./DescribedItemData.mjs";
 export class TemplateData extends DescribedItemData {
 	static defineSchema() {
 		const fields = foundry.data.fields;
-		return foundry.utils.mergeObject(super.defineSchema(), {
+		return mergeObject(super.defineSchema(), {
 		});
 	};
 };
--- a/module/settings/world_settings.mjs
+++ b/module/settings/world_settings.mjs
@ -9,16 +9,6 @@ export default function() {
 		requiresReload: false,
 	});

-	game.settings.register(`dotdungeon`, `materialsAffectCapacity`, {
-		name: `dotdungeon.settings.materialsAffectCapacity.name`,
-		hint: `dotdungeon.settings.materialsAffectCapacity.description`,
-		scope: `world`,
-		config: true,
-		type: Boolean,
-		default: true,
-		requiresReload: false,
-	});
-
 	game.settings.register(`dotdungeon`, `resourcesOrSupplies`, {
 		name: `dotdungeon.settings.resourcesOrSupplies.name`,
 		hint: `dotdungeon.settings.resourcesOrSupplies.description`,
--- a/module/sheets/Actors/PC/PlayerSheetV2.mjs
+++ b/module/sheets/Actors/PC/PlayerSheetV2.mjs
@ -1,172 +0,0 @@
-import { GenericActorSheet } from "../../GenericActorSheet.mjs";
-import DOTDUNGEON from "../../../config.mjs";
-import { localizer } from "../../../utils/localizer.mjs";
-import { modifierToString } from "../../../utils/modifierToString.mjs";
-import { GenericContextMenu } from "../../../utils/GenericContextMenu.mjs";
-
-export class PlayerSheetv2 extends GenericActorSheet {
-	static get defaultOptions() {
-		let opts = foundry.utils.mergeObject(
-			super.defaultOptions,
-			{
-				template: `systems/dotdungeon/templates/actors/char-sheet/v2/sheet.hbs`,
-				tabs: [
-					{
-						group: `page`,
-						navSelector: `nav.page`,
-						contentSelector: `.page-content`,
-						initial: `inventory`,
-					},
-					{
-						group: `inventory`,
-						navSelector: `nav.inventory`,
-						contentSelector: `.tab[data-tab="inventory"]`,
-						initial: `player`,
-					}
-				],
-			}
-		);
-		opts.classes.push(`style-v3`);
-		return opts;
-	};
-
-	activateListeners(html) {
-		super.activateListeners(html);
-
-		if (this.document.isEmbedded) return;
-		if (!this.isEditable) return;
-		console.debug(`.dungeon | Adding event listeners for Actor: ${this.id}`);
-
-		html.find(`.create-ae`).on(`click`, async ($e) => {
-			console.debug(`Creating an ActiveEffect?`);
-			const ae = this.actor.createEmbeddedDocuments(`ActiveEffect`, [{name: "Default AE"}]);
-			ae.sheet.render(true);
-		});
-		html.find(`[data-filter-toggle]`).on(`change`, ($e) => {
-			const target = $e.delegateTarget;
-			const filter = target.dataset.filterToggle;
-			this.toggleItemFilter(filter);
-			this._renderInner();
-		});
-
-		// Make materials be able to be edited/deleted
-		new GenericContextMenu(html, `.material`, [
-			{
-				name: localizer(`dotdungeon.common.edit`),
-				callback: (html) => {
-					const data = html[0].dataset;
-					this.openEmbeddedSheet.bind(this)(data.embeddedId);
-				},
-			},
-			{
-				name: localizer(`dotdungeon.common.delete`),
-				callback: (html) => {
-					const data = html[0].dataset;
-					this.genericEmbeddedDelete.bind(this)(data.embeddedId);
-				},
-			},
-		]);
-	};
-
-	async getData() {
-		const ctx = await super.getData();
-		/** @type {ActorHandler} */
-		const actor = this.actor;
-
-		ctx.preAE = actor.preAE;
-		ctx.system = actor.system;
-		ctx.flags = actor.flags;
-		ctx.items = this.actor.itemTypes;
-
-		ctx.computed = {
-			canChangeGroup: ctx.settings.playersCanChangeGroup || ctx.isGM,
-			canAddAspect: !this.actor.atAspectLimit,
-			stats: this.#statData,
-			itemFilters: this.#itemFilters,
-			noItemTypesVisible: this._itemTypesHidden.size === DOTDUNGEON.itemFilters.length,
-			capacity: this.#inventoryCapacity,
-		};
-		console.log(ctx)
-		return ctx;
-	};
-
-	get #statData() {
-		const stats = [];
-		const usedDice = new Set(Object.values(this.actor.system.stats));
-		for (const statName in this.actor.system.stats) {
-			const stat = {
-				key: statName,
-				name: localizer(`dotdungeon.stat.${statName}`),
-				original: this.actor.preAE.stats[statName],
-				value: this.actor.system.stats[statName],
-			};
-
-			/*
-			Determine what dice are available to the user in the dropdown
-			selector. Disables all dice options that are selected, but not used
-			by this stat.
-			*/
-			stat.dieOptions = [
-				{ label: `---`, value: `` },
-				...DOTDUNGEON.statDice.map(die => {
-					return {
-						value: die,
-						label: localizer(`dotdungeon.die.${die}`, { stat: statName }),
-						disabled: usedDice.has(die) && this.actor.preAE.stats[statName] !== die,
-					};
-				})
-			];
-
-			/*
-			Calculating the data needed in order to display all of the skills
-			for this character.
-			*/
-			stat.skills = [];
-			for (const skill in this.actor.system.skills[statName]) {
-				const value = this.actor.system.skills[statName][skill];
-				stat.skills.push({
-					key: skill,
-					name: game.i18n.format(`dotdungeon.skills.${skill}`),
-					value,
-					original: this.actor.preAE.skills[statName][skill],
-					formula: `1` + stat.value + modifierToString(value, { spaces: true }),
-					rollDisabled: this.actor.preAE.skills[statName][skill] === -1,
-				});
-			};
-
-			stats.push(stat);
-		};
-		return stats;
-	};
-
-	_itemTypesHidden = new Set([`armour`, `equipment`, `structure`, `service`]);
-	toggleItemFilter(filterName) {
-		if (this._itemTypesHidden.has(filterName)) {
-			this._itemTypesHidden.delete(filterName);
-		} else {
-			this._itemTypesHidden.add(filterName);
-		};
-		this.render();
-	};
-
-	get #itemFilters() {
-		const types = DOTDUNGEON.itemFilters;
-		const filters = {};
-		for (const type of types) {
-			filters[type] = {
-				label: localizer(`TYPES.Item.${type}`),
-				active: !this._itemTypesHidden.has(type),
-				createLabel: localizer(`dotdungeon.sheet.actor.v2.create-item`, {type}),
-			};
-		};
-		return filters;
-	};
-
-	get #inventoryCapacity() {
-		return {
-			used: this.actor.items
-				.reduce((sum, i) => sum + i.usedCapacity, 0),
-			max: this.actor.system.inventory_slots,
-		};
-	};
-}
--- a/module/sheets/Datasheets/GroupDataSheet.mjs
+++ b/module/sheets/Datasheets/GroupDataSheet.mjs
@ -1,31 +0,0 @@
-export class GroupDataSheet extends ActorSheet {
-	static get defaultOptions() {
-		let opts = foundry.utils.mergeObject(
-			super.defaultOptions,
-			{
-				template: `systems/dotdungeon/templates/datasheets/actor/group.hbs`,
-				width: 200,
-				height: 275
-			},
-		);
-		opts.classes.push(`dotdungeon`, `style-v3`);
-		return opts;
-	};
-
-	async getData() {
-		const ctx = {};
-
-		ctx.actor = this.actor;
-		ctx.system = this.actor.system;
-
-		ctx.computed = {
-			milestones_hit_viewable: [...this.actor.system.milestones_hit.values()].join(`, `)
-		}
-
-		ctx.meta = {
-			idp: this.actor.uuid,
-		};
-
-		return ctx;
-	};
-};
--- a/module/sheets/Datasheets/UntypedDataSheet.mjs
+++ b/module/sheets/Datasheets/UntypedDataSheet.mjs
@ -1,27 +0,0 @@
-export class UntypedDataSheet extends ItemSheet {
-	static get defaultOptions() {
-		let opts = foundry.utils.mergeObject(
-			super.defaultOptions,
-			{
-				template: `systems/dotdungeon/templates/datasheets/untyped.hbs`,
-				width: 650,
-				height: 700
-			},
-		);
-		opts.classes.push(`dotdungeon`, `style-v3`);
-		return opts;
-	};
-
-	async getData() {
-		const ctx = {};
-
-		ctx.item = this.item;
-		ctx.system = this.item.system;
-
-		ctx.meta = {
-			idp: this.item.uuid,
-		};
-
-		return ctx;
-	};
-};
--- a/module/sheets/GenericActorSheet.mjs
+++ b/module/sheets/GenericActorSheet.mjs
@ -1,18 +1,6 @@
-import { localizer } from "../utils/localizer.mjs";
 import DOTDUNGEON from "../config.mjs";

 export class GenericActorSheet extends ActorSheet {
-	static get defaultOptions() {
-		let opts = foundry.utils.mergeObject(
-			super.defaultOptions,
-			{
-				scrollY: [`.scrollable`],
-			}
-		);
-		opts.classes.push(`dotdungeon`);
-		return opts;
-	};
-
 	_expanded = new Set();

 	#propogatedSettings = [
@ -40,7 +28,7 @@ export class GenericActorSheet extends ActorSheet {

 		ctx.actor = this.actor;
 		ctx.config = DOTDUNGEON;
-		ctx.icons = {};
+		ctx.icons = CONFIG.CACHE.icons;

 		return ctx;
 	};
@ -52,45 +40,24 @@ export class GenericActorSheet extends ActorSheet {
 		if (!this.isEditable) return;
 		console.debug(`.dungeon | Generic sheet adding listeners`);

-		/*
-		Custom element event listeners because Foundry doesn't listen to them by
-		default.
-		*/
-		html.find(
-			CONFIG.CACHE.componentListeners.map(n => `${n}[name]`).join(`,`)
-		).on(`change`, () => this._onChangeInput.bind(this));
-
-		/*
-		Utility event listeners that apply
-		*/
-		html.find(`[data-collapse-id]`).on(`click`, this._handleSummaryToggle.bind(this));
+		html.find(`summary`).on(`click`, this._handleSummaryToggle.bind(this));
 		html.find(`[data-roll-formula]`).on(`click`, this._handleRoll.bind(this));
 		html.find(`[data-embedded-update-on="change"]`)
-			.on(`change`, this.genericEmbeddedUpdate.bind(this));
+			.on(`change`, this.actor.genericEmbeddedUpdate.bind(this.actor));
 		html.find(`[data-embedded-update-on="blur"]`)
-			.on(`blur`, this.genericEmbeddedUpdate.bind(this));
+			.on(`blur`, this.actor.genericEmbeddedUpdate.bind(this.actor));
 		html.find(`[data-embedded-delete]`)
-			.on(`click`, ($e) => {
-				const id = $e.currentTarget.dataset.embeddedDelete;
-				this.genericEmbeddedDelete.bind(this)(id);
-			});
+			.on(`click`, this.actor.genericEmbeddedDelete.bind(this.actor));
 		html.find(`[data-embedded-create]`)
-			.on(`click`, this.genericEmbeddedCreate.bind(this));
+			.on(`click`, this.actor.genericEmbeddedCreate.bind(this.actor));
 		html.find(`[data-message-type]`)
-			.on(`click`, this.genericSendToChat.bind(this));
+			.on(`click`, this.actor.genericSendToChat.bind(this.actor));
 		html.find(`[data-embedded-edit]`)
-			.on(`click`, ($e) => {
-				const id = $e.currentTarget.dataset.embeddedEdit;
-				this.openEmbeddedSheet.bind(this)(id);
-			})
+			.on(`click`, this.actor.openEmbeddedSheet.bind(this.actor));
 		html.find(`button[data-increment]`)
 			.on(`click`, this._incrementValue.bind(this));
 		html.find(`button[data-decrement]`)
 			.on(`click`, this._decrementValue.bind(this));
-		html.find(`button[data-embedded-increment]`)
-			.on(`click`, this.genericEmbeddedIncrement.bind(this));
-		html.find(`button[data-embedded-decrement]`)
-			.on(`click`, this.genericEmbeddedDecrement.bind(this));
 	};

 	async _handleRoll($e) {
@ -131,118 +98,20 @@ export class GenericActorSheet extends ActorSheet {
 	};

 	async _handleSummaryToggle($e) {
-		$e.stopPropagation();
-		let target = $e.currentTarget;
-		let parent = target.closest(`.collapse`);
-		let data = target.dataset;
-		console.debug(`.dungeon | Collapse ID: ${data.collapseId}`);
+		let data = $e.currentTarget.dataset;
+		let open = $e.currentTarget.parentNode.open;
+		console.debug(`.dungeon | Collapse ID: ${data.collapseId} (open: ${open})`);

-		if (!this._expanded.has(data.collapseId)) {
+		/*
+		This seeming inversion of logic is due to the fact that this handler
+		gets called before the element is updated to include/reflect the
+		change, so if the parentNode doesn't actually have it, then we're
+		opening it and vice-versa.
+		*/
+		if (!open) {
 			this._expanded.add(data.collapseId);
-			parent.setAttribute(`open`, ``);
 		} else {
 			this._expanded.delete(data.collapseId);
-			parent.removeAttribute(`open`, ``);
 		};
 	};
-
-	async openEmbeddedSheet(item_id) {
-		let item = await fromUuid(item_id);
-		item?.sheet.render(true);
-	};
-
-	async genericEmbeddedCreate($event) {
-		const data = $event.currentTarget.dataset;
-		if (!this[`createCustom${data.embeddedCreate}`]) {
-			this.actor.createEmbeddedItem({
-				type: data.embeddedCreate,
-				name: localizer(
-					`dotdungeon.default.name`,
-					{ document: `Item`, type: data.embeddedCreate }
-				),
-			});
-		} else {
-			this[`createCustom${data.embeddedCreate}`]($event);
-		};
-	};
-
-	async genericEmbeddedUpdate($event) {
-		const target = $event.currentTarget;
-		const data = target.dataset;
-		const item = await fromUuid(data.embeddedId);
-
-		let value = target.value;
-		switch (target.type) {
-			case "checkbox": value = target.checked; break;
-		};
-
-		await item?.update({ [data.embeddedUpdate]: value });
-	};
-
-	async genericEmbeddedIncrement($event) {
-		const target = $event.currentTarget;
-		const data = target.dataset;
-		const item = await fromUuid(data.embeddedId);
-		const value = getProperty(item, data.embeddedIncrement);
-		if (typeof value != "number") {
-			return;
-		};
-		await item?.update({ [data.embeddedIncrement]: value + 1 });
-	};
-
-	async genericEmbeddedDecrement($event) {
-		const target = $event.currentTarget;
-		const data = target.dataset;
-		const item = await fromUuid(data.embeddedId);
-		const value = getProperty(item, data.embeddedDecrement);
-		if (typeof value != "number") {
-			return;
-		};
-		await item?.update({ [data.embeddedDecrement]: value - 1 });
-	};
-
-	async genericEmbeddedDelete(item_uuid) {
-		let item = await fromUuid(item_uuid);
-
-		if (!item) {
-			ui.notifications.error(
-				`dotdungeon.notification.error.item-not-found`,
-				{ console: false }
-			);
-			return;
-		};
-
-		Dialog.confirm({
-			title: game.i18n.format(
-				`dotdungeon.dialogs.${item.type}.delete.title`,
-				item
-			),
-			content: game.i18n.format(
-				`dotdungeon.dialogs.${item.type}.delete.content`,
-				item
-			),
-			yes: () => {
-				item.delete();
-			},
-			defaultYes: false,
-		});
-	};
-
-	async genericSendToChat($event) {
-		const data = $event.currentTarget.dataset;
-		const type = data.messageType;
-		if (this[`send${type}ToChat`]) {
-			return await this[`send${type}ToChat`]($event);
-		};
-		if (!data.messageContent) {
-			console.warn(`.dungeon | Tried to send a chat message with no content`);
-			return;
-		};
-		let message = await ChatMessage.create({
-			content: data.messageContent,
-			flavor: data.messageFlavor,
-			speaker: { actor: this.actor },
-		});
-		message.render();
-	};
 };
--- a/module/sheets/Items/AspectSheet.mjs
+++ b/module/sheets/Items/AspectSheet.mjs
@ -2,7 +2,7 @@ import { GenericItemSheet } from "./GenericItemSheet.mjs";

 export class AspectSheet extends GenericItemSheet {
 	static get defaultOptions() {
-		let opts = foundry.utils.mergeObject(
+		let opts = mergeObject(
 			super.defaultOptions,
 			{
 				template: `systems/dotdungeon/templates/items/aspect.hbs`,
@ -22,7 +22,7 @@ export class AspectSheet extends GenericItemSheet {
 	};

 	async getData() {
-		const ctx = await super.getData();
+		const ctx = {};
 		return ctx;
 	};
 };
--- a/module/sheets/Items/GenericItemSheet.mjs
+++ b/module/sheets/Items/GenericItemSheet.mjs
@ -1,4 +1,3 @@
-import { DialogManager } from "../../utils/DialogManager.mjs";
 import DOTDUNGEON from "../../config.mjs";

 export class GenericItemSheet extends ItemSheet {
@ -11,6 +10,13 @@ export class GenericItemSheet extends ItemSheet {
 		`resourcesOrSupplies`,
 	];

+	activateListeners(html) {
+		super.activateListeners(html);
+
+		if (!this.isEditable) return;
+		console.debug(`.dungeon | Adding event listeners for Generic Item: ${this.id}`);
+	};
+
 	async getData() {
 		const ctx = {};

@ -30,57 +36,10 @@ export class GenericItemSheet extends ItemSheet {
 		ctx.item = this.item;
 		ctx.system = this.item.system;
 		ctx.flags = this.item.flags;
-		ctx.effects = this.item.effects;

 		ctx.config = DOTDUNGEON;
-		ctx.icons = {};
+		ctx.icons = CONFIG.CACHE.icons;

 		return ctx;
 	};
-
-	activateListeners(html) {
-		super.activateListeners(html);
-
-		if (!this.isEditable) return;
-		console.debug(`.dungeon | Adding event listeners for Generic Item: ${this.id}`);
-		html.find(`button[data-increment]`)
-			.on(`click`, this._incrementValue.bind(this));
-		html.find(`button[data-decrement]`)
-			.on(`click`, this._decrementValue.bind(this));
-
-
-		html.find(`[data-help-id]`)
-			.on(`click`, this._helpPopup.bind(this));
-	};
-
-	async _incrementValue($e) {
-		const target = $e.currentTarget;
-		const data = target.dataset;
-		const value = getProperty(this.actor, data.increment);
-		if (typeof value != "number") {
-			return;
-		};
-		this.actor.update({ [data.increment]: value + 1 });
-	};
-
-	async _decrementValue($e) {
-		const target = $e.currentTarget;
-		const data = target.dataset;
-		const value = getProperty(this.actor, data.decrement);
-		if (typeof value != "number") {
-			return;
-		};
-		this.actor.update({ [data.decrement]: value - 1 });
-	};
-
-	async _helpPopup($e) {
-		const target = $e.currentTarget;
-		const data = target.dataset;
-		if (!data.helpId) return;
-		DialogManager.helpDialog(
-			data.helpId,
-			data.helpContent,
-			data.helpTitle
-		);
-	};
 };
--- a/module/sheets/Items/PetSheet.mjs
+++ b/module/sheets/Items/PetSheet.mjs
@ -2,7 +2,7 @@ import { GenericItemSheet } from "./GenericItemSheet.mjs";

 export class PetSheet extends GenericItemSheet {
 	static get defaultOptions() {
-		let opts = foundry.utils.mergeObject(
+		let opts = mergeObject(
 			super.defaultOptions,
 			{
 				template: `systems/dotdungeon/templates/items/pet.hbs`,
--- a/module/sheets/Items/SpellSheet.mjs
+++ b/module/sheets/Items/SpellSheet.mjs
@ -2,7 +2,7 @@ import { GenericItemSheet } from "./GenericItemSheet.mjs";

 export class SpellSheet extends GenericItemSheet {
 	static get defaultOptions() {
-		let opts = foundry.utils.mergeObject(
+		let opts = mergeObject(
 			super.defaultOptions,
 			{
 				template: `systems/dotdungeon/templates/items/spell.hbs`,
--- a/module/sheets/Items/UntypedItemSheet.mjs
+++ b/module/sheets/Items/UntypedItemSheet.mjs
@ -1,116 +1,21 @@
-import { GenericContextMenu } from "../../utils/GenericContextMenu.mjs";
-import { DialogManager } from "../../utils/DialogManager.mjs";
 import { GenericItemSheet } from "./GenericItemSheet.mjs";
-import { localizer } from "../../utils/localizer.mjs";

 export class UntypedItemSheet extends GenericItemSheet {
 	static get defaultOptions() {
-		let opts = foundry.utils.mergeObject(
+		let opts = mergeObject(
 			super.defaultOptions,
 			{
-				template: `systems/dotdungeon/templates/items/untyped/v2/index.hbs`,
-				width: 300,
+				template: `systems/dotdungeon/templates/items/custom.hbs`,
+				width: 280,
 				height: 340,
-				tabs: [
-					{
-						group: `page`,
-						navSelector: `nav.page`,
-						contentSelector: `.page-content`,
-						initial: `general`,
-					},
-				],
 			}
 		);
-		opts.classes.push(`dotdungeon`, `style-v3`);
+		opts.classes.push(`dotdungeon`);
 		return opts;
 	};

-	activateListeners(html) {
-		super.activateListeners(html);
-
-		new GenericContextMenu(html, `.photo.panel`, [
-			{
-				name: localizer(`dotdungeon.common.view-larger`),
-				callback: () => {
-					(new ImagePopout(this.item.img)).render(true);
-				},
-			},
-			{
-				name: localizer(`dotdungeon.common.edit`),
-				condition: () => this.isEditable,
-				callback: () => {
-					const fp = new FilePicker({
-						callback: (path) => {
-							this.item.update({"img": path});
-						},
-					});
-					fp.render(true);
-				},
-			},
-			{
-				name: localizer(`dotdungeon.common.reset`),
-				condition: () => this.isEditable,
-				callback: () => {
-					console.log(`.dungeon | Reset Item Image`)
-				},
-			}
-		]);
-
-		if (!this.isEditable) return;
-		console.debug(`.dungeon | Adding event listeners for Untyped Item: ${this.item.id}`);
-
-		html.find(`.create-ae`).on(`click`, async () => {
-			await this.item.createEmbeddedDocuments(
-				`ActiveEffect`,
-				[{name: localizer(`dotdungeon.default.name`, { document: `ActiveEffect`, type: `base` })}],
-				{ renderSheet: true }
-			);
-		});
-
-		new GenericContextMenu(html, `.effect.panel`, [
-			{
-				name: localizer(`dotdungeon.common.edit`),
-				callback: async (html) => {
-					(await fromUuid(html.closest(`.effect`)[0].dataset.embeddedId))?.sheet.render(true);
-				},
-			},
-			{
-				name: localizer(`dotdungeon.common.delete`),
-				callback: async (html) => {
-					const target = html.closest(`.effect`)[0];
-					const data = target.dataset;
-					const id = data.embeddedId;
-					const doc = await fromUuid(id);
-					DialogManager.createOrFocus(
-						`${doc.uuid}-delete`,
-						{
-							title: localizer(`dotdungeon.delete.ActiveEffect.title`, doc),
-							content: localizer(`dotdungeon.delete.ActiveEffect.content`, doc),
-							buttons: {
-								yes: {
-									label: localizer(`Yes`),
-									callback() {
-										doc.delete();
-									},
-								},
-								no: {
-									label: localizer(`No`),
-								}
-							}
-						}
-					);
-				},
-			}
-		]);
-	};
-
 	async getData() {
 		const ctx = await super.getData();
-
-		ctx.meta.showSettingsTab = ctx.isGM || this.item.isOwned;
-		ctx.meta.isEmbedded = this.item.isOwned;
-		ctx.meta.isEditable = this.isEditable;
-
 		return ctx;
 	};
 };
--- a/module/sheets/MobSheet.mjs
+++ b/module/sheets/MobSheet.mjs
@ -1,9 +1,10 @@
+import { ActorHandler } from "../documents/Actor/Handler.mjs";
 import { GenericActorSheet } from "./GenericActorSheet.mjs";
 import { DiceList } from "../dialogs/DiceList.mjs";

 export class MobSheet extends GenericActorSheet {
 	static get defaultOptions() {
-		let opts = foundry.utils.mergeObject(
+		let opts = mergeObject(
 			super.defaultOptions,
 			{
 				template: `systems/dotdungeon/templates/actors/mobs/main.hbs`,
--- a/module/sheets/PlayerSheet.mjs
+++ b/module/sheets/PlayerSheet.mjs
@ -1,11 +1,12 @@
+import { ActorHandler } from "../documents/Actor/Handler.mjs";
 import { GenericActorSheet } from "./GenericActorSheet.mjs";

-export class MVPPCSheet extends GenericActorSheet {
+export class PlayerSheet extends GenericActorSheet {

 	/** @override {ActorHandler} actor */

 	static get defaultOptions() {
-		let opts = foundry.utils.mergeObject(
+		let opts = mergeObject(
 			super.defaultOptions,
 			{
 				template: `systems/dotdungeon/templates/actors/char-sheet-mvp/sheet.hbs`
@ -34,7 +35,7 @@ export class MVPPCSheet extends GenericActorSheet {

 		ctx.computed = {
 			canChangeGroup: ctx.settings.playersCanChangeGroup || ctx.isGM,
-			canAddAspect: !this.actor.atAspectLimit,
+			canAddAspect: !await actor.proxyFunction.bind(actor)(`atAspectLimit`),
 		};

 		return ctx;
--- a/module/sheets/SyncVariations/AbstractSyncSheet.mjs
+++ b/module/sheets/SyncVariations/AbstractSyncSheet.mjs
@ -2,7 +2,7 @@ import { GenericActorSheet } from "../GenericActorSheet.mjs";

 export class AbstractSyncSheet extends GenericActorSheet {
 	static get defaultOptions() {
-		let opts = foundry.utils.mergeObject(
+		let opts = mergeObject(
 			super.defaultOptions,
 			{
 				width: 200,
--- a/module/utils/DialogManager.mjs
+++ b/module/utils/DialogManager.mjs
@ -1,83 +0,0 @@
-import { localizer } from "./localizer.mjs";
-
-/**
- * A utility class that allows managing Dialogs that are created for various
- * purposes such as deleting items, help popups, etc. This is a singleton class
- * that upon instantiating after the first time will just return the first instance
- */
-export class DialogManager {
-
-	/** @type {Map<string, Dialog>} */
-	static #dialogs = new Map();
-
-	/**
-	 * Focuses a dialog if it already exists, or creates a new one and renders it.
-	 *
-	 * @param {string} dialogId The ID to associate with the dialog, should be unique
-	 * @param {object} data The data to pass to the Dialog constructor
-	 * @param {DialogOptions} opts The options to pass to the Dialog constructor
-	 * @returns {Dialog} The Dialog instance
-	 */
-	static async createOrFocus(dialogId, data, opts = {}) {
-		if (DialogManager.#dialogs.has(dialogId)) {
-			const dialog = DialogManager.#dialogs.get(dialogId);
-			dialog.bringToTop();
-			return dialog;
-		};
-
-		/*
-		This makes sure that if I provide a close function as a part of the data,
-		that the dialog still gets removed from the set once it's closed, otherwise
-		it could lead to dangling references that I don't care to keep. Or if I don't
-		provide the close function, it just sets the function as there isn't anything
-		extra that's needed to be called.
-		*/
-		if (data?.close) {
-			const provided = data.close;
-			data.close = () => {
-				DialogManager.#dialogs.delete(dialogId);
-				provided();
-			};
-		}
-		else {
-			data.close = () => DialogManager.#dialogs.delete(dialogId);
-		};
-
-		// Create the Dialog with the modified data
-		const dialog = new Dialog(data, opts);
-		DialogManager.#dialogs.set(dialogId, dialog);
-		dialog.render(true);
-		return dialog;
-	};
-
-	/**
-	 * Closes a dialog if it is rendered
-	 *
-	 * @param {string} dialogId The ID of the dialog to close
-	 */
-	static async close(dialogId) {
-		const dialog = DialogManager.#dialogs.get(dialogId);
-		dialog?.close();
-	};
-
-	static async helpDialog(
-		helpId,
-		helpContent,
-		helpTitle = `dotdungeon.common.help`,
-		localizationData = {},
-	) {
-		DialogManager.createOrFocus(
-			helpId,
-			{
-				title: localizer(helpTitle, localizationData),
-				content: localizer(helpContent, localizationData),
-				buttons: {},
-			},
-			{ resizable: true, }
-		);
-	};
-
-	static get size() {
-		return DialogManager.#dialogs.size;
-	}
-};
--- a/module/utils/GenericContextMenu.mjs
+++ b/module/utils/GenericContextMenu.mjs
@ -1,6 +0,0 @@
-export class GenericContextMenu extends ContextMenu {
-	constructor(element, selector, menuItems, opts = {}) {
-		super(element, selector, menuItems, opts);
-		this.menuItems.forEach(i => i.icon ??= ``);
-	};
-};
--- a/module/utils/localizer.mjs
+++ b/module/utils/localizer.mjs
@ -1,37 +0,0 @@
-import { localizerConfig } from "../config.mjs";
-
-export function handlebarsLocalizer(key, ...args) {
-	let data = args[0]
-	if (args.length === 1) data = args[0].hash;
-	if (key instanceof Handlebars.SafeString) key = key.toString();
-	const localized = localizer(key, data);
-	return localized;
-};
-
-export function localizer(key, args = {}, depth = 0) {
-	/** @type {string} */
-	let localized = game.i18n.format(key, args);
-	const subkeys = localized.matchAll(localizerConfig.subKeyPattern);
-
-	// Short-cut to help prevent infinite recursion
-	if (depth > localizerConfig.maxDepth) {
-		return localized;
-	};
-
-	/*
-	Helps prevent recursion on the same key so that we aren't doing excess work.
-	*/
-	const localizedSubkeys = new Map();
-	for (const match of subkeys) {
-		const subkey = match.groups.key;
-		if (localizedSubkeys.has(subkey)) continue;
-		localizedSubkeys.set(subkey, localizer(subkey, args, depth + 1));
-	};
-
-	return localized.replace(
-		localizerConfig.subKeyPattern,
-		(_fullMatch, subkey) => {
-			return localizedSubkeys.get(subkey);
-		}
-	);
-};
--- a/module/utils/modifierToString.mjs
+++ b/module/utils/modifierToString.mjs
@ -1,18 +0,0 @@
-/**
- * Takes in an integer and converts it into a string format that can be used in
- * roll formulas or for displaying to the user.
- *
- * @param {number} mod The modifier to stringify
- * @param {object} opts
- * @param {boolean} opts.spaces Puts spaces on either side of the operand
- * @returns {string}
- */
-export function modifierToString(mod, opts = {}) {
-	if (mod == 0) return ``;
-
-	let value = [``, `+`, mod]
-	if (mod < 0) {
-		value = [``, `-`, Math.abs(mod)]
-	};
-	return value.join(opts.spaces ? ` ` : ``);
-};
--- a/new-pc-sheet.md
+++ b/new-pc-sheet.md
@ -1,80 +0,0 @@
-## Tabs:
- Main
-	- Stats
-	- Skills
- Inventory
-	- Player
-		- Containers
-		- Inventory (divided into category of items)
-			- This is the items that the player will have "on them"
-	- Storage (divided into category of items)
-		- This is all of the items that the players owns and has put into storage *somewhere*
-	- Transportation
- Combat
-	- Easy skill buttons:
-		- Melee
-		- Accuracy
-	- Weapons
-	- Sync / Respawns
- Info
-	- Account name
-	- PFP
-	- Group name
-	- Aspects
-	- Roles
- Spells
-
-======
-
-## Requirements:
-
-Stats:
-	- Needs to list all 6 of the primary stats
-	- Needs to have a dropdown for to select a die
-		- Nice to have: disables dice that have been selected in other stats
-	- Needs to have a button to roll the stat (when a die is selected)
-	- Foundry v12: ActiveEffect - Die needs to be able to be affected by ActiveEffects
-
-Skills:
-	- Each of the 25 skills needs to be grouped under a header of what stat it's
-		associated with
-	- Each skill must have a dropdown to indicate training level (null, trained,
-		expert, locked)
-	- Every skill must have a button to roll the dice that is labelled with the
-		correct formula for that skill (or "Locked" if the skill is locked)
-	- ActiveEffect - Increase Modifier
-	- Foundry v12: ActiveEffect - Increase Training Level
-
-Combat:
-	- Two weapon slots for the equipped weapon(s)
-	- A single armor slot
-	- Quick-access to the Melee / Accuracy skills
-
-Inventory:
-	- Needs three sub-tabs:
-		- Player
-		- Storage
-		- Transportation
-	- Player Subtab:
-		- Needs to have a section for container items, and indicating how many slots
-			each one has.
-		- List all of the items that the player has with the "inventory" location
-		- Show the total number of items the player on their character and how many
-			total slots are available
-		- Needs some way to move items to a different storage area (embedded-only
-			item sheet field maybe)
-	- Storage Subtab:
-		- List all of the items that the player has marked as in-storage
-	- Transportation:
-		- This is currently just a placeholder tab, no functionality needed other
-			than existing
-
-Spells:
-	- Lists all spells on a page (sortable by: alphabetical, cost, etc.)
-
-Info:
-	- Needs a place to edit the actor's name
-	- Needs a place to edit the actor's image
-	- Needs a place to edit the group name (if enabled by the GM, or is the GM)
-	- Needs a place to see and manage all equipped aspects
-	- Needs a place to see and manage all equipped roles
--- a/scripts/buildCompendia.mjs
+++ b/scripts/buildCompendia.mjs
@ -29,4 +29,4 @@ async function main() {
 	console.log(`Finished packing compendia`)
 };

-main();
+main();
--- a/scripts/extractCompendia.mjs
+++ b/scripts/extractCompendia.mjs
@ -24,4 +24,4 @@ async function main() {
 	console.log(`Finished unpacking compendia`);
 };

-main();
+main();
--- a/scripts/macros/deleteInvalidActors.mjs
+++ b/scripts/macros/deleteInvalidActors.mjs
@ -1,4 +0,0 @@
-const invalids = game.actors.invalidDocumentIds;
-invalids.forEach(id => {
-	game.actors.getInvalid(id).delete();
-});
--- a/scripts/macros/deleteInvalidItems.mjs
+++ b/scripts/macros/deleteInvalidItems.mjs
@ -1,4 +0,0 @@
-const invalids = game.items.invalidDocumentIds;
-invalids.forEach(id => {
-	game.items.getInvalid(id).delete();
-});
--- a/scripts/preventLocalizationCycles.mjs
+++ b/scripts/preventLocalizationCycles.mjs
@ -1,76 +0,0 @@
-/*
-The purpose of this script is to validate all of the language files to ensure
-that there are no cycles in them to prevent infinite recursion. This must pull
-the pattern to match subkeys on via the config, otherwise this could result in
-inconsistencies with the localizer logic.
-*/
-
-import { readFile } from "fs/promises";
-
-class Node {
-	/** @type {Array<Node>} */
-	connectsTo = [];
-
-	/** @type {boolean} */
-	visited = false;
-
-	/** @type {boolean} */
-	finished = false;
-
-	id;
-	constructor(data) { this.id = data; };
-};
-
-/**
- * @param {object | string} lang The localization object to convert into a graph
- * @returns {Promise<Array<Node> | Node>}
- */
-async function createGraph(data) {
-	throw new Error(`createGraph not Implemented Yet`);
-};
-
-/**
- * @param {Node} from
- * @returns {Promise<boolean|void>}
- */
-async function depthFirstSearch(from) {
-	if (from.finished) return false;
-	if (from.visited) return true;
-	from.visited = true;
-	for (const neighbour of from.connectsTo) {
-		if (depthFirstSearch(neighbour)) return true;
-	};
-	from.finished = true;
-	return false;
-};
-
-/**
- * @param {Array<Node>} graph
- */
-async function checkForCycles(graph) {
-	for (const node of graph) {
-		if (node.finished) {
-			console.log(`skipping node: ${node.id}`);
-			continue;
-		}
-		if (depthFirstSearch(node)) {
-			console.log(`cycle found in node: ${node.id}`);
-		};
-	};
-};
-
-async function main() {
-	/*
-	Process:
-		- Load the system.json to identify all lang files
-		- Iterate through defined languages
-			- Construct a graph from the language file
-			- Iterate through nodes checking for a cycle
-	*/
-	const lang = JSON.parse(await readFile("test.lang") ?? "{}");
-	const graph = await createGraph(lang);
-	console.log(graph)
-	// await checkForCycles(graph);
-};
-
-main();
--- a/scripts/updateSystem.mjs
+++ b/scripts/updateSystem.mjs
@ -1,13 +0,0 @@
-/*
-Takes the system.json and updates all the release-specific properties in it to
-help prevent erroneous updates from being made when using the local package for
-development.
-
---
-
-Set the "manifest" property to:
-	"url" property + "/releases/latest/download/system.json"
-
-Set the "download" property to:
-	"url" property + "/releases/download/{version number}/{zip_name}.zip"
-*/
--- a/styles/dialog/DiceList.scss
+++ b/styles/dialog/DiceList.scss
@ -1,9 +1,9 @@
-.dotdungeon:not(.style-v3):has(.dialog--dice-list) {
+.dotdungeon:has(.dialog--dice-list) {
 	max-width: 275px;
 	min-width: 275px;
 }

-.dotdungeon:not(.style-v3) .dialog--dice-list {
+.dotdungeon .dialog--dice-list {
 	padding: 8px;

 	.dice {
--- a/styles/generic.scss
+++ b/styles/generic.scss
@ -4,31 +4,18 @@

@import url('https://fonts.googleapis.com/css2?family=Pixelify+Sans&display=swap');

-/*
-Enabling scrollbar customization on a per-sheet basis, with a relatively low
-specificity to allow easier overriding without artificially increasing it.
-*/
-.dotdungeon:not(.style-v3) {
-	--scrollbar-width: 5px;
-	--scrollbar-handle-color: #782e22;
-	--scrollbar-handle-border-color: var(--color-border-highlight);
-	--color-checkbox-checked: inherit;
+// Reset the parts of Foundry's styling which gets in the way of what I want
+.dotdungeon > .window-content {
+
 	::-webkit-scrollbar {
-		width: var(--scrollbar-width);
+		width: 10px;
 	}
 	::-webkit-scrollbar-thumb {
-		background: var(--scrollbar-handle-color);
-		border-color: var(--scrollbar-handle-border-color);
 		border-radius: 5px;
 	}
-}
-
-// Reset the parts of Foundry's styling which gets in the way of what I want
-.dotdungeon:not(.style-v3) > .window-content {

 	h2, h3, h4, h5, h6 {
 		@include fvtt_reset;
-		color: inherit;
 		font-family: $title-font;
 		margin: 0;
 	}
@ -50,8 +37,8 @@ specificity to allow easier overriding without artificially increasing it.
 	input[type="text"],
 	input[type="number"],
 	textarea {
-		@include fvtt_reset;
 		padding: 5px 7px;
+		@include input-generic;
 	}

 	textarea {
@ -74,7 +61,7 @@ specificity to allow easier overriding without artificially increasing it.
 }

 // Styling that doesn't belong to any particular part of my sheet
-.dotdungeon.dotdungeon.dotdungeon.dotdungeon:not(.style-v3) {
+.dotdungeon.dotdungeon.dotdungeon.dotdungeon {
 	container-type: size;

 	> .window-content {
--- a/styles/global/buttons.scss
+++ b/styles/global/buttons.scss
@ -2,7 +2,7 @@

@use "sass:color" as color;

-.dotdungeon.dotdungeon:not(.style-v3) > .window-content {
+.dotdungeon.dotdungeon.dotdungeon.dotdungeon > .window-content {
 	button {
 		border-radius: 4px;
 		box-sizing: border-box;
--- a/styles/global/design-v2.scss
+++ b/styles/global/design-v2.scss
@ -1,5 +1,5 @@
-.item--custom:not(.style-v3),
-.actor--mob:not(.style-v3) {
+.item--custom,
+.actor--mob {
 	input {
 		border: 2px solid black;
 		background: none;
--- a/styles/global/icons.scss
+++ b/styles/global/icons.scss
@ -1,6 +1,6 @@
 $iconSizes: 12, 14, 16, 18, 20, 22, 24;

-.dotdungeon.dotdungeon.dotdungeon.dotdungeon:not(.style-v3) {
+.dotdungeon.dotdungeon.dotdungeon.dotdungeon {
 	.icon {
 		display: inline-flex;
 		justify-content: center;
@ -14,4 +14,4 @@ $iconSizes: 12, 14, 16, 18, 20, 22, 24;
 			};
 		}
 	}
-}
+}
--- a/styles/mixins/_material.scss
+++ b/styles/mixins/_material.scss
@ -1,6 +0,0 @@
-@mixin elevate($height) {
-	background-color: var(--elevation-#{$height}dp-bg);
-	-webkit-box-shadow: 0px 0px #{$height * 1.75}px 0px rgba(0,0,0,0.75);
-	-moz-box-shadow: 0px 0px #{$height * 1.75}px 0px rgba(0,0,0,0.75);
-	box-shadow: 0px 0px #{$height * 1.75}px 0px rgba(0,0,0,0.75);
-}
--- a/styles/mixins/_partials.scss
+++ b/styles/mixins/_partials.scss
@ -1,5 +1,4 @@
@use "../vars" as *;
-@use "./material" as material;

@mixin input-generic {
 	border-width: 2px;
@ -13,14 +12,4 @@
 	&:active {
 		transform: scale(103%);
 	}
-}
-
-@mixin sub-nav($parent, $group, $display) {
-	nav.#{$group} {
-		@include material.elevate(1);
-		display: none !important;
-	}
-	&:has(nav.#{$parent} .active[data-tab="#{$group}"]) nav.#{$group} {
-		display: #{$display} !important;
-	}
-}
+}
--- a/styles/root.scss
+++ b/styles/root.scss
@ -15,14 +15,9 @@
@use "./sheets/partials/panel.scss";

@use "./sheets/actor/mvp.scss";
-@use "./sheets/actor/char-sheet/v2/v2.scss";
@use "./sheets/actor/mob/mob.scss";
@use "./sheets/actor/sync/basic.scss";
@use "./sheets/items/custom.scss";
@use "./sheets/items/aspect.scss";
@use "./sheets/items/spell.scss";
-@use "./sheets/items/pet.scss";
-
-/* NEW BETTER SCOPED CSS ONLY BELOW HERE */
-
-@use "./v3/index.scss";
+@use "./sheets/items/pet.scss";
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 100 100"><path d="M50.016 82.137a9.195 9.195 0 0 1-6.844-3.066L2.692 34.91a10.286 10.286 0 0 1-2.691-6.97c0-1.472.304-2.929.898-4.276a9.404 9.404 0 0 1 8.637-5.801h80.93a9.404 9.404 0 0 1 8.637 5.8A10.424 10.424 0 0 1 97.31 34.91L56.853 79.082a9.201 9.201 0 0 1-6.836 3.055z"/></svg>`
				`@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 100 100"><path d="M61.24 9H42.776C21.393 9 4.095 26.336 4.095 47.679 2.013 74.103 34.856 91.236 48.486 97.153c2.75 1.209 5.792-.834 5.792-3.834v-8.544a4.181 4.181 0 0 1 4.169-4.169h2.75C80.995 80.606 97 64.561 97 44.804 97 25.046 80.954 9 61.197 9h.043ZM32.854 54.389a5.496 5.496 0 0 1-5.5-5.501c0-3.044 2.459-5.5 5.5-5.5a5.495 5.495 0 0 1 5.504 5.5 5.497 5.497 0 0 1-5.504 5.501Zm17.673 0a5.498 5.498 0 0 1-5.502-5.501c0-3.044 2.461-5.5 5.502-5.5a5.494 5.494 0 0 1 5.503 5.5 5.496 5.496 0 0 1-5.503 5.501Zm17.675 0a5.498 5.498 0 0 1-5.505-5.501c0-3.044 2.461-5.5 5.505-5.5a5.495 5.495 0 0 1 5.501 5.5 5.497 5.497 0 0 1-5.501 5.501Z"/></svg>