diff --git a/modules/hero6-actor-sheet.js b/modules/hero6-actor-sheet.js
index 7a63865..b2c16fa 100644
--- a/modules/hero6-actor-sheet.js
+++ b/modules/hero6-actor-sheet.js
@@ -50,7 +50,8 @@ export class Hero6ActorSheet extends ActorSheet {
       weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
       armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())),
       shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())),
-      equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsMoneys()) ),
+      moneys: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getMoneys())),
+      equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipments()) ),
       subActors: duplicate(this.actor.getSubActors()),
       race: duplicate(this.actor.getRace()),
       encCapacity: this.actor.getEncumbranceCapacity(),
diff --git a/modules/hero6-actor.js b/modules/hero6-actor.js
index bf48c42..f55f2d0 100644
--- a/modules/hero6-actor.js
+++ b/modules/hero6-actor.js
@@ -326,6 +326,11 @@ export class Hero6Actor extends Actor {
     Hero6Utility.sortArrayObjectsByName(list)
     return list
   }
+  getMoneys() {
+    let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "money");
+    Hero6Utility.sortArrayObjectsByName(list)
+    return list
+  }
   getWeapons() {
     let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "weapon");
     Hero6Utility.sortArrayObjectsByName(list)
diff --git a/packs/complications/000072.log b/packs/complications/000076.log
similarity index 100%
rename from packs/complications/000072.log
rename to packs/complications/000076.log
diff --git a/packs/complications/CURRENT b/packs/complications/CURRENT
index bcf1079..f8d57cc 100644
--- a/packs/complications/CURRENT
+++ b/packs/complications/CURRENT
@@ -1 +1 @@
-MANIFEST-000070
+MANIFEST-000074
diff --git a/packs/complications/LOG b/packs/complications/LOG
index bf0d2da..a562aca 100644
--- a/packs/complications/LOG
+++ b/packs/complications/LOG
@@ -1,8 +1,8 @@
-2023/08/15-21:47:51.923693 7fa0ddffb6c0 Recovering log #68
-2023/08/15-21:47:52.020246 7fa0ddffb6c0 Delete type=3 #66
-2023/08/15-21:47:52.020324 7fa0ddffb6c0 Delete type=0 #68
-2023/08/15-22:11:19.852100 7f9e3ffff6c0 Level-0 table #73: started
-2023/08/15-22:11:19.852160 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
-2023/08/15-22:11:19.858657 7f9e3ffff6c0 Delete type=0 #71
-2023/08/15-22:11:19.859003 7f9e3ffff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/15-22:11:19.859027 7f9e3ffff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/22-22:40:59.336016 7f4f611fe6c0 Recovering log #72
+2023/08/22-22:40:59.352816 7f4f611fe6c0 Delete type=3 #70
+2023/08/22-22:40:59.352919 7f4f611fe6c0 Delete type=0 #72
+2023/08/22-23:29:53.757052 7f4ccb7fe6c0 Level-0 table #77: started
+2023/08/22-23:29:53.757077 7f4ccb7fe6c0 Level-0 table #77: 0 bytes OK
+2023/08/22-23:29:53.763742 7f4ccb7fe6c0 Delete type=0 #75
+2023/08/22-23:29:53.772111 7f4ccb7fe6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/22-23:29:53.772172 7f4ccb7fe6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
diff --git a/packs/complications/LOG.old b/packs/complications/LOG.old
index 814794f..bf0d2da 100644
--- a/packs/complications/LOG.old
+++ b/packs/complications/LOG.old
@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.564375 7fd68f7fe6c0 Recovering log #64
-2023/08/10-13:03:20.579793 7fd68f7fe6c0 Delete type=3 #62
-2023/08/10-13:03:20.579835 7fd68f7fe6c0 Delete type=0 #64
-2023/08/10-13:05:41.069254 7fd40dfff6c0 Level-0 table #69: started
-2023/08/10-13:05:41.069298 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
-2023/08/10-13:05:41.080890 7fd40dfff6c0 Delete type=0 #67
-2023/08/10-13:05:41.092975 7fd40dfff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.100392 7fd40dfff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/15-21:47:51.923693 7fa0ddffb6c0 Recovering log #68
+2023/08/15-21:47:52.020246 7fa0ddffb6c0 Delete type=3 #66
+2023/08/15-21:47:52.020324 7fa0ddffb6c0 Delete type=0 #68
+2023/08/15-22:11:19.852100 7f9e3ffff6c0 Level-0 table #73: started
+2023/08/15-22:11:19.852160 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
+2023/08/15-22:11:19.858657 7f9e3ffff6c0 Delete type=0 #71
+2023/08/15-22:11:19.859003 7f9e3ffff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/15-22:11:19.859027 7f9e3ffff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
diff --git a/packs/complications/MANIFEST-000070 b/packs/complications/MANIFEST-000070
deleted file mode 100644
index d78ca2b..0000000
Binary files a/packs/complications/MANIFEST-000070 and /dev/null differ
diff --git a/packs/complications/MANIFEST-000074 b/packs/complications/MANIFEST-000074
new file mode 100644
index 0000000..86b085a
Binary files /dev/null and b/packs/complications/MANIFEST-000074 differ
diff --git a/packs/equipment/000072.log b/packs/equipment/000076.log
similarity index 100%
rename from packs/equipment/000072.log
rename to packs/equipment/000076.log
diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT
index bcf1079..f8d57cc 100644
--- a/packs/equipment/CURRENT
+++ b/packs/equipment/CURRENT
@@ -1 +1 @@
-MANIFEST-000070
+MANIFEST-000074
diff --git a/packs/equipment/LOG b/packs/equipment/LOG
index 8b2212a..28484c0 100644
--- a/packs/equipment/LOG
+++ b/packs/equipment/LOG
@@ -1,7 +1,7 @@
-2023/08/15-21:47:51.802290 7fa0dd7fa6c0 Recovering log #68
-2023/08/15-21:47:51.859664 7fa0dd7fa6c0 Delete type=3 #66
-2023/08/15-21:47:51.859782 7fa0dd7fa6c0 Delete type=0 #68
-2023/08/15-22:11:19.813491 7f9e3ffff6c0 Level-0 table #73: started
-2023/08/15-22:11:19.813538 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
-2023/08/15-22:11:19.819750 7f9e3ffff6c0 Delete type=0 #71
-2023/08/15-22:11:19.829889 7f9e3ffff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/22-22:40:59.298385 7f4ccbfff6c0 Recovering log #72
+2023/08/22-22:40:59.311659 7f4ccbfff6c0 Delete type=3 #70
+2023/08/22-22:40:59.311717 7f4ccbfff6c0 Delete type=0 #72
+2023/08/22-23:29:53.706564 7f4ccb7fe6c0 Level-0 table #77: started
+2023/08/22-23:29:53.706634 7f4ccb7fe6c0 Level-0 table #77: 0 bytes OK
+2023/08/22-23:29:53.713891 7f4ccb7fe6c0 Delete type=0 #75
+2023/08/22-23:29:53.724567 7f4ccb7fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs/equipment/LOG.old b/packs/equipment/LOG.old
index 5423bdb..8b2212a 100644
--- a/packs/equipment/LOG.old
+++ b/packs/equipment/LOG.old
@@ -1,7 +1,7 @@
-2023/08/10-13:03:20.538109 7fd6a4bfa6c0 Recovering log #64
-2023/08/10-13:03:20.547376 7fd6a4bfa6c0 Delete type=3 #62
-2023/08/10-13:03:20.547429 7fd6a4bfa6c0 Delete type=0 #64
-2023/08/10-13:05:41.019934 7fd40dfff6c0 Level-0 table #69: started
-2023/08/10-13:05:41.019967 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
-2023/08/10-13:05:41.026189 7fd40dfff6c0 Delete type=0 #67
-2023/08/10-13:05:41.026358 7fd40dfff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/15-21:47:51.802290 7fa0dd7fa6c0 Recovering log #68
+2023/08/15-21:47:51.859664 7fa0dd7fa6c0 Delete type=3 #66
+2023/08/15-21:47:51.859782 7fa0dd7fa6c0 Delete type=0 #68
+2023/08/15-22:11:19.813491 7f9e3ffff6c0 Level-0 table #73: started
+2023/08/15-22:11:19.813538 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
+2023/08/15-22:11:19.819750 7f9e3ffff6c0 Delete type=0 #71
+2023/08/15-22:11:19.829889 7f9e3ffff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs/equipment/MANIFEST-000070 b/packs/equipment/MANIFEST-000070
deleted file mode 100644
index aa5ef8a..0000000
Binary files a/packs/equipment/MANIFEST-000070 and /dev/null differ
diff --git a/packs/equipment/MANIFEST-000074 b/packs/equipment/MANIFEST-000074
new file mode 100644
index 0000000..7274296
Binary files /dev/null and b/packs/equipment/MANIFEST-000074 differ
diff --git a/packs/maneuvers/000064.log b/packs/maneuvers/000068.log
similarity index 100%
rename from packs/maneuvers/000064.log
rename to packs/maneuvers/000068.log
diff --git a/packs/maneuvers/CURRENT b/packs/maneuvers/CURRENT
index 5ca571d..7873dc6 100644
--- a/packs/maneuvers/CURRENT
+++ b/packs/maneuvers/CURRENT
@@ -1 +1 @@
-MANIFEST-000062
+MANIFEST-000066
diff --git a/packs/maneuvers/LOG b/packs/maneuvers/LOG
index 4692f24..6f2ff20 100644
--- a/packs/maneuvers/LOG
+++ b/packs/maneuvers/LOG
@@ -1,8 +1,8 @@
-2023/08/15-21:47:51.927283 7fa0dcff96c0 Recovering log #60
-2023/08/15-21:47:52.038744 7fa0dcff96c0 Delete type=3 #58
-2023/08/15-21:47:52.038839 7fa0dcff96c0 Delete type=0 #60
-2023/08/15-22:11:19.865715 7f9e3ffff6c0 Level-0 table #65: started
-2023/08/15-22:11:19.865740 7f9e3ffff6c0 Level-0 table #65: 0 bytes OK
-2023/08/15-22:11:19.872425 7f9e3ffff6c0 Delete type=0 #63
-2023/08/15-22:11:19.879299 7f9e3ffff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/15-22:11:19.879345 7f9e3ffff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/22-22:40:59.337815 7f4f619ff6c0 Recovering log #64
+2023/08/22-22:40:59.356018 7f4f619ff6c0 Delete type=3 #62
+2023/08/22-22:40:59.356080 7f4f619ff6c0 Delete type=0 #64
+2023/08/22-23:29:53.764110 7f4ccb7fe6c0 Level-0 table #69: started
+2023/08/22-23:29:53.764186 7f4ccb7fe6c0 Level-0 table #69: 0 bytes OK
+2023/08/22-23:29:53.771884 7f4ccb7fe6c0 Delete type=0 #67
+2023/08/22-23:29:53.772181 7f4ccb7fe6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/22-23:29:53.772223 7f4ccb7fe6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
diff --git a/packs/maneuvers/LOG.old b/packs/maneuvers/LOG.old
index d53f19e..4692f24 100644
--- a/packs/maneuvers/LOG.old
+++ b/packs/maneuvers/LOG.old
@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.566148 7fd6a4bfa6c0 Recovering log #56
-2023/08/10-13:03:20.582806 7fd6a4bfa6c0 Delete type=3 #54
-2023/08/10-13:03:20.582865 7fd6a4bfa6c0 Delete type=0 #56
-2023/08/10-13:05:41.081044 7fd40dfff6c0 Level-0 table #61: started
-2023/08/10-13:05:41.081087 7fd40dfff6c0 Level-0 table #61: 0 bytes OK
-2023/08/10-13:05:41.092838 7fd40dfff6c0 Delete type=0 #59
-2023/08/10-13:05:41.100288 7fd40dfff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.109268 7fd40dfff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/15-21:47:51.927283 7fa0dcff96c0 Recovering log #60
+2023/08/15-21:47:52.038744 7fa0dcff96c0 Delete type=3 #58
+2023/08/15-21:47:52.038839 7fa0dcff96c0 Delete type=0 #60
+2023/08/15-22:11:19.865715 7f9e3ffff6c0 Level-0 table #65: started
+2023/08/15-22:11:19.865740 7f9e3ffff6c0 Level-0 table #65: 0 bytes OK
+2023/08/15-22:11:19.872425 7f9e3ffff6c0 Delete type=0 #63
+2023/08/15-22:11:19.879299 7f9e3ffff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/15-22:11:19.879345 7f9e3ffff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
diff --git a/packs/maneuvers/MANIFEST-000062 b/packs/maneuvers/MANIFEST-000062
deleted file mode 100644
index 7f8d14d..0000000
Binary files a/packs/maneuvers/MANIFEST-000062 and /dev/null differ
diff --git a/packs/maneuvers/MANIFEST-000066 b/packs/maneuvers/MANIFEST-000066
new file mode 100644
index 0000000..0edba1c
Binary files /dev/null and b/packs/maneuvers/MANIFEST-000066 differ
diff --git a/packs/perks/000072.log b/packs/perks/000076.log
similarity index 100%
rename from packs/perks/000072.log
rename to packs/perks/000076.log
diff --git a/packs/perks/CURRENT b/packs/perks/CURRENT
index bcf1079..f8d57cc 100644
--- a/packs/perks/CURRENT
+++ b/packs/perks/CURRENT
@@ -1 +1 @@
-MANIFEST-000070
+MANIFEST-000074
diff --git a/packs/perks/LOG b/packs/perks/LOG
index ce363af..9c4cf83 100644
--- a/packs/perks/LOG
+++ b/packs/perks/LOG
@@ -1,8 +1,8 @@
-2023/08/15-21:47:52.040277 7fa0ddffb6c0 Recovering log #68
-2023/08/15-21:47:52.138553 7fa0ddffb6c0 Delete type=3 #66
-2023/08/15-21:47:52.138627 7fa0ddffb6c0 Delete type=0 #68
-2023/08/15-22:11:19.859141 7f9e3ffff6c0 Level-0 table #73: started
-2023/08/15-22:11:19.859174 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
-2023/08/15-22:11:19.865615 7f9e3ffff6c0 Delete type=0 #71
-2023/08/15-22:11:19.879276 7f9e3ffff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/15-22:11:19.879335 7f9e3ffff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/22-22:40:59.357323 7f4f619ff6c0 Recovering log #72
+2023/08/22-22:40:59.374012 7f4f619ff6c0 Delete type=3 #70
+2023/08/22-22:40:59.374211 7f4f619ff6c0 Delete type=0 #72
+2023/08/22-23:29:53.772291 7f4ccb7fe6c0 Level-0 table #77: started
+2023/08/22-23:29:53.772322 7f4ccb7fe6c0 Level-0 table #77: 0 bytes OK
+2023/08/22-23:29:53.780231 7f4ccb7fe6c0 Delete type=0 #75
+2023/08/22-23:29:53.787239 7f4ccb7fe6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/22-23:29:53.787283 7f4ccb7fe6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
diff --git a/packs/perks/LOG.old b/packs/perks/LOG.old
index 88938de..ce363af 100644
--- a/packs/perks/LOG.old
+++ b/packs/perks/LOG.old
@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.581819 7fd68f7fe6c0 Recovering log #64
-2023/08/10-13:03:20.598440 7fd68f7fe6c0 Delete type=3 #62
-2023/08/10-13:03:20.598503 7fd68f7fe6c0 Delete type=0 #64
-2023/08/10-13:05:41.093002 7fd40dfff6c0 Level-0 table #69: started
-2023/08/10-13:05:41.093032 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
-2023/08/10-13:05:41.100152 7fd40dfff6c0 Delete type=0 #67
-2023/08/10-13:05:41.109249 7fd40dfff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.109302 7fd40dfff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/15-21:47:52.040277 7fa0ddffb6c0 Recovering log #68
+2023/08/15-21:47:52.138553 7fa0ddffb6c0 Delete type=3 #66
+2023/08/15-21:47:52.138627 7fa0ddffb6c0 Delete type=0 #68
+2023/08/15-22:11:19.859141 7f9e3ffff6c0 Level-0 table #73: started
+2023/08/15-22:11:19.859174 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
+2023/08/15-22:11:19.865615 7f9e3ffff6c0 Delete type=0 #71
+2023/08/15-22:11:19.879276 7f9e3ffff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/15-22:11:19.879335 7f9e3ffff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
diff --git a/packs/perks/MANIFEST-000070 b/packs/perks/MANIFEST-000070
deleted file mode 100644
index 6b247c6..0000000
Binary files a/packs/perks/MANIFEST-000070 and /dev/null differ
diff --git a/packs/perks/MANIFEST-000074 b/packs/perks/MANIFEST-000074
new file mode 100644
index 0000000..772686a
Binary files /dev/null and b/packs/perks/MANIFEST-000074 differ
diff --git a/packs/powers/000073.log b/packs/powers/000077.log
similarity index 100%
rename from packs/powers/000073.log
rename to packs/powers/000077.log
diff --git a/packs/powers/CURRENT b/packs/powers/CURRENT
index be93edb..d2ea14c 100644
--- a/packs/powers/CURRENT
+++ b/packs/powers/CURRENT
@@ -1 +1 @@
-MANIFEST-000071
+MANIFEST-000075
diff --git a/packs/powers/LOG b/packs/powers/LOG
index e1bba01..129bc78 100644
--- a/packs/powers/LOG
+++ b/packs/powers/LOG
@@ -1,8 +1,8 @@
-2023/08/15-21:47:51.861656 7fa0dcff96c0 Recovering log #69
-2023/08/15-21:47:51.916356 7fa0dcff96c0 Delete type=3 #67
-2023/08/15-21:47:51.916435 7fa0dcff96c0 Delete type=0 #69
-2023/08/15-22:11:19.843844 7f9e3ffff6c0 Level-0 table #74: started
-2023/08/15-22:11:19.843905 7f9e3ffff6c0 Level-0 table #74: 0 bytes OK
-2023/08/15-22:11:19.851729 7f9e3ffff6c0 Delete type=0 #72
-2023/08/15-22:11:19.858992 7f9e3ffff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/15-22:11:19.859036 7f9e3ffff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/22-22:40:59.317080 7f4f609fd6c0 Recovering log #73
+2023/08/22-22:40:59.334723 7f4f609fd6c0 Delete type=3 #71
+2023/08/22-22:40:59.334804 7f4f609fd6c0 Delete type=0 #73
+2023/08/22-23:29:53.750838 7f4ccb7fe6c0 Level-0 table #78: started
+2023/08/22-23:29:53.750864 7f4ccb7fe6c0 Level-0 table #78: 0 bytes OK
+2023/08/22-23:29:53.756935 7f4ccb7fe6c0 Delete type=0 #76
+2023/08/22-23:29:53.764078 7f4ccb7fe6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/22-23:29:53.772157 7f4ccb7fe6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
diff --git a/packs/powers/LOG.old b/packs/powers/LOG.old
index c11061f..e1bba01 100644
--- a/packs/powers/LOG.old
+++ b/packs/powers/LOG.old
@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.550530 7fd6a4bfa6c0 Recovering log #65
-2023/08/10-13:03:20.564384 7fd6a4bfa6c0 Delete type=3 #63
-2023/08/10-13:03:20.564676 7fd6a4bfa6c0 Delete type=0 #65
-2023/08/10-13:05:41.056785 7fd40dfff6c0 Level-0 table #70: started
-2023/08/10-13:05:41.056809 7fd40dfff6c0 Level-0 table #70: 0 bytes OK
-2023/08/10-13:05:41.069063 7fd40dfff6c0 Delete type=0 #68
-2023/08/10-13:05:41.081017 7fd40dfff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.092990 7fd40dfff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/15-21:47:51.861656 7fa0dcff96c0 Recovering log #69
+2023/08/15-21:47:51.916356 7fa0dcff96c0 Delete type=3 #67
+2023/08/15-21:47:51.916435 7fa0dcff96c0 Delete type=0 #69
+2023/08/15-22:11:19.843844 7f9e3ffff6c0 Level-0 table #74: started
+2023/08/15-22:11:19.843905 7f9e3ffff6c0 Level-0 table #74: 0 bytes OK
+2023/08/15-22:11:19.851729 7f9e3ffff6c0 Delete type=0 #72
+2023/08/15-22:11:19.858992 7f9e3ffff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/15-22:11:19.859036 7f9e3ffff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
diff --git a/packs/powers/MANIFEST-000071 b/packs/powers/MANIFEST-000075
similarity index 75%
rename from packs/powers/MANIFEST-000071
rename to packs/powers/MANIFEST-000075
index 3682c12..00108aa 100644
Binary files a/packs/powers/MANIFEST-000071 and b/packs/powers/MANIFEST-000075 differ
diff --git a/packs/skills/000072.log b/packs/skills/000076.log
similarity index 100%
rename from packs/skills/000072.log
rename to packs/skills/000076.log
diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT
index bcf1079..f8d57cc 100644
--- a/packs/skills/CURRENT
+++ b/packs/skills/CURRENT
@@ -1 +1 @@
-MANIFEST-000070
+MANIFEST-000074
diff --git a/packs/skills/LOG b/packs/skills/LOG
index 5974732..74e7c9f 100644
--- a/packs/skills/LOG
+++ b/packs/skills/LOG
@@ -1,8 +1,8 @@
-2023/08/15-21:47:51.861659 7fa0ddffb6c0 Recovering log #68
-2023/08/15-21:47:51.916357 7fa0ddffb6c0 Delete type=3 #66
-2023/08/15-21:47:51.916429 7fa0ddffb6c0 Delete type=0 #68
-2023/08/15-22:11:19.830017 7f9e3ffff6c0 Level-0 table #73: started
-2023/08/15-22:11:19.830056 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
-2023/08/15-22:11:19.836953 7f9e3ffff6c0 Delete type=0 #71
-2023/08/15-22:11:19.858959 7f9e3ffff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/15-22:11:19.859011 7f9e3ffff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/22-22:40:59.313961 7f4f611fe6c0 Recovering log #72
+2023/08/22-22:40:59.331385 7f4f611fe6c0 Delete type=3 #70
+2023/08/22-22:40:59.331554 7f4f611fe6c0 Delete type=0 #72
+2023/08/22-23:29:53.743083 7f4ccb7fe6c0 Level-0 table #77: started
+2023/08/22-23:29:53.743120 7f4ccb7fe6c0 Level-0 table #77: 0 bytes OK
+2023/08/22-23:29:53.750729 7f4ccb7fe6c0 Delete type=0 #75
+2023/08/22-23:29:53.764011 7f4ccb7fe6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/22-23:29:53.772125 7f4ccb7fe6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old
index 3d51db9..5974732 100644
--- a/packs/skills/LOG.old
+++ b/packs/skills/LOG.old
@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.550530 7fd68f7fe6c0 Recovering log #64
-2023/08/10-13:03:20.561274 7fd68f7fe6c0 Delete type=3 #62
-2023/08/10-13:03:20.561313 7fd68f7fe6c0 Delete type=0 #64
-2023/08/10-13:05:41.037917 7fd40dfff6c0 Level-0 table #69: started
-2023/08/10-13:05:41.037949 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
-2023/08/10-13:05:41.044140 7fd40dfff6c0 Delete type=0 #67
-2023/08/10-13:05:41.069221 7fd40dfff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.081033 7fd40dfff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/15-21:47:51.861659 7fa0ddffb6c0 Recovering log #68
+2023/08/15-21:47:51.916357 7fa0ddffb6c0 Delete type=3 #66
+2023/08/15-21:47:51.916429 7fa0ddffb6c0 Delete type=0 #68
+2023/08/15-22:11:19.830017 7f9e3ffff6c0 Level-0 table #73: started
+2023/08/15-22:11:19.830056 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
+2023/08/15-22:11:19.836953 7f9e3ffff6c0 Delete type=0 #71
+2023/08/15-22:11:19.858959 7f9e3ffff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/15-22:11:19.859011 7f9e3ffff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
diff --git a/packs/skills/MANIFEST-000070 b/packs/skills/MANIFEST-000070
deleted file mode 100644
index 1aac3ba..0000000
Binary files a/packs/skills/MANIFEST-000070 and /dev/null differ
diff --git a/packs/skills/MANIFEST-000074 b/packs/skills/MANIFEST-000074
new file mode 100644
index 0000000..2e5de30
Binary files /dev/null and b/packs/skills/MANIFEST-000074 differ
diff --git a/packs/talents/000072.log b/packs/talents/000076.log
similarity index 100%
rename from packs/talents/000072.log
rename to packs/talents/000076.log
diff --git a/packs/talents/CURRENT b/packs/talents/CURRENT
index bcf1079..f8d57cc 100644
--- a/packs/talents/CURRENT
+++ b/packs/talents/CURRENT
@@ -1 +1 @@
-MANIFEST-000070
+MANIFEST-000074
diff --git a/packs/talents/LOG b/packs/talents/LOG
index 5eb06fd..ef9ce6c 100644
--- a/packs/talents/LOG
+++ b/packs/talents/LOG
@@ -1,8 +1,8 @@
-2023/08/15-21:47:52.052796 7fa0de7fc6c0 Recovering log #68
-2023/08/15-21:47:52.154403 7fa0de7fc6c0 Delete type=3 #66
-2023/08/15-21:47:52.154479 7fa0de7fc6c0 Delete type=0 #68
-2023/08/15-22:11:19.872538 7f9e3ffff6c0 Level-0 table #73: started
-2023/08/15-22:11:19.872564 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
-2023/08/15-22:11:19.878867 7f9e3ffff6c0 Delete type=0 #71
-2023/08/15-22:11:19.879310 7f9e3ffff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/15-22:11:19.879353 7f9e3ffff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/22-22:40:59.358596 7f4f611fe6c0 Recovering log #72
+2023/08/22-22:40:59.377178 7f4f611fe6c0 Delete type=3 #70
+2023/08/22-22:40:59.377250 7f4f611fe6c0 Delete type=0 #72
+2023/08/22-23:29:53.780352 7f4ccb7fe6c0 Level-0 table #77: started
+2023/08/22-23:29:53.780385 7f4ccb7fe6c0 Level-0 table #77: 0 bytes OK
+2023/08/22-23:29:53.787130 7f4ccb7fe6c0 Delete type=0 #75
+2023/08/22-23:29:53.787267 7f4ccb7fe6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/22-23:29:53.787292 7f4ccb7fe6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
diff --git a/packs/talents/LOG.old b/packs/talents/LOG.old
index 75caefb..5eb06fd 100644
--- a/packs/talents/LOG.old
+++ b/packs/talents/LOG.old
@@ -1,8 +1,8 @@
-2023/08/10-13:03:20.584203 7fd6a4bfa6c0 Recovering log #64
-2023/08/10-13:03:20.602339 7fd6a4bfa6c0 Delete type=3 #62
-2023/08/10-13:03:20.602426 7fd6a4bfa6c0 Delete type=0 #64
-2023/08/10-13:05:41.100405 7fd40dfff6c0 Level-0 table #69: started
-2023/08/10-13:05:41.100432 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
-2023/08/10-13:05:41.109117 7fd40dfff6c0 Delete type=0 #67
-2023/08/10-13:05:41.109289 7fd40dfff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/10-13:05:41.109316 7fd40dfff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/15-21:47:52.052796 7fa0de7fc6c0 Recovering log #68
+2023/08/15-21:47:52.154403 7fa0de7fc6c0 Delete type=3 #66
+2023/08/15-21:47:52.154479 7fa0de7fc6c0 Delete type=0 #68
+2023/08/15-22:11:19.872538 7f9e3ffff6c0 Level-0 table #73: started
+2023/08/15-22:11:19.872564 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
+2023/08/15-22:11:19.878867 7f9e3ffff6c0 Delete type=0 #71
+2023/08/15-22:11:19.879310 7f9e3ffff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/15-22:11:19.879353 7f9e3ffff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
diff --git a/packs/talents/MANIFEST-000070 b/packs/talents/MANIFEST-000070
deleted file mode 100644
index e877afe..0000000
Binary files a/packs/talents/MANIFEST-000070 and /dev/null differ
diff --git a/packs/talents/MANIFEST-000074 b/packs/talents/MANIFEST-000074
new file mode 100644
index 0000000..a25884f
Binary files /dev/null and b/packs/talents/MANIFEST-000074 differ
diff --git a/packs/weapons/000072.log b/packs/weapons/000076.log
similarity index 100%
rename from packs/weapons/000072.log
rename to packs/weapons/000076.log
diff --git a/packs/weapons/CURRENT b/packs/weapons/CURRENT
index bcf1079..f8d57cc 100644
--- a/packs/weapons/CURRENT
+++ b/packs/weapons/CURRENT
@@ -1 +1 @@
-MANIFEST-000070
+MANIFEST-000074
diff --git a/packs/weapons/LOG b/packs/weapons/LOG
index 01f7b3f..d2c2417 100644
--- a/packs/weapons/LOG
+++ b/packs/weapons/LOG
@@ -1,7 +1,7 @@
-2023/08/15-21:47:51.802282 7fa0dcff96c0 Recovering log #68
-2023/08/15-21:47:51.859665 7fa0dcff96c0 Delete type=3 #66
-2023/08/15-21:47:51.859740 7fa0dcff96c0 Delete type=0 #68
-2023/08/15-22:11:19.837182 7f9e3ffff6c0 Level-0 table #73: started
-2023/08/15-22:11:19.837243 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
-2023/08/15-22:11:19.843628 7f9e3ffff6c0 Delete type=0 #71
-2023/08/15-22:11:19.858980 7f9e3ffff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/22-22:40:59.298588 7f4f619ff6c0 Recovering log #72
+2023/08/22-22:40:59.314798 7f4f619ff6c0 Delete type=3 #70
+2023/08/22-22:40:59.314861 7f4f619ff6c0 Delete type=0 #72
+2023/08/22-23:29:53.736237 7f4ccb7fe6c0 Level-0 table #77: started
+2023/08/22-23:29:53.736325 7f4ccb7fe6c0 Level-0 table #77: 0 bytes OK
+2023/08/22-23:29:53.742930 7f4ccb7fe6c0 Delete type=0 #75
+2023/08/22-23:29:53.757037 7f4ccb7fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs/weapons/LOG.old b/packs/weapons/LOG.old
index 55df4d0..01f7b3f 100644
--- a/packs/weapons/LOG.old
+++ b/packs/weapons/LOG.old
@@ -1,7 +1,7 @@
-2023/08/10-13:03:20.538110 7fd68f7fe6c0 Recovering log #64
-2023/08/10-13:03:20.547376 7fd68f7fe6c0 Delete type=3 #62
-2023/08/10-13:03:20.547427 7fd68f7fe6c0 Delete type=0 #64
-2023/08/10-13:05:41.044355 7fd40dfff6c0 Level-0 table #69: started
-2023/08/10-13:05:41.044380 7fd40dfff6c0 Level-0 table #69: 0 bytes OK
-2023/08/10-13:05:41.056662 7fd40dfff6c0 Delete type=0 #67
-2023/08/10-13:05:41.069241 7fd40dfff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/15-21:47:51.802282 7fa0dcff96c0 Recovering log #68
+2023/08/15-21:47:51.859665 7fa0dcff96c0 Delete type=3 #66
+2023/08/15-21:47:51.859740 7fa0dcff96c0 Delete type=0 #68
+2023/08/15-22:11:19.837182 7f9e3ffff6c0 Level-0 table #73: started
+2023/08/15-22:11:19.837243 7f9e3ffff6c0 Level-0 table #73: 0 bytes OK
+2023/08/15-22:11:19.843628 7f9e3ffff6c0 Delete type=0 #71
+2023/08/15-22:11:19.858980 7f9e3ffff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs/weapons/MANIFEST-000070 b/packs/weapons/MANIFEST-000070
deleted file mode 100644
index aa5ef8a..0000000
Binary files a/packs/weapons/MANIFEST-000070 and /dev/null differ
diff --git a/packs/weapons/MANIFEST-000074 b/packs/weapons/MANIFEST-000074
new file mode 100644
index 0000000..7274296
Binary files /dev/null and b/packs/weapons/MANIFEST-000074 differ
diff --git a/styles/simple.css b/styles/simple.css
index 5fb295e..30b305b 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -1411,7 +1411,7 @@ Focus FOC: #ff0084
 }
 .item-controls-fixed {
   min-width:2rem;
-  max-width: 2rem;
+  /*max-width: 2rem;*/
 }
 .biodata-portrait {
   min-height: 512px;
diff --git a/system.json b/system.json
index 14b62c3..53c175a 100644
--- a/system.json
+++ b/system.json
@@ -100,14 +100,14 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "11.0.7",
+  "version": "11.0.9",
   "compatibility": {
     "minimum": "11",
     "verified": "11"
   },
   "title": "Hero System v6 for FoundrtVTT (Official)",
   "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.7.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.9.zip",   
   "url": "https://www.uberwald.me/gitea/uberwald/",
   "background": "systems/fvtt-hero-system-6/images/ui/hero_foundry_cover.webp",
   "id": "fvtt-hero-system-6"
diff --git a/template.json b/template.json
index a4a053d..b1779df 100644
--- a/template.json
+++ b/template.json
@@ -416,7 +416,19 @@
       "subtype": "equipment",
       "value": 0,
       "weight": 0,
-      "moneycost": 0
+      "moneycost": 0,
+      "ocv": 0,
+      "omcv": 0,
+      "dmcv": 0,
+      "rmod": 0,
+      "pd": 0,
+      "ed": 0,
+      "rpd": 0, 
+      "red": 0,
+      "mentaldefense": 0,
+      "powerdefense": 0,
+      "flashdefense": 0,
+      "otherdefense": 0
     },
     "attack": {
       "templates": [
diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs
index 878375d..e8891c6 100644
--- a/templates/actors/actor-sheet.hbs
+++ b/templates/actors/actor-sheet.hbs
@@ -672,6 +672,9 @@
         <span class="small-label">Total value : {{totalValue}}</span>
       </div>
 
+      {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Money"
+      items=moneys}}
+
       {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Weapons"
       items=weapons}}
 
