diff --git a/public/module.json b/public/module.json
index 07b13057e..10e18e579 100644
--- a/public/module.json
+++ b/public/module.json
@@ -109,9 +109,9 @@
       {
         "id": "dnd5e",
         "compatibility": {
-          "minimum": "4.0.0",
-          "verified": "4.0.0",
-          "maximum": "4.0.x"
+          "minimum": "4.1.0",
+          "verified": "4.1.0",
+          "maximum": "4.1.x"
         }
       }
     ],
diff --git a/src/components/item-list/controls/DeleteOrOpenActivity.svelte b/src/components/item-list/controls/DeleteOrOpenActivity.svelte
new file mode 100644
index 000000000..6a7fc10f5
--- /dev/null
+++ b/src/components/item-list/controls/DeleteOrOpenActivity.svelte
@@ -0,0 +1,13 @@
+<script lang="ts">
+  import type { Item5e } from 'src/types/item.types';
+  import SpellOpenCastActivityControl from './SpellOpenCastActivityControl.svelte';
+  import ItemDeleteControl from './ItemDeleteControl.svelte';
+
+  export let item: Item5e;
+</script>
+
+{#if item.canDelete || !item.system.linkedActivity}
+  <ItemDeleteControl {item} />
+{:else}
+  <SpellOpenCastActivityControl {item} />
+{/if}
diff --git a/src/components/item-list/controls/SpellOpenCastActivityControl.svelte b/src/components/item-list/controls/SpellOpenCastActivityControl.svelte
new file mode 100644
index 000000000..2e73f9e5d
--- /dev/null
+++ b/src/components/item-list/controls/SpellOpenCastActivityControl.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+  import { FoundryAdapter } from 'src/foundry/foundry-adapter';
+  import ItemControl from './ItemControl.svelte';
+  import type { Item5e } from 'src/types/item.types';
+
+  export let item: Item5e;
+
+  const localize = FoundryAdapter.localize;
+</script>
+
+<ItemControl
+  iconCssClass="fas fa-gear"
+  class={$$restProps.class ?? ''}
+  onclick={() => item.system.linkedActivity.sheet.render(true)}
+  title={localize('DOCUMENT.DND5E.Activity')}
+/>
diff --git a/src/components/spellbook/SpellbookFooter.svelte b/src/components/spellbook/SpellbookFooter.svelte
index 63c1b3142..77b6a2f38 100644
--- a/src/components/spellbook/SpellbookFooter.svelte
+++ b/src/components/spellbook/SpellbookFooter.svelte
@@ -46,8 +46,8 @@
         {#if $context.spellcastingInfo.calculations.rangedMod !== $context.spellcastingInfo.calculations.meleeMod}
           <button
             type="button"
-            on:click={(ev) =>
-              rollRawSpellAttack(
+            on:click={async (ev) =>
+              await rollRawSpellAttack(
                 ev,
                 $context.actor,
                 'rsak',
@@ -73,8 +73,8 @@
           </button>
           <button
             type="button"
-            on:click={(ev) =>
-              rollRawSpellAttack(
+            on:click={async (ev) =>
+              await rollRawSpellAttack(
                 ev,
                 $context.actor,
                 'msak',
@@ -101,8 +101,8 @@
         {:else}
           <button
             type="button"
-            on:click={(ev) =>
-              rollRawSpellAttack(
+            on:click={async (ev) =>
+              await rollRawSpellAttack(
                 ev,
                 $context.actor,
                 undefined,
diff --git a/src/components/spellbook/SpellbookList.svelte b/src/components/spellbook/SpellbookList.svelte
index a47c6b403..23f6d2e75 100644
--- a/src/components/spellbook/SpellbookList.svelte
+++ b/src/components/spellbook/SpellbookList.svelte
@@ -33,6 +33,7 @@
   import type { Item5e } from 'src/types/item.types';
   import ClassicControls from 'src/sheets/shared/ClassicControls.svelte';
   import ConcentrationOverlayIcon from './ConcentrationOverlayIcon.svelte';
+  import DeleteOrOpenActivity from '../item-list/controls/DeleteOrOpenActivity.svelte';
 
   let context = getContext<Readable<CharacterSheetContext | NpcSheetContext>>(
     CONSTANTS.SVELTE_CONTEXT.CONTEXT,
@@ -86,7 +87,8 @@
 
     if ($context.unlocked) {
       controls.push({
-        component: ItemDeleteControl,
+        // svelte 5 - snippet?
+        component: DeleteOrOpenActivity,
         props: ({ item }) => ({
           item,
         }),
@@ -209,7 +211,10 @@
             <InlineFavoriteIcon />
           {/if}
           <ItemTableCell baseWidth={spellComponentsBaseWidth} cssClass="no-gap">
-            <SpellComponents {spell} spellComponentLabels={$context.spellComponentLabels} />
+            <SpellComponents
+              {spell}
+              spellComponentLabels={$context.spellComponentLabels}
+            />
           </ItemTableCell>
           {#if includeSchool}
             {@const icon = SpellSchool.getIcon(spell.system.school)}
diff --git a/src/context-menu/tidy5e-context-menu.ts b/src/context-menu/tidy5e-context-menu.ts
index dceec58c9..fb0b138a4 100644
--- a/src/context-menu/tidy5e-context-menu.ts
+++ b/src/context-menu/tidy5e-context-menu.ts
@@ -286,21 +286,23 @@ function getItemContextOptions(item: Item5e) {
   }
 
   // Toggle Prepared State
-  if ('preparation' in item.system) {
-    if (FoundryAdapter.canPrepareSpell(item)) {
-      const isPrepared = item.system?.preparation?.prepared === true;
-      options.push({
-        name: isActive
-          ? 'TIDY5E.ContextMenuActionUnprepare'
-          : 'TIDY5E.ContextMenuActionPrepare',
-        icon: isActive
-          ? "<i class='fas fa-book fa-fw'></i>"
-          : "<i class='fas fa-book fa-fw'></i>",
-        callback: () =>
-          item.update({ 'system.preparation.prepared': !isPrepared }),
-        condition: () => item.isOwner && !item.compendium?.locked,
-      });
-    }
+  if (
+    'preparation' in item.system &&
+    FoundryAdapter.canPrepareSpell(item) &&
+    !item.getFlag('dnd5e', 'cachedFor')
+  ) {
+    const isPrepared = item.system?.preparation?.prepared === true;
+    options.push({
+      name: isActive
+        ? 'TIDY5E.ContextMenuActionUnprepare'
+        : 'TIDY5E.ContextMenuActionPrepare',
+      icon: isActive
+        ? "<i class='fas fa-book fa-fw'></i>"
+        : "<i class='fas fa-book fa-fw'></i>",
+      callback: () =>
+        item.update({ 'system.preparation.prepared': !isPrepared }),
+      condition: () => item.isOwner && !item.compendium?.locked,
+    });
   }
 
   options.push({
@@ -349,7 +351,7 @@ function getItemContextOptions(item: Item5e) {
     icon: "<i class='fas fa-copy fa-fw'></i>",
     condition: () =>
       isUnlocked &&
-      !['race', 'background', 'class', 'subclass'].includes(item.type) &&
+      item.canDuplicate &&
       item.isOwner &&
       !item.compendium?.locked,
 
@@ -369,7 +371,21 @@ function getItemContextOptions(item: Item5e) {
       name: 'TIDY5E.ContextMenuActionDelete',
       icon: "<i class='fas fa-trash fa-fw' style='color: var(--t5e-warning-accent-color);'></i>",
       callback: () => FoundryAdapter.onActorItemDelete(itemParent, item),
-      condition: () => isUnlocked && item.isOwner && !item.compendium?.locked,
+      condition: () =>
+        item.canDelete &&
+        isUnlocked &&
+        item.isOwner &&
+        !item.compendium?.locked,
+    });
+    options.push({
+      name: 'DOCUMENT.DND5E.Activity',
+      icon: "<i class='fas fa-gear fa-fw'></i>",
+      callback: () => item.system.linkedActivity.sheet.render(true),
+      condition: () =>
+        !item.canDelete &&
+        item.system.linkedActivity &&
+        item.isOwner &&
+        !item.compendium?.locked,
     });
   } else {
     options.push({
@@ -393,14 +409,18 @@ function getItemContextOptions(item: Item5e) {
       if (SettingsProvider.settings.includeFlagsInSpellScrollCreation.get()) {
         options.flags = item.flags;
       }
-      
-      const scroll = await dnd5e.documents.Item5e.createScrollFromSpell(item, options);
+
+      const scroll = await dnd5e.documents.Item5e.createScrollFromSpell(
+        item,
+        options
+      );
       if (scroll) {
         dnd5e.documents.Item5e.create(scroll, { parent: itemParent });
       }
     },
     condition: () =>
       item.type === 'spell' &&
+      !item.getFlag('dnd5e', 'cachedFor') &&
       itemParent?.isOwner &&
       !itemParent?.compendium?.locked,
     group: 'action',
diff --git a/src/features/actions/actions.ts b/src/features/actions/actions.ts
index cc3036a64..a11987133 100644
--- a/src/features/actions/actions.ts
+++ b/src/features/actions/actions.ts
@@ -296,8 +296,8 @@ function getRangeTitles(item: Item5e): {
   const firstActivity = item.system.activities?.contents[0] ?? {};
 
   const rangeSubtitle =
-    (firstActivity.target.affects?.type ??
-      firstActivity.target.template?.type) &&
+    (firstActivity.target?.affects?.type ??
+      firstActivity.target?.template?.type) &&
     item.labels?.target
       ? item.labels.target
       : null;
diff --git a/src/foundry/foundry-adapter.ts b/src/foundry/foundry-adapter.ts
index f2be94740..2cfcd28ad 100644
--- a/src/foundry/foundry-adapter.ts
+++ b/src/foundry/foundry-adapter.ts
@@ -749,19 +749,25 @@ export const FoundryAdapter = {
   ): Promise<any> {
     return new Roll(formula, rollData).roll(rollFnOptions);
   },
-  openActorTypeConfig(actor: Actor5e) {
-    return new dnd5e.applications.actor.ActorTypeConfig(actor).render(true);
-  },
-  openCharacterActorTypeConfig(actor: Actor5e) {
-    if (actor.system.details.race?.id) {
-      return new dnd5e.applications.actor.ActorTypeConfig(
-        actor.system.details.race,
-        { keyPath: 'system.type' }
-      ).render(true);
-    }
+  renderCreatureTypeConfig(document: Actor5e) {
+    const raceId: string | undefined = document.system.details?.race?.id;
+
+    const documentToUpdate = raceId ? document.system.details.race : document;
+
+    const keyPath =
+      documentToUpdate.type === CONSTANTS.ITEM_TYPE_RACE
+        ? // A species document
+          'type'
+        : // An actor without a species
+          'details.type';
 
-    warn(
-      'Unable to open actor type config for player character because they do not have a race.'
+    const options: Record<string, any> = {
+      document: documentToUpdate,
+      keyPath,
+    };
+
+    return new dnd5e.applications.shared.CreatureTypeConfig(options).render(
+      true
     );
   },
   playDiceSound() {
@@ -855,31 +861,35 @@ export const FoundryAdapter = {
   browseFilePicker(...args: any[]) {
     return new FilePicker(...args).browse();
   },
-  renderArmorConfig(actor: any) {
-    return new dnd5e.applications.actor.ActorArmorConfig(actor).render(true);
+  renderArmorConfig(document: any) {
+    return new dnd5e.applications.actor.ArmorClassConfig({ document }).render(true);
   },
-  renderActorInitiativeConfig(actor: any) {
-    return new dnd5e.applications.actor.ActorInitiativeConfig(actor).render(
-      true
-    );
+  renderInitiativeConfig(document: any) {
+    return new dnd5e.applications.actor.InitiativeConfig({
+      document,
+    }).render(true);
   },
-  renderActorAbilityConfig(actor: any, abbreviation: any) {
-    return new dnd5e.applications.actor.ActorAbilityConfig(
-      actor,
-      null,
-      abbreviation
-    ).render(true);
+  renderAbilityConfig(document: any, key: any) {
+    return new dnd5e.applications.actor.AbilityConfig({
+      document,
+      key,
+    }).render(true);
   },
-  renderActorMovementConfig(actor: any) {
-    return new dnd5e.applications.actor.ActorMovementConfig(actor).render(true);
+  renderMovementSensesConfig(document: any, type: 'movement' | 'senses') {
+    return new dnd5e.applications.shared.MovementSensesConfig({
+      document,
+      type,
+    }).render(true);
   },
-  renderActorHitPointsDialog(actor: any) {
-    return new dnd5e.applications.actor.ActorHitPointsConfig(actor).render(
+  renderHitPointsDialog(document: any) {
+    return new dnd5e.applications.actor.HitPointsConfig({ document }).render(
       true
     );
   },
-  renderActorHitDiceConfig(actor: any) {
-    return new dnd5e.applications.actor.ActorHitDiceConfig(actor).render(true);
+  renderHitDiceConfig(document: any) {
+    return new dnd5e.applications.actor.HitDiceConfig({ document }).render(
+      true
+    );
   },
   dialogConfirm(...args: any[]) {
     return Dialog.confirm(...args);
@@ -887,45 +897,31 @@ export const FoundryAdapter = {
   renderActorSheetFlags(actor: any) {
     return new dnd5e.applications.actor.ActorSheetFlags(actor).render(true);
   },
-  renderToolSelector(actor: any) {
-    return new dnd5e.applications.actor.ToolSelector(actor, 'tool').render(
-      true
-    );
-  },
-  renderActorSensesConfig(actor: any) {
-    return new dnd5e.applications.actor.ActorSensesConfig(actor).render(true);
+  renderToolsConfig(document: any) {
+    return new dnd5e.applications.actor.ToolsConfig({
+      document,
+      trait: 'tool',
+    }).render(true);
   },
-  renderTraitsSelector(actor: any, trait: string) {
-    return new dnd5e.applications.actor.TraitSelector(actor, trait).render(
-      true
-    );
+  renderTraitsConfig(document: any, trait: string) {
+    return new dnd5e.applications.actor.TraitsConfig({
+      document,
+      trait,
+    }).render(true);
   },
   renderWeaponsConfig(actor: any) {
     return new dnd5e.applications.actor.WeaponsConfig({
       document: actor,
+      trait: 'weapon',
     }).render({ force: true });
   },
-  renderProficiencyConfig(actor: any, property: string, key: string) {
-    return new dnd5e.applications.actor.ProficiencyConfig(actor, {
-      property,
+  renderSkillToolConfig(document: any, trait: 'skills' | 'tools', key: string) {
+    return new dnd5e.applications.actor.SkillToolConfig({
+      document,
+      trait,
       key,
     }).render(true);
   },
-  renderItemTypeConfig(item: any) {
-    return new dnd5e.applications.actor.ActorTypeConfig(item, {
-      keyPath: 'system.type',
-    }).render(true);
-  },
-  renderItemMovementConfig(item: any) {
-    return new dnd5e.applications.actor.ActorMovementConfig(item, {
-      keyPath: 'system.movement',
-    }).render(true);
-  },
-  renderItemSensesConfig(item: any) {
-    return new dnd5e.applications.actor.ActorSensesConfig(item, {
-      keyPath: 'system.senses',
-    }).render(true);
-  },
   renderSourceConfig(document: any, keyPath: string) {
     return new dnd5e.applications.SourceConfig(
       { document: document },
@@ -1196,17 +1192,21 @@ export const FoundryAdapter = {
   getJqueryWrappedElement(el: HTMLElement) {
     return $(el);
   },
-  openSpellSlotsConfig(actor: Actor5e) {
-    new dnd5e.applications.actor.ActorSpellSlotsConfig(actor).render(true);
+  openSpellSlotsConfig(document: any) {
+    new dnd5e.applications.actor.SpellSlotsConfig({ document }).render(true);
   },
   openSummonConfig(item: Item5e) {
     new dnd5e.applications.item.SummoningConfig(item).render(true);
   },
-  openDamageModificationConfig(actor: Actor5e) {
-    new dnd5e.applications.actor.DamageModificationConfig(actor).render(true);
+  openDamagesConfig(document: Actor5e, trait: 'dr' | 'di' | 'dv' | 'dm') {
+    new dnd5e.applications.actor.DamagesConfig({ document, trait }).render(
+      true
+    );
   },
-  openActorConcentrationConfig(actor: Actor5e) {
-    new dnd5e.applications.actor.ActorConcentrationConfig(actor).render(true);
+  openConcentrationConfig(document: any) {
+    new dnd5e.applications.actor.ConcentrationConfig({
+      document: document,
+    }).render(true);
   },
   openStartingEquipmentConfig(item: Item5e) {
     new dnd5e.applications.item.StartingEquipmentConfig(item).render(true);
@@ -1249,21 +1249,30 @@ export const FoundryAdapter = {
    */
   onDropStackConsumablesForActor(
     actor: Actor5e,
-    itemData: any
+    itemData: any,
+    { container = null }: { container: any | null },
+    event: DragEvent
   ): Promise<Item5e> | null {
+    // TODO: Move this to the base actor sheet in app V2 when all actors go App V2.
     const droppedSourceId =
       itemData._stats?.compendiumSource ?? itemData.flags.core?.sourceId;
-    if (itemData.type !== 'consumable' || !droppedSourceId) return null;
-    const similarItem = actor.items.find((i: Item5e) => {
-      const sourceId = i.getFlag('core', 'sourceId');
-      return (
-        sourceId &&
-        sourceId === droppedSourceId &&
-        i.type === 'consumable' &&
-        i.name === itemData.name
-      );
-    });
-    if (!similarItem) return null;
+
+    if (itemData.type !== 'consumable' || !droppedSourceId) {
+      return null;
+    }
+
+    const similarItem = actor.sourcedItems
+      .get(droppedSourceId, { legacy: false })
+      ?.filter(
+        (i: Item5e) =>
+          i.system.container === container && i.name === itemData.name
+      )
+      ?.first();
+
+    if (!similarItem) {
+      return null;
+    }
+    
     return similarItem.update({
       'system.quantity':
         similarItem.system.quantity + Math.max(itemData.system.quantity, 1),
diff --git a/src/foundry/foundry-and-system.d.ts b/src/foundry/foundry-and-system.d.ts
index 5f063c76d..d9589e4a2 100644
--- a/src/foundry/foundry-and-system.d.ts
+++ b/src/foundry/foundry-and-system.d.ts
@@ -18,7 +18,7 @@ declare global {
   var Application: any;
   var AudioHelper: any;
   var ChatMessage: any;
-  var CONFIG: CONFIG;
+  var CONFIG: CONFIG & { Dice: any };
   var CONST: any;
   var ContextMenu: any;
   var DefaultSheetsConfig: any;
@@ -43,7 +43,6 @@ declare global {
   var Items: any;
   var KeyboardManager: any;
   var ModuleManagement: any;
-  var NumericTerm: any;
   var renderTemplate: any;
   var Roll: any;
   var SortingHelpers: any;
diff --git a/src/foundry/foundry.types.ts b/src/foundry/foundry.types.ts
index 8314cfb22..3db0fa920 100644
--- a/src/foundry/foundry.types.ts
+++ b/src/foundry/foundry.types.ts
@@ -5,3 +5,65 @@ export type ContextMenuEntry = {
   callback?: ($entryElement: any) => void;
   condition?: ($entryElement: any) => void;
 };
+
+/**
+ * Configuration data for the process of creating one or more basic rolls.
+ */
+export interface BasicRollProcessConfiguration {
+  rolls: BasicRollConfiguration[];
+  evaluate?: boolean;
+  event?: Event;
+  hookNames?: string[];
+  subject?: Document;
+  target?: number;
+}
+
+/**
+ * Configuration data for an individual roll.
+ */
+export interface BasicRollConfiguration {
+  parts?: string[];
+  data?: object;
+  situational?: boolean;
+  options?: BasicRollOptions;
+  subject: any;
+}
+
+/**
+ * Options allowed on a basic roll.
+ */
+export interface BasicRollOptions {
+  target?: number;
+  [key: string]: any;
+}
+
+/* -------------------------------------------- */
+
+/**
+ * Configuration data for the roll prompt.
+ */
+export interface BasicRollDialogConfiguration {
+  configure?: boolean;
+  applicationClass?: any;
+  options?: Record<string, any>;
+}
+
+
+/* -------------------------------------------- */
+
+/**
+ * Configuration data for creating a roll message.
+ */
+export interface BasicRollMessageConfiguration {
+  create?: boolean;
+  rollMode?: string;
+  data?: object;
+}
+
+export type D20Roll = {
+  build(
+    config: BasicRollProcessConfiguration,
+    dialog: BasicRollDialogConfiguration,
+    message: BasicRollMessageConfiguration
+  ): D20Roll;
+};
diff --git a/src/mixins/Tidy5eActorSheetBaseMixin.ts b/src/mixins/Tidy5eActorSheetBaseMixin.ts
index b58cadd69..8e489f7ed 100644
--- a/src/mixins/Tidy5eActorSheetBaseMixin.ts
+++ b/src/mixins/Tidy5eActorSheetBaseMixin.ts
@@ -81,10 +81,11 @@ export function Tidy5eActorSheetBaseMixin(BaseApplication: any) {
           Tidy5eActorSheetBase.ACTOR_ACTIONS_AND_CONTROLS.configureToken.control
             .action
       );
-      if (configureTokenControl) {
-        configureTokenControl.label = this.token
-          ? 'Token'
-          : 'TOKEN.TitlePrototype';
+      if (configureTokenControl && this.token) {
+        configureTokenControl.label = 'Token';
+        configureTokenControl.icon = 'far fa-user-circle';
+      } else {
+        configureTokenControl.label = 'TOKEN.TitlePrototype';
       }
       return controls;
     }
@@ -250,13 +251,16 @@ export function Tidy5eActorSheetBaseMixin(BaseApplication: any) {
         );
       }
 
-      return this._onDropItemCreate(item);
+      return this._onDropItemCreate(item, event);
     }
 
     /**
      * Handle the final creation of dropped Item data on the Actor.
      */
-    async _onDropItemCreate(itemData: Item5e[] | Item5e): Promise<Item5e[]> {
+    async _onDropItemCreate(
+      itemData: Item5e[] | Item5e,
+      event: DragEvent
+    ): Promise<Item5e[]> {
       let items = itemData instanceof Array ? itemData : [itemData];
       const itemsWithoutAdvancement = items.filter(
         (i) => !i.system.advancement?.length
@@ -283,7 +287,7 @@ export function Tidy5eActorSheetBaseMixin(BaseApplication: any) {
       // Create the owned items & contents as normal
       const toCreate = await dnd5e.documents.Item5e.createWithContents(items, {
         transformFirst: (item: Item5e) =>
-          this._onDropSingleItem(item.toObject()),
+          this._onDropSingleItem(item.toObject(), event),
       });
 
       return dnd5e.documents.Item5e.createDocuments(toCreate, {
@@ -296,7 +300,10 @@ export function Tidy5eActorSheetBaseMixin(BaseApplication: any) {
     /**
      * Handles dropping of a single item onto this character sheet.
      */
-    async _onDropSingleItem(itemData: any): Promise<object | boolean> {
+    async _onDropSingleItem(
+      itemData: any,
+      event: DragEvent
+    ): Promise<object | boolean> {
       const isSupportedItemType =
         this._supportedItemTypes.size === 0 ||
         this._supportedItemTypes.has(itemData.type);
@@ -342,14 +349,14 @@ export function Tidy5eActorSheetBaseMixin(BaseApplication: any) {
           options
         );
 
-        return scroll?.toObject?.();
+        return scroll?.toObject?.() ?? false;
       }
 
       // Clean up data
       this._onDropResetData(itemData);
 
       // Stack identical consumables
-      const stacked = this._onDropStackConsumables(itemData);
+      const stacked = this._onDropStackConsumables(itemData, {}, event);
       if (stacked) return false;
 
       // Bypass normal creation flow for any items with advancement
@@ -402,24 +409,17 @@ export function Tidy5eActorSheetBaseMixin(BaseApplication: any) {
     /**
      * Stack identical consumables when a new one is dropped rather than creating a duplicate item.
      */
-    _onDropStackConsumables(itemData: any): Promise<Item5e> | null {
-      const droppedSourceId =
-        itemData._stats?.compendiumSource ?? itemData.flags.core?.sourceId;
-      if (itemData.type !== 'consumable' || !droppedSourceId) return null;
-      const similarItem = this.actor.items.find((i: Item5e) => {
-        const sourceId = i.getFlag('core', 'sourceId');
-        return (
-          sourceId &&
-          sourceId === droppedSourceId &&
-          i.type === 'consumable' &&
-          i.name === itemData.name
-        );
-      });
-      if (!similarItem) return null;
-      return similarItem.update({
-        'system.quantity':
-          similarItem.system.quantity + Math.max(itemData.system.quantity, 1),
-      });
+    _onDropStackConsumables(
+      itemData: any,
+      { container = null } = {},
+      event: DragEvent
+    ): Promise<Item5e> | null {
+      return FoundryAdapter.onDropStackConsumablesForActor(
+        this.actor,
+        itemData,
+        { container },
+        event
+      );
     }
 
     /**
@@ -513,7 +513,7 @@ export function Tidy5eActorSheetBaseMixin(BaseApplication: any) {
     }
 
     async _onDropFolder(
-      _event: DragEvent & { currentTarget: HTMLElement },
+      event: DragEvent & { currentTarget: HTMLElement },
       data: Record<string, any>
     ): Promise<object | boolean | undefined> {
       if (!this.actor.isOwner) {
@@ -533,7 +533,7 @@ export function Tidy5eActorSheetBaseMixin(BaseApplication: any) {
         })
       );
 
-      return this._onDropItemCreate(droppedItemData);
+      return this._onDropItemCreate(droppedItemData, event);
     }
 
     /* -------------------------------------------- */
diff --git a/src/scss/partials/_reset-v2.scss b/src/scss/partials/_reset-v2.scss
index 13480fa96..7edf31b8f 100644
--- a/src/scss/partials/_reset-v2.scss
+++ b/src/scss/partials/_reset-v2.scss
@@ -5,6 +5,10 @@
     --button-hover-background-color: var(--t5e-faint-color);
   }
 
+  input[type='checkbox'] {
+    margin: 0;
+  }
+
   label.checkbox > input[type='checkbox'],
   input[type='checkbox'] {
     --input-height: 1.625rem;
@@ -48,6 +52,10 @@
     --input-background-color: var(--t5e-faintest-color);
   }
 
+  select {
+    width: unset;
+  }
+
   input[type='text']:focus,
   input[type='number']:focus,
   input[type='password']:focus,
diff --git a/src/sheets/Tidy5eCharacterSheet.ts b/src/sheets/Tidy5eCharacterSheet.ts
index 376fff93f..d95e0c2dd 100644
--- a/src/sheets/Tidy5eCharacterSheet.ts
+++ b/src/sheets/Tidy5eCharacterSheet.ts
@@ -1298,7 +1298,7 @@ export class Tidy5eCharacterSheet
     return this._onLongRest(event);
   }
 
-  async _onDropSingleItem(itemData: any) {
+  async _onDropSingleItem(itemData: any, event: DragEvent) {
     // Create a Consumable spell scroll on the Inventory tab
     if (
       itemData.type === CONSTANTS.ITEM_TYPE_SPELL &&
@@ -1318,7 +1318,7 @@ export class Tidy5eCharacterSheet
       return scroll.toObject();
     }
 
-    return super._onDropSingleItem(itemData);
+    return super._onDropSingleItem(itemData, event);
   }
 
   close(options: unknown = {}) {
diff --git a/src/sheets/Tidy5eContainerSheetClassic.ts b/src/sheets/Tidy5eContainerSheetClassic.ts
index 35805aef6..9a0642144 100644
--- a/src/sheets/Tidy5eContainerSheetClassic.ts
+++ b/src/sheets/Tidy5eContainerSheetClassic.ts
@@ -36,6 +36,7 @@ import { DocumentTabSectionConfigApplication } from 'src/applications/section-co
 import { TabManager } from 'src/runtime/tab/TabManager';
 import { TidyHooks } from 'src/foundry/TidyHooks';
 import { SettingsProvider } from 'src/settings/settings';
+import { Inventory } from 'src/features/sections/Inventory';
 
 export class Tidy5eContainerSheetClassic extends DragAndDropMixin(
   SvelteApplicationMixin<ContainerSheetClassicContext>(
@@ -449,17 +450,8 @@ export class Tidy5eContainerSheetClassic extends DragAndDropMixin(
     // Create any remaining items
     const toCreate = await dnd5e.documents.Item5e.createWithContents(items, {
       container: this.item,
-      transformAll: (itemData: any) => {
-        const options: Record<string, unknown> = {};
-
-        if (SettingsProvider.settings.includeFlagsInSpellScrollCreation.get()) {
-          options.flags = itemData.flags;
-        }
-
-        return itemData.type === 'spell'
-          ? dnd5e.documents.Item5e.createScrollFromSpell(itemData, options)
-          : itemData;
-      },
+      transformAll: (itemData: any, options: any) =>
+        this._onDropSingleItem(itemData, { ...options, event }),
     });
     if (this.item.folder)
       toCreate.forEach((d: any) => (d.folder = this.item.folder.id));
@@ -494,7 +486,11 @@ export class Tidy5eContainerSheetClassic extends DragAndDropMixin(
     }
 
     // If item already exists in same DocumentCollection, just adjust its container property
-    if (item.actor === this.item.actor && item.pack === this.item.pack) {
+    if (
+      item.actor === this.item.actor &&
+      item.pack === this.item.pack &&
+      Inventory.getDefaultInventoryTypes().includes(item.type)
+    ) {
       return item.update({
         folder: this.item.folder,
         'system.container': this.item.id,
@@ -504,17 +500,8 @@ export class Tidy5eContainerSheetClassic extends DragAndDropMixin(
     // Otherwise, create a new item & contents in this context
     const toCreate = await dnd5e.documents.Item5e.createWithContents([item], {
       container: this.item,
-      transformAll: (itemData: any) => {
-        const options: Record<string, unknown> = {};
-
-        if (SettingsProvider.settings.includeFlagsInSpellScrollCreation.get()) {
-          options.flags = itemData.flags;
-        }
-
-        return itemData.type === 'spell'
-          ? dnd5e.documents.Item5e.createScrollFromSpell(itemData, options)
-          : itemData;
-      },
+      transformAll: (itemData: any, options: any) =>
+        this._onDropSingleItem(itemData, { ...options, event }),
     });
     if (this.item.folder)
       toCreate.forEach((d: any) => (d.folder = this.item.folder.id));
@@ -527,6 +514,53 @@ export class Tidy5eContainerSheetClassic extends DragAndDropMixin(
 
   /* -------------------------------------------- */
 
+  /**
+   * Process a single item when dropping into the container.
+   * @param {object} itemData           The item data to create.
+   * @param {object} options
+   * @param {string} options.container  ID of the container to create the items.
+   * @param {number} options.depth      Current depth of the item being created.
+   * @param {DragEvent} options.event   The concluding DragEvent which provided the drop data.
+   * @returns {Promise<object|false>}   The item data to create after processing, or false if the item should not be
+   *                                    created or creation has been otherwise handled.
+   * @protected
+   */
+  async _onDropSingleItem(
+    itemData: Record<string, any>,
+    {
+      container,
+      depth,
+      event,
+    }: { container: string; depth: number; event: DragEvent }
+  ) {
+    if (itemData.type === 'spell') {
+      const createOptions: Record<string, unknown> = {};
+
+      if (SettingsProvider.settings.includeFlagsInSpellScrollCreation.get()) {
+        createOptions.flags = itemData.flags;
+      }
+
+      const scroll = await dnd5e.documents.Item5e.createScrollFromSpell(
+        itemData,
+        createOptions
+      );
+
+      return scroll?.toObject?.() ?? false;
+    }
+
+    if (this.item.actor && container === this.item.id) {
+      const result = await FoundryAdapter.onDropStackConsumablesForActor(
+        this.actor,
+        itemData,
+        { container },
+        event
+      );
+      if (result) return false;
+    }
+
+    return itemData;
+  }
+
   /**
    * Handle a drop event for an existing contained Item to sort it relative to its siblings.
    */
diff --git a/src/sheets/Tidy5eItemSheetClassic.ts b/src/sheets/Tidy5eItemSheetClassic.ts
index bf1da6cc8..da564ce42 100644
--- a/src/sheets/Tidy5eItemSheetClassic.ts
+++ b/src/sheets/Tidy5eItemSheetClassic.ts
@@ -894,7 +894,11 @@ export class Tidy5eItemSheetClassic extends DragAndDropMixin(
       {},
       {
         parent: this.item,
-        types: Object.keys(CONFIG.DND5E.activityTypes),
+        types: Object.entries(CONFIG.DND5E.activityTypes)
+          .filter(([, { configurable }]: any) => {
+            return configurable !== false;
+          })
+          .map(([k]) => k),
       }
     );
   }
diff --git a/src/sheets/Tidy5eKgarVehicleSheet.ts b/src/sheets/Tidy5eKgarVehicleSheet.ts
index 33f6f5b10..b263aac0d 100644
--- a/src/sheets/Tidy5eKgarVehicleSheet.ts
+++ b/src/sheets/Tidy5eKgarVehicleSheet.ts
@@ -748,7 +748,7 @@ export class Tidy5eVehicleSheet
     }
   }
 
-  async _onDropSingleItem(itemData: any) {
+  async _onDropSingleItem(itemData: any, event: DragEvent) {
     const cargoTypes = [
       'weapon',
       'equipment',
@@ -779,13 +779,13 @@ export class Tidy5eVehicleSheet
     }
 
     if (itemData.type === 'consumable') {
-      return super._onDropSingleItem(itemData);
+      return super._onDropSingleItem(itemData, event);
     }
 
     // Skip the default vehicle sheet handler, as we are handling all use cases.
     const baseActor5eClass = getBaseActorSheet5e(this);
     if (baseActor5eClass) {
-      return baseActor5eClass._onDropSingleItem.call(this, itemData);
+      return baseActor5eClass._onDropSingleItem.call(this, itemData, event);
     }
   }
 
diff --git a/src/sheets/Tidy5eNpcSheet.ts b/src/sheets/Tidy5eNpcSheet.ts
index 5e1e386a7..765e5f1c8 100644
--- a/src/sheets/Tidy5eNpcSheet.ts
+++ b/src/sheets/Tidy5eNpcSheet.ts
@@ -1059,7 +1059,7 @@ export class Tidy5eNpcSheet
     return this._onToggleAbilityProficiency(event);
   }
 
-  async _onDropSingleItem(itemData: any) {
+  async _onDropSingleItem(itemData: any, event: DragEvent) {
     // Create a Consumable spell scroll on the Inventory tab
     if (
       itemData.type === CONSTANTS.ITEM_TYPE_SPELL &&
@@ -1079,7 +1079,7 @@ export class Tidy5eNpcSheet
       return scroll.toObject();
     }
 
-    return super._onDropSingleItem(itemData);
+    return super._onDropSingleItem(itemData, event);
   }
 
   /**
diff --git a/src/sheets/actor/ActorMovement.svelte b/src/sheets/actor/ActorMovement.svelte
index df1e84b6f..4a8c0310c 100644
--- a/src/sheets/actor/ActorMovement.svelte
+++ b/src/sheets/actor/ActorMovement.svelte
@@ -35,7 +35,8 @@
       type="button"
       class="configure inline-icon-button"
       title={localize('DND5E.MovementConfig')}
-      on:click={() => FoundryAdapter.renderActorMovementConfig($context.actor)}
+      on:click={() =>
+        FoundryAdapter.renderMovementSensesConfig($context.actor, 'movement')}
       tabindex={$settingStore.useAccessibleKeyboardSupport ? 0 : -1}
       ><i class="fas fa-cog" /></button
     >
diff --git a/src/sheets/actor/AttributeBlock.svelte b/src/sheets/actor/AttributeBlock.svelte
index 15dc8bf5e..a311d7041 100644
--- a/src/sheets/actor/AttributeBlock.svelte
+++ b/src/sheets/actor/AttributeBlock.svelte
@@ -40,7 +40,8 @@
   <BlockTitle
     title={ability.label}
     text={abbreviation}
-    on:roll={(event) => $context.actor.rollAbility(id, { event: event.detail })}
+    on:roll={(event) =>
+      $context.actor.rollAbility({ ability: id, event: event.detail })}
     hideFromTabOrder={$settingStore.useDefaultSheetAttributeTabbing ||
       !$settingStore.useAccessibleKeyboardSupport}
     attributes={{
@@ -67,7 +68,8 @@
       class="ability-mod transparent-button"
       class:rollable={$context.editable}
       title={localize('DND5E.AbilityModifier')}
-      on:click={(event) => $context.actor.rollAbilityTest(id, { event })}
+      on:click={(event) =>
+        $context.actor.rollAbilityCheck({ ability: id, event })}
       tabindex={!$settingStore.useDefaultSheetAttributeTabbing &&
       $settingStore.useAccessibleKeyboardSupport
         ? 0
@@ -82,7 +84,8 @@
       class="ability-save transparent-button"
       class:rollable={$context.editable}
       title={localize('DND5E.ActionSave')}
-      on:click={(event) => $context.actor.rollAbilitySave(id, { event })}
+      on:click={(event) =>
+        $context.actor.rollSavingThrow({ ability: id, event })}
       tabindex={!$settingStore.useDefaultSheetAttributeTabbing &&
       $settingStore.useAccessibleKeyboardSupport
         ? 0
@@ -132,7 +135,7 @@
         class="config-button inline-icon-button"
         title={localize('DND5E.AbilityConfigure')}
         on:click={() =>
-          FoundryAdapter.renderActorAbilityConfig($context.actor, id)}
+          FoundryAdapter.renderAbilityConfig($context.actor, id)}
         tabindex={!$settingStore.useDefaultSheetAttributeTabbing &&
         $settingStore.useAccessibleKeyboardSupport
           ? 0
diff --git a/src/sheets/actor/InitiativeBlock.svelte b/src/sheets/actor/InitiativeBlock.svelte
index 0c2b80369..f223bd01b 100644
--- a/src/sheets/actor/InitiativeBlock.svelte
+++ b/src/sheets/actor/InitiativeBlock.svelte
@@ -51,8 +51,7 @@
       type="button"
       class="config-button icon-button"
       title={localize('DND5E.InitiativeConfig')}
-      on:click={() =>
-        FoundryAdapter.renderActorInitiativeConfig($context.actor)}
+      on:click={() => FoundryAdapter.renderInitiativeConfig($context.actor)}
       tabindex={$settingStore.useAccessibleKeyboardSupport ? 0 : -1}
     >
       <i class="fas fa-cog" />
diff --git a/src/sheets/actor/SkillsList.svelte b/src/sheets/actor/SkillsList.svelte
index fdba27beb..a1efeec85 100644
--- a/src/sheets/actor/SkillsList.svelte
+++ b/src/sheets/actor/SkillsList.svelte
@@ -106,12 +106,12 @@
   >
     {#each skillRefs as skillRef (skillRef.key)}
       {@const showSkill =
-        skillRef.skill && (showAllSkills || skillRef.skill.value > 0)}
+        skillRef.skill && (showAllSkills || skillRef.skill.prof.hasProficiency > 0)}
 
       {#if showSkill}
         <li
           class="proficiency-row skill"
-          class:proficient={skillRef.skill.value}
+          class:proficient={skillRef.skill.prof.hasProficiency}
           data-tidy-sheet-part={CONSTANTS.SHEET_PARTS.SKILL_CONTAINER}
           data-key={skillRef.key}
         >
@@ -125,7 +125,7 @@
               type="button"
               class="configure-proficiency inline-icon-button"
               on:click={() =>
-                FoundryAdapter.renderProficiencyConfig(
+                FoundryAdapter.renderSkillToolConfig(
                   $context.actor,
                   'skills',
                   skillRef.key,
@@ -174,7 +174,7 @@
               type="button"
               class="tidy5e-skill-name transparent-button rollable"
               on:click={(event) =>
-                $context.actor.rollSkill(skillRef.key, { event })}
+                $context.actor.rollSkill({ skill: skillRef.key, event })}
               data-tidy-sheet-part={CONSTANTS.SHEET_PARTS.SKILL_ROLLER}
               tabindex={$settingStore.useAccessibleKeyboardSupport ? 0 : -1}
               title={skillRef.skill.label}
diff --git a/src/sheets/actor/SpecialSaves.svelte b/src/sheets/actor/SpecialSaves.svelte
index 7cd8d9f87..acb3fa6a0 100644
--- a/src/sheets/actor/SpecialSaves.svelte
+++ b/src/sheets/actor/SpecialSaves.svelte
@@ -17,7 +17,8 @@
     <button
       type="button"
       class="inline-transparent-button flex-row extra-small-gap align-items-center highlight-on-hover"
-      on:click={(ev) => $context.actor.rollConcentration({ event: ev })}
+      on:click={(ev) =>
+        $context.actor.rollConcentration({ event: ev, legacy: false })}
     >
       <Dnd5eIcon src="systems/dnd5e/icons/svg/statuses/concentrating.svg" />
       {save.label}:
@@ -27,8 +28,7 @@
       <button
         type="button"
         class="inline-icon-button"
-        on:click={() =>
-          FoundryAdapter.openActorConcentrationConfig($context.actor)}
+        on:click={() => FoundryAdapter.openConcentrationConfig($context.actor)}
         ><i class="fas fa-cog" style="font-size: var(--icon-size);"></i></button
       >
     {/if}
diff --git a/src/sheets/actor/TempHp.svelte b/src/sheets/actor/TempHp.svelte
index 71f138203..e5397ae2f 100644
--- a/src/sheets/actor/TempHp.svelte
+++ b/src/sheets/actor/TempHp.svelte
@@ -42,7 +42,7 @@
       class="inline-icon-button"
       title={localize('DND5E.HitPointsConfig')}
       on:click|stopPropagation|preventDefault={() =>
-        FoundryAdapter.renderActorHitPointsDialog($context.actor)}
+        FoundryAdapter.renderHitPointsDialog($context.actor)}
       tabindex={$settingStore.useAccessibleKeyboardSupport ? 0 : -1}
     >
       <i class="fas fa-cog" />
diff --git a/src/sheets/actor/traits/TraitSectionTools.svelte b/src/sheets/actor/traits/TraitSectionTools.svelte
index ed8c09c28..54601f399 100644
--- a/src/sheets/actor/traits/TraitSectionTools.svelte
+++ b/src/sheets/actor/traits/TraitSectionTools.svelte
@@ -70,7 +70,8 @@
         <button
           type="button"
           class="tool-check-roller inline-transparent-button rollable"
-          on:click={(event) => $context.actor.rollToolCheck(key, { event })}
+          on:click={(event) =>
+            $context.actor.rollToolCheck({ tool: key, event })}
           data-tidy-sheet-part={CONSTANTS.SHEET_PARTS.TOOL_ROLLER}
           tabindex={$settingStore.useAccessibleKeyboardSupport ? 0 : -1}
         >
@@ -88,11 +89,7 @@
           class="tool-proficiency-editor inline-icon-button"
           title={localize('DND5E.ToolConfigure')}
           on:click|stopPropagation|preventDefault={() =>
-            FoundryAdapter.renderProficiencyConfig(
-              $context.actor,
-              'tools',
-              key,
-            )}
+            FoundryAdapter.renderSkillToolConfig($context.actor, 'tools', key)}
           data-tidy-sheet-part={CONSTANTS.SHEET_PARTS
             .TOOL_CONFIGURATION_CONTROL}
           tabindex={$settingStore.useAccessibleKeyboardSupport ? 0 : -1}
diff --git a/src/sheets/actor/traits/Traits.svelte b/src/sheets/actor/traits/Traits.svelte
index 5fe35530d..0f943d7af 100644
--- a/src/sheets/actor/traits/Traits.svelte
+++ b/src/sheets/actor/traits/Traits.svelte
@@ -49,7 +49,7 @@
       iconCssClass="fas fa-eye"
       configureButtonTitle={localize('DND5E.SensesConfig')}
       on:onConfigureClicked={() =>
-        FoundryAdapter.renderActorSensesConfig($context.actor)}
+        FoundryAdapter.renderMovementSensesConfig($context.actor, 'senses')}
       show={traitsExpanded || !!senses.length}
     >
       <TraitSectionTags tags={senses} />
@@ -66,7 +66,7 @@
         trait: localize('DND5E.Languages'),
       })}
       on:onConfigureClicked={() =>
-        FoundryAdapter.renderTraitsSelector($context.actor, 'languages')}
+        FoundryAdapter.renderTraitsConfig($context.actor, 'languages')}
       show={traitsExpanded || !!languages.length}
     >
       <TraitSectionTags tags={languages} />
@@ -83,7 +83,7 @@
         trait: localize('DND5E.DamImm'),
       })}
       on:onConfigureClicked={() =>
-        FoundryAdapter.renderTraitsSelector($context.actor, 'di')}
+        FoundryAdapter.openDamagesConfig($context.actor, 'di')}
       show={traitsExpanded || !!damageImmunities.length}
     >
       <TraitSectionTags tags={damageImmunities} />
@@ -100,7 +100,7 @@
         trait: localize('DND5E.DamRes'),
       })}
       on:onConfigureClicked={() =>
-        FoundryAdapter.renderTraitsSelector($context.actor, 'dr')}
+        FoundryAdapter.openDamagesConfig($context.actor, 'dr')}
       show={traitsExpanded || !!damageResistances.length}
     >
       <TraitSectionTags tags={damageResistances} />
@@ -117,7 +117,7 @@
         trait: localize('DND5E.DamVuln'),
       })}
       on:onConfigureClicked={() =>
-        FoundryAdapter.renderTraitsSelector($context.actor, 'dv')}
+        FoundryAdapter.openDamagesConfig($context.actor, 'dv')}
       show={traitsExpanded || !!vulnerabilities.length}
     >
       <TraitSectionTags tags={vulnerabilities} />
@@ -132,7 +132,7 @@
         trait: localize('DND5E.DamageModification.Label'),
       })}
       on:onConfigureClicked={() =>
-        FoundryAdapter.openDamageModificationConfig($context.actor)}
+        FoundryAdapter.openDamagesConfig($context.actor, 'dm')}
       show={traitsExpanded || !!$context.traits.traits.dm.length}
     >
       <TraitSectionModifications modifications={$context.traits.traits?.dm} />
@@ -149,7 +149,7 @@
         trait: localize('DND5E.ConImm'),
       })}
       on:onConfigureClicked={() =>
-        FoundryAdapter.renderTraitsSelector($context.actor, 'ci')}
+        FoundryAdapter.renderTraitsConfig($context.actor, 'ci')}
       show={traitsExpanded || !!conditionImmunities.length}
     >
       <TraitSectionTags tags={conditionImmunities} />
@@ -208,7 +208,7 @@
         trait: localize('DND5E.TraitArmorProf'),
       })}
       on:onConfigureClicked={() =>
-        FoundryAdapter.renderTraitsSelector($context.actor, 'armor')}
+        FoundryAdapter.renderTraitsConfig($context.actor, 'armor')}
       show={traitsExpanded || !!armorProfs.length}
     >
       <svg
@@ -241,7 +241,7 @@
         trait: localize('DND5E.TraitToolProf'),
       })}
       on:onConfigureClicked={() =>
-        FoundryAdapter.renderToolSelector($context.actor)}
+        FoundryAdapter.renderToolsConfig($context.actor)}
       show={traitsExpanded || !!tools.length}
     >
       {#if tools.length}
diff --git a/src/sheets/character/parts/CharacterProfile.svelte b/src/sheets/character/parts/CharacterProfile.svelte
index e8373c7d0..d1af9c160 100644
--- a/src/sheets/character/parts/CharacterProfile.svelte
+++ b/src/sheets/character/parts/CharacterProfile.svelte
@@ -39,7 +39,10 @@
       successesField="system.attributes.death.success"
       failuresField="system.attributes.death.failure"
       on:rollDeathSave={(event) =>
-        $context.actor.rollDeathSave({ event: event.detail.mouseEvent })}
+        $context.actor.rollDeathSave({
+          event: event.detail.mouseEvent,
+          legacy: false,
+        })}
       hasHpOverlay={$settingStore.useHpOverlay}
     />
   {/if}
diff --git a/src/sheets/character/parts/HitDice.svelte b/src/sheets/character/parts/HitDice.svelte
index 56a7f3bfa..fb00e7959 100644
--- a/src/sheets/character/parts/HitDice.svelte
+++ b/src/sheets/character/parts/HitDice.svelte
@@ -27,7 +27,7 @@
     type="button"
     class="current-hd config-button transparent-button"
     on:click={$context.editable &&
-      FoundryAdapter.renderActorHitDiceConfig($context.actor)}
+      FoundryAdapter.renderHitDiceConfig($context.actor)}
     disabled={!$context.editable}
     tabindex={!$settingStore.useDefaultSheetHpTabbing &&
     $settingStore.useAccessibleKeyboardSupport
diff --git a/src/sheets/group/parts/GroupMemberListItem.svelte b/src/sheets/group/parts/GroupMemberListItem.svelte
index 2701c457d..f5ad3d508 100644
--- a/src/sheets/group/parts/GroupMemberListItem.svelte
+++ b/src/sheets/group/parts/GroupMemberListItem.svelte
@@ -29,10 +29,19 @@
     },
   ) {
     if (ctx.perception) {
-      member.rollSkill(ctx.perception.key, {
-        rollMode: CONST.DICE_ROLL_MODES.BLIND,
-        event: event,
-      });
+      member.rollSkill(
+        {
+          skill: ctx.perception.key,
+          event: event,
+        },
+        {
+          options: {
+            default: {
+              rollMode: CONST.DICE_ROLL_MODES.BLIND,
+            },
+          },
+        },
+      );
     }
   }
 </script>
diff --git a/src/sheets/item/tabs/ItemEquipmentDetailsTab.svelte b/src/sheets/item/tabs/ItemEquipmentDetailsTab.svelte
index fd502fccc..bda06896e 100644
--- a/src/sheets/item/tabs/ItemEquipmentDetailsTab.svelte
+++ b/src/sheets/item/tabs/ItemEquipmentDetailsTab.svelte
@@ -49,26 +49,28 @@
   </div>
 
   <!-- Equipment Base -->
-  <div class="form-group">
-    <label for="{appId}-type-baseItem"
-      >{localize('DND5E.ItemEquipmentBase')}</label
-    >
-    <Select
-      id="{appId}-type-baseItem"
-      document={$context.item}
-      field="system.type.baseItem"
-      value={$context.source.type.baseItem}
-      blankValue=""
-      disabled={!$context.editable}
-    >
-      <SelectOptions
-        data={$context.baseItems}
-        labelProp="label"
-        valueProp="value"
-        blank=""
-      />
-    </Select>
-  </div>
+  {#if Object.keys($context.baseItems ?? {}).length}
+    <div class="form-group">
+      <label for="{appId}-type-baseItem"
+        >{localize('DND5E.ItemEquipmentBase')}</label
+      >
+      <Select
+        id="{appId}-type-baseItem"
+        document={$context.item}
+        field="system.type.baseItem"
+        value={$context.source.type.baseItem}
+        blankValue=""
+        disabled={!$context.editable}
+      >
+        <SelectOptions
+          data={$context.baseItems}
+          labelProp="label"
+          valueProp="value"
+          blank=""
+        />
+      </Select>
+    </div>
+  {/if}
 
   <!-- Proficiency -->
   <div class="form-group">
@@ -126,7 +128,9 @@
         {/if}
 
         <div class="form-group label-top">
-          <label for="{appId}-strength">{localize('DND5E.AbilityStr')}</label>
+          <label for="{appId}-armor-strength"
+            >{localize('DND5E.AbilityStr')}</label
+          >
           <NumberInput
             id="{appId}-armor-strength"
             document={$context.item}
diff --git a/src/sheets/item/tabs/ItemSpeciesDescriptionTab.svelte b/src/sheets/item/tabs/ItemSpeciesDescriptionTab.svelte
index 53aa1e345..6548167a4 100644
--- a/src/sheets/item/tabs/ItemSpeciesDescriptionTab.svelte
+++ b/src/sheets/item/tabs/ItemSpeciesDescriptionTab.svelte
@@ -30,7 +30,8 @@
         <button
           class="inline-icon-button hidden-config-button"
           type="button"
-          on:click={() => FoundryAdapter.renderItemTypeConfig($context.item)}
+          on:click={() =>
+            FoundryAdapter.renderCreatureTypeConfig($context.item)}
           tabindex={$settingStore.useAccessibleKeyboardSupport ? 0 : -1}
         >
           <i class="fas fa-cog" />
@@ -48,7 +49,10 @@
           class="inline-icon-button hidden-config-button"
           data-action="movement"
           on:click={() =>
-            FoundryAdapter.renderItemMovementConfig($context.item)}
+            FoundryAdapter.renderMovementSensesConfig(
+              $context.item,
+              'movement',
+            )}
           tabindex={$settingStore.useAccessibleKeyboardSupport ? 0 : -1}
         >
           <i class="fas fa-cog" />
@@ -69,7 +73,8 @@
           type="button"
           class="inline-icon-button hidden-config-button"
           data-action="senses"
-          on:click={() => FoundryAdapter.renderItemSensesConfig($context.item)}
+          on:click={() =>
+            FoundryAdapter.renderMovementSensesConfig($context.item, 'senses')}
           tabindex={$settingStore.useAccessibleKeyboardSupport ? 0 : -1}
         >
           <i class="fas fa-cog" />
diff --git a/src/sheets/item/tabs/ItemToolDetailsTab.svelte b/src/sheets/item/tabs/ItemToolDetailsTab.svelte
index c07dd9969..83f01b06b 100644
--- a/src/sheets/item/tabs/ItemToolDetailsTab.svelte
+++ b/src/sheets/item/tabs/ItemToolDetailsTab.svelte
@@ -37,18 +37,21 @@
   </div>
 
   <!-- Base Tool -->
-  <div class="form-group">
-    <label for="{appId}-type-baseItem">{localize('DND5E.ItemToolBase')}</label>
-    <Select
-      id="{appId}-type-baseItem"
-      document={$context.item}
-      field="system.type.baseItem"
-      value={$context.source.type.baseItem}
-      disabled={!$context.editable}
-    >
-      <SelectOptions data={$context.baseItems} blank="" />
-    </Select>
-  </div>
+  {#if Object.keys($context.baseItems ?? {}).length}
+    <div class="form-group">
+      <label for="{appId}-type-baseItem">{localize('DND5E.ItemToolBase')}</label
+      >
+      <Select
+        id="{appId}-type-baseItem"
+        document={$context.item}
+        field="system.type.baseItem"
+        value={$context.source.type.baseItem}
+        disabled={!$context.editable}
+      >
+        <SelectOptions data={$context.baseItems} blank="" />
+      </Select>
+    </div>
+  {/if}
 
   <!-- Tool Properties -->
   <div class="form-group stacked tool-properties">
@@ -58,8 +61,7 @@
 
   <!-- Ability Check -->
   <div class="form-group">
-    <label for="{appId}-proficient">{localize('DND5E.ActionAbil')}</label
-    >
+    <label for="{appId}-proficient">{localize('DND5E.ActionAbil')}</label>
     <div class="form-fields">
       <!-- Proficiency -->
       <div class="form-group label-top">
diff --git a/src/sheets/item/tabs/ItemWeaponDetailsTab.svelte b/src/sheets/item/tabs/ItemWeaponDetailsTab.svelte
index 738edf75c..3d2a20451 100644
--- a/src/sheets/item/tabs/ItemWeaponDetailsTab.svelte
+++ b/src/sheets/item/tabs/ItemWeaponDetailsTab.svelte
@@ -42,19 +42,22 @@
   </div>
 
   <!-- Weapon Base -->
-  <div class="form-group">
-    <label for="{appId}-type-baseItem">{localize('DND5E.ItemWeaponBase')}</label
-    >
-    <Select
-      id="{appId}-type-baseItem"
-      document={$context.item}
-      field="system.type.baseItem"
-      value={$context.source.type.baseItem}
-      disabled={!$context.editable}
-    >
-      <SelectOptions data={$context.baseItems} blank="" />
-    </Select>
-  </div>
+  {#if Object.keys($context.baseItems ?? {}).length}
+    <div class="form-group">
+      <label for="{appId}-type-baseItem"
+        >{localize('DND5E.ItemWeaponBase')}</label
+      >
+      <Select
+        id="{appId}-type-baseItem"
+        document={$context.item}
+        field="system.type.baseItem"
+        value={$context.source.type.baseItem}
+        disabled={!$context.editable}
+      >
+        <SelectOptions data={$context.baseItems} blank="" />
+      </Select>
+    </div>
+  {/if}
 
   <!-- Proficiency -->
   {#if !$context.item.isMountable}
@@ -79,8 +82,11 @@
 
   <!-- Weapon Mastery -->
   <div class="form-group">
-    <label for="">{localize('DND5E.WEAPON.FIELDS.mastery.label')}</label>
+    <label for="{appId}-weapon-mastery">
+      {localize('DND5E.WEAPON.FIELDS.mastery.label')}
+    </label>
     <Select
+      id="{appId}-weapon-mastery"
       document={$context.item}
       field="system.mastery"
       value={$context.source.mastery}
diff --git a/src/sheets/npc/NpcSheetFull.svelte b/src/sheets/npc/NpcSheetFull.svelte
index c44db1bb3..59462bf26 100644
--- a/src/sheets/npc/NpcSheetFull.svelte
+++ b/src/sheets/npc/NpcSheetFull.svelte
@@ -250,7 +250,7 @@
       border-radius: 0.1875rem;
       background: var(--t5e-faint-color);
       color: var(--t5e-secondary-color);
-      font-size: 1.25rem;
+      font-size: 1.125rem;
       line-height: 1;
       height: 1.5rem;
       white-space: nowrap;
diff --git a/src/sheets/npc/parts/NpcProfile.svelte b/src/sheets/npc/parts/NpcProfile.svelte
index b750ea1fc..387fe68ef 100644
--- a/src/sheets/npc/parts/NpcProfile.svelte
+++ b/src/sheets/npc/parts/NpcProfile.svelte
@@ -38,7 +38,10 @@
       successesField="system.attributes.death.success"
       failuresField="system.attributes.death.failure"
       on:rollDeathSave={(event) =>
-        $context.actor.rollDeathSave({ event: event.detail.mouseEvent })}
+        $context.actor.rollDeathSave({
+          event: event.detail.mouseEvent,
+          legacy: false,
+        })}
       hasHpOverlay={$settingStore.useHpOverlayNpc}
     />
   {/if}
diff --git a/src/sheets/npc/tabs/NpcAbilitiesTab.svelte b/src/sheets/npc/tabs/NpcAbilitiesTab.svelte
index 414ce82b3..c4b8c6e01 100644
--- a/src/sheets/npc/tabs/NpcAbilitiesTab.svelte
+++ b/src/sheets/npc/tabs/NpcAbilitiesTab.svelte
@@ -133,6 +133,7 @@
       controls.push({
         component: ItemDeleteControl,
         props: ({ item }) => ({ item }),
+        visible: ({ item }) => item.canDelete,
       });
     }
 
diff --git a/src/sheets/shared/InlineCreatureType.svelte b/src/sheets/shared/InlineCreatureType.svelte
index bc68bed22..d80b4623c 100644
--- a/src/sheets/shared/InlineCreatureType.svelte
+++ b/src/sheets/shared/InlineCreatureType.svelte
@@ -13,11 +13,6 @@
 
   $: text = coalesce($context.labels.type, localize('DND5E.CreatureType'));
 
-  $: configFn =
-    $context.actor.type === 'character'
-      ? FoundryAdapter.openCharacterActorTypeConfig
-      : FoundryAdapter.openActorTypeConfig;
-
   const localize = FoundryAdapter.localize;
 </script>
 
@@ -25,7 +20,7 @@
   <button
     type="button"
     class="configure-creature-type inline-transparent-button highlight-on-hover truncate"
-    on:click={() => configFn($context.actor)}
+    on:click={() => FoundryAdapter.renderCreatureTypeConfig($context.actor)}
     title={localize('DND5E.CreatureType')}
     tabindex={$settingStore.useAccessibleKeyboardSupport ? 0 : -1}
   >
diff --git a/src/utils/formula.ts b/src/utils/formula.ts
index 37c59737f..7888cc9d2 100644
--- a/src/utils/formula.ts
+++ b/src/utils/formula.ts
@@ -7,6 +7,13 @@ import type {
 } from 'src/types/types';
 import { FoundryAdapter } from 'src/foundry/foundry-adapter';
 import { isNil } from './data';
+import type {
+  BasicRollConfiguration,
+  BasicRollDialogConfiguration,
+  BasicRollMessageConfiguration,
+  BasicRollProcessConfiguration,
+} from 'src/foundry/foundry.types';
+import { TidyFlags } from 'src/foundry/TidyFlags';
 
 export function scaleCantripDamageFormula(spell: Item5e, formula: string) {
   try {
@@ -52,7 +59,7 @@ export function simplifyFormula(
 
     const simplifiedTerms = roll.terms.map((t: any) =>
       t.isIntermediate
-        ? new NumericTerm({
+        ? new foundry.dice.terms.NumericTerm({
             number: t.evaluate().total,
             options: t.options,
           })
@@ -250,7 +257,7 @@ function calculateDeterministicBonus(rawBonus: string): number {
     return 0;
   }
 
-  let bonusRoll = Roll.fromTerms([new NumericTerm(0)]);
+  let bonusRoll = Roll.fromTerms([new foundry.dice.terms.NumericTerm(0)]);
   try {
     bonusRoll = Roll.fromTerms(deterministicRawBonus);
 
@@ -308,12 +315,40 @@ export function getDcTooltip(actor: Actor5e, spellAbility: string) {
 
 type RawSpellAttackType = 'rsak' | 'msak';
 
-export function rollRawSpellAttack(
+export async function rollRawSpellAttack(
   ev: MouseEvent,
   actor: Actor5e,
   attackType?: RawSpellAttackType,
   spellcastingAbility?: string
 ) {
+  const rollConfig: BasicRollProcessConfiguration = {
+    evaluate: true,
+    event: ev,
+    hookNames: ['rawSpellAttack', 'd20Test'],
+    rolls: [getSpellAttackRoll(actor, attackType, spellcastingAbility)],
+    subject: actor,
+  };
+
+  let flavorKey =
+    attackType === 'rsak'
+      ? 'TIDY5E.ActorRangedSpellAttackFlavorText'
+      : attackType === 'msak'
+      ? 'TIDY5E.ActorMeleeSpellAttackFlavorText'
+      : 'TIDY5E.ActorSpellAttackFlavorText';
+
+  let flavor = FoundryAdapter.localize(flavorKey);
+
+  const messageConfig: BasicRollMessageConfiguration = {
+    rollMode: game.settings.get('core', 'rollMode'),
+    data: {
+      'flags.dnd5e.roll': {
+        type: 'attack',
+      },
+      speaker: ChatMessage.getSpeaker({ actor: actor }),
+      flavor,
+    },
+  };
+
   let titleKey =
     attackType === 'rsak'
       ? 'TIDY5E.ActorRangedSpellAttackTitle'
@@ -325,23 +360,39 @@ export function rollRawSpellAttack(
     actorName: actor.name,
   });
 
-  let flavorKey =
-    attackType === 'rsak'
-      ? 'TIDY5E.ActorRangedSpellAttackFlavorText'
-      : attackType === 'msak'
-      ? 'TIDY5E.ActorMeleeSpellAttackFlavorText'
-      : 'TIDY5E.ActorSpellAttackFlavorText';
+  const dialog: BasicRollDialogConfiguration = {
+    options: { title },
+  };
 
-  let flavor = FoundryAdapter.localize(flavorKey);
+  const rolls = await CONFIG.Dice.D20Roll.build(
+    rollConfig,
+    dialog,
+    messageConfig
+  );
+
+  debug(rolls);
+}
 
+function getSpellAttackRoll(
+  actor: any,
+  attackType: string | undefined,
+  spellcastingAbility: string | undefined
+): BasicRollConfiguration {
   const effectiveAttackType = attackType ?? 'rsak';
 
-  const rollData: Record<string, string> = {};
+  const rollData: Record<string, any> = {};
+
   const parts: string[] = [];
 
   // Ability score modifier
-  spellcastingAbility ??= actor.system.attributes.spellcasting;
+  const filteredClass = TidyFlags.classFilter.get(actor);
+
+  spellcastingAbility ??= actor.itemTypes.class.find(
+    (x: Item5e) => x.system.identifier === filteredClass
+  )?.system.spellcasting?.ability;
+
   const spellcastingMod = actor.system.abilities[spellcastingAbility!]?.mod;
+
   if (spellcastingAbility !== 'none' && spellcastingMod) {
     parts.push('@mod');
     rollData.mod = spellcastingMod;
@@ -357,30 +408,13 @@ export function rollRawSpellAttack(
     parts.push(actorBonusAttack);
   }
 
-  const rollConfig = foundry.utils.mergeObject(
-    {
-      actor: actor,
-      data: rollData,
-      critical: actor.flags['dnd5e']?.spellCriticalThreshold,
-      title: title,
-      flavor: flavor,
+  return {
+    parts,
+    data: rollData,
+    options: {
       elvenAccuracy: actor.flags['dnd5e']?.elvenAccuracy ?? false,
       halflingLucky: actor.flags['dnd5e']?.halflingLucky ?? false,
-      dialogOptions: {
-        width: 400,
-        top: ev ? ev.clientY - 80 : null,
-        left: ev ? ev.clientX + 40 : null,
-      },
-      messageData: {
-        'flags.dnd5e.roll': {
-          type: 'attack',
-        },
-        speaker: ChatMessage.getSpeaker({ actor: actor }),
-      },
-      event: ev,
     },
-    {}
-  );
-  rollConfig.parts = parts;
-  dnd5e.dice.d20Roll(rollConfig);
+    subject: actor,
+  };
 }