diff --git a/scripts/app.mjs b/scripts/app.mjs
index c08fba7..96515ee 100644
--- a/scripts/app.mjs
+++ b/scripts/app.mjs
@@ -97,61 +97,86 @@ export class DhPathBrowserApp extends HandlebarsApplicationMixin(ApplicationV2)
   static getChangeChoices() {
     const ignoredActorKeys = ['config', 'DhEnvironment', 'DhParty'];
 
-    const getAllLeaves = (root, group, parentPath = '') => {
+    const getTranslations = (model, path) => {
+        if (path === 'resources.hope.max')
+            return {
+                label: game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.FIELDS.maxHope.label'),
+                hint: ''
+            };
+        
+        // Armor overrides
+        if (path.endsWith('armor.max')) return { label: game.i18n.localize('DAGGERHEART.ArmorScoreMax'), hint: '' };
+        if (path.endsWith('armor.current')) return { label: game.i18n.localize('DAGGERHEART.ArmorScoreCurrent'), hint: '' };
+
+        const field = model.schema.getField(path);
+        return {
+            label: field ? game.i18n.localize(field.label) : path,
+            hint: field ? game.i18n.localize(field.hint) : ''
+        };
+    };
+
+    const getAllLeaves = (model, root, group, parentPath = '') => {
+        if (!root) return [];
         const leaves = [];
         const rootKey = `${parentPath ? `${parentPath}.` : ''}${root.name}`;
-        for (const field of Object.values(root.fields)) {
-            if (field instanceof foundry.data.fields.SchemaField)
-                leaves.push(...getAllLeaves(field, group, rootKey));
-            else
+        
+        const fields = root.fields || root;
+        
+        for (const [name, field] of Object.entries(fields)) {
+            const currentPath = `${rootKey}.${name}`;
+            if (field instanceof foundry.data.fields.SchemaField) {
+                leaves.push(...getAllLeaves(model, field, group, rootKey));
+            } else {
+                const trans = getTranslations(model, currentPath);
                 leaves.push({
-                    value: `${rootKey}.${field.name}`,
-                    label: game.i18n.localize(field.label),
-                    hint: game.i18n.localize(field.hint),
+                    value: currentPath,
+                    label: trans.label || name,
+                    hint: trans.hint || '',
                     group
                 });
+            }
         }
         return leaves;
     };
 
-    return Object.keys(game.system.api.models.actors).reduce((acc, key) => {
-        if (ignoredActorKeys.includes(key)) return acc;
+    const choices = [];
+
+    // Process Actors
+    for (const [key, model] of Object.entries(game.system.api.models.actors)) {
+        if (ignoredActorKeys.includes(key)) continue;
 
-        const model = game.system.api.models.actors[key];
         const group = game.i18n.localize(model.metadata.label);
         const attributes = CONFIG.Token.documentClass.getTrackedAttributes(model.metadata.type);
 
-        const getTranslations = path => {
-            if (path === 'resources.hope.max')
-                return {
-                    label: game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.FIELDS.maxHope.label'),
-                    hint: ''
-                };
-
-            const field = model.schema.getField(path);
-            return {
-                label: field ? game.i18n.localize(field.label) : path,
-                hint: field ? game.i18n.localize(field.hint) : ''
-            };
-        };
-
         const bars = attributes.bar.flatMap(x => {
             const baseJoined = x.join('.');
             return [
-                { value: `${baseJoined}.max`, ...getTranslations(`${baseJoined}.max`), group },
-                { value: `${baseJoined}.value`, ...getTranslations(`${baseJoined}.value`), group }
+                { value: `${baseJoined}.max`, ...getTranslations(model, `${baseJoined}.max`), group },
+                { value: `${baseJoined}.value`, ...getTranslations(model, `${baseJoined}.value`), group }
             ];
         });
         const values = attributes.value.flatMap(x => {
             const joined = x.join('.');
-            return { value: joined, ...getTranslations(joined), group };
+            return { value: joined, ...getTranslations(model, joined), group };
         });
 
-        const bonuses = getAllLeaves(model.schema.fields.bonuses, group);
-        const rules = getAllLeaves(model.schema.fields.rules, group);
+        const bonuses = getAllLeaves(model, model.schema.fields.bonuses, group);
+        const rules = getAllLeaves(model, model.schema.fields.rules, group);
+        const armor = getAllLeaves(model, model.schema.fields.armor, group);
 
-        acc.push(...bars, ...values, ...rules, ...bonuses);
-        return acc;
-    }, []);
+        choices.push(...bars, ...values, ...rules, ...bonuses, ...armor);
+    }
+
+    // Process Items
+    for (const [key, model] of Object.entries(game.system.api.models.items)) {
+        const group = `${game.i18n.localize('DOCUMENT.Item')} (${game.i18n.localize(model.metadata.label)})`;
+        
+        const bonuses = getAllLeaves(model, model.schema.fields.bonuses, group);
+        const armor = getAllLeaves(model, model.schema.fields.armor, group);
+        
+        choices.push(...bonuses, ...armor);
+    }
+
+    return choices;
   }
 }