diff --git a/templates/items/item-equipment-sheet.hbs b/templates/items/item-equipment-sheet.hbs
index 718cc86..8d5039b 100644
--- a/templates/items/item-equipment-sheet.hbs
+++ b/templates/items/item-equipment-sheet.hbs
@@ -56,8 +56,88 @@
           </select>
         </li>
 
-        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
+        {{#if (eq system.subtype "weapon") }}
+        <li class="flexrow"><label class="item-field-label-long">OCV</label>
+          <input type="text" class="item-field-label-short" name="system.ocv" value="{{system.ocv}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">OMCV</label>
+          <input type="text" class="item-field-label-short" name="system.omcv" value="{{system.omcv}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">RMod</label>
+          <input type="text" class="item-field-label-short" name="system.rmod" value="{{system.rmod}}"
+            data-dtype="Number" />
+        </li>
+        {{/if}}
 
+        {{#if (eq system.subtype "shield") }}
+        <li class="flexrow"><label class="item-field-label-long">OCV</label>
+          <input type="text" class="item-field-label-short" name="system.ocv" value="{{system.ocv}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">DCV</label>
+          <input type="text" class="item-field-label-short" name="system.dcv" value="{{system.dcv}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">OMCV</label>
+          <input type="text" class="item-field-label-short" name="system.omcv" value="{{system.omcv}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">DMCV</label>
+          <input type="text" class="item-field-label-short" name="system.dmcv" value="{{system.dmcv}}"
+            data-dtype="Number" />
+        </li>
+        {{/if}}
+
+        {{#if (eq system.subtype "armor") }}
+        <li class="flexrow"><label class="item-field-label-long">DCV</label>
+          <input type="text" class="item-field-label-short" name="system.dcv" value="{{system.dcv}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">DMCV</label>
+          <input type="text" class="item-field-label-short" name="system.dmcv" value="{{system.dmcv}}"
+            data-dtype="Number" />
+        </li>
+        {{/if}}
+
+
+        {{#if (or (eq system.subtype "armor") (eq system.subtype "shield")) }}
+        <li class="flexrow"><label class="item-field-label-long">PD</label>
+          <input type="text" class="item-field-label-short" name="system.pd" value="{{system.pd}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">ED</label>
+          <input type="text" class="item-field-label-short" name="system.ed" value="{{system.ed}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">rPD</label>
+          <input type="text" class="item-field-label-short" name="system.rpd" value="{{system.rpd}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">rED</label>
+          <input type="text" class="item-field-label-short" name="system.red" value="{{system.red}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Mental Defense</label>
+          <input type="text" class="item-field-label-short" name="system.mentaldefense" value="{{system.mentaldefense}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Power Defense</label>
+          <input type="text" class="item-field-label-short" name="system.powerdefense" value="{{system.powerdefense}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Flash Defense</label>
+          <input type="text" class="item-field-label-short" name="system.flashdefense" value="{{system.flashdefense}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Other Defense</label>
+          <input type="text" class="item-field-label-short" name="system.otherdefense" value="{{system.otherdefense}}"
+            data-dtype="Number" />
+        </li>
+        {{/if}}
+
+        {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
 
 
         {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
diff --git a/templates/partials/partial-actor-equipment-section.hbs b/templates/partials/partial-actor-equipment-section.hbs
index 95df07e..cf68d85 100644
--- a/templates/partials/partial-actor-equipment-section.hbs
+++ b/templates/partials/partial-actor-equipment-section.hbs
@@ -6,20 +6,70 @@
           <span class="item-field-label-short">
             <label class="item-field-label-short">Qty</label>
           </span>
-          <span class="item-field-label-long3">
-            <label class="item-field-label-long3">{{title}}</label>
+          <span class="item-field-label-long2">
+            <label class="item-field-label-long2">{{title}}</label>
           </span>
-          <span class="item-field-label-long">
-            <label class="item-field-label-long4">Display</label>
+          
+          {{#if (eq title "Weapons")}}
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">OCV</label>
           </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">DCV</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">rMod</label>
+          </span>
+          {{/if}}
+          
+          {{#if (eq title "Shields")}}
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">OCV</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">DCV</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">OMCV</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">DMCV</label>
+          </span>
+          {{/if}}
+
+          {{#if (eq title "Armor")}}
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">PD</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">ED</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">rPD</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">rED</label>
+          </span>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">DCV</label>
+          </span>
+          {{/if}}
+
+          <span class="item-field-label-long2">
+            <label class="item-field-label-long2">Display</label>
+          </span>
+          
+          {{#if (and (ne title "Armor") (ne title "Shields"))}}
           <span class="item-field-label-short">
             <label class="item-field-label-short">Effect</label>
           </span>
+          {{/if}}
+          
           <span class="item-field-label-short">
             <label class="item-field-label-short">Roll</label>
           </span>
-          <span class="item-field-label-short">
-            <label class="item-field-label-short">END</label>
+          <span class="item-field-label-very-short">
+            <label class="item-field-label-very-short">END</label>
           </span>
           <span class="item-field-label-short">
             <label class="item-field-label-short">Value</label>
@@ -27,6 +77,7 @@
           <span class="item-field-label-short">
             <label class="item-field-label-short">Weight</label>
           </span>
+
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-add" data-type="equipment" title="Create Item"><i class="fas fa-plus"></i></a>
diff --git a/templates/partials/partial-actor-equipment.hbs b/templates/partials/partial-actor-equipment.hbs
index b2bae8a..17fe77e 100644
--- a/templates/partials/partial-actor-equipment.hbs
+++ b/templates/partials/partial-actor-equipment.hbs
@@ -3,15 +3,38 @@
 
   <span class="item-field-label-short"><label>{{equip.system.quantity}}</label>  </span>          
 
-  <span class="item-field-label-long3">{{equip.name}}</span>
+  <span class="item-field-label-long2">{{equip.name}}</span>
 
-  <span class="item-field-label-long"><label>{{equip.system.displayname}}
+  {{#if (eq equip.system.subtype "weapon")}}
+  <span class="item-field-label-very-short"><label>{{equip.system.ocv}}</label>  </span>          
+  <span class="item-field-label-very-short"><label>{{equip.system.omcv}}</label>  </span>          
+  <span class="item-field-label-very-short"><label>{{equip.system.rmod}}</label>  </span>          
+  {{/if}}
+
+  {{#if (eq equip.system.subtype "shield")}}
+  <span class="item-field-label-very-short"><label>{{equip.system.ocv}}</label>  </span>          
+  <span class="item-field-label-very-short"><label>{{equip.system.omcv}}</label>  </span>          
+  <span class="item-field-label-very-short"><label>{{equip.system.dcv}}</label>  </span>          
+  <span class="item-field-label-very-short"><label>{{equip.system.dmcv}}</label>  </span>          
+  {{/if}}
+
+  {{#if (eq equip.system.subtype "armor")}}
+  <span class="item-field-label-very-short"><label>{{equip.system.pd}}</label>  </span>          
+  <span class="item-field-label-very-short"><label>{{equip.system.ed}}</label>  </span>          
+  <span class="item-field-label-very-short"><label>{{equip.system.rpd}}</label>  </span>          
+  <span class="item-field-label-very-short"><label>{{equip.system.red}}</label>  </span>          
+  <span class="item-field-label-very-short"><label>{{equip.system.dcv}}</label>  </span>          
+  {{/if}}
+
+  <span class="item-field-label-long2"><label>{{equip.system.displayname}}
   </label>
   </span>          
 
+  {{#if (and (ne equip.system.subtype "armor") (ne equip.system.subtype "shield"))}}
   <span class="item-field-label-short"><label><a class="roll-damage" data-type="perk"><i class="fas fa-dice"></i>{{equip.system.damage}}</a>
   </label>
   </span>
+  {{/if}}
 
   {{#if equip.system.hasroll}}          
   <span class="item-field-label-short"><a class="roll-item" data-type="perk"><i class="fas fa-dice"></i>{{equip.system.roll}}-</a></span>
@@ -19,7 +42,7 @@
   <span class="item-field-label-short">&nbsp;</span>
   {{/if}}
 
-  <span class="item-field-label-short"><label>{{equip.system.endurance}}</label>  </span>          
+  <span class="item-field-label-very-short"><label>{{equip.system.endurance}}</label>  </span>          
 
   <span class="item-field-label-short"><label>{{mul equip.system.quantity equip.system.value}}</label>  </span>          
 
diff --git a/templates/partials/partial-power-equipment-cost.hbs b/templates/partials/partial-power-equipment-cost.hbs
index 325dce8..1bab214 100644
--- a/templates/partials/partial-power-equipment-cost.hbs
+++ b/templates/partials/partial-power-equipment-cost.hbs
@@ -22,12 +22,15 @@
         <label class="item-field-label-medium"><input type="checkbox" name="system.senseaffecting" {{checked system.senseaffecting}}/></label>
       </li>
 
+      {{#if (and (ne system.subtype "armor") (ne system.subtype "shield"))}}
       <li class="flexrow"><label class="item-field-label-long">Range</label>
         <input type="text" class="item-field-label-medium" name="system.range" value="{{system.range}}" data-dtype="String"/>
       </li>
       <li class="flexrow"><label class="item-field-label-long">Damage</label>
         <input type="text" class="item-field-label-medium" name="system.damage" value="{{system.damage}}" data-dtype="String"/>
       </li>
+      {{/if}}
+
       <li class="flexrow"><label class="item-field-label-long">Endurance</label>
         <input type="text" class="item-field-label-short" name="system.endurance" value="{{system.endurance}}" data-dtype="Number"/>
       </li>