diff --git a/packs/armor/000116.log b/packs/armor/000116.log
deleted file mode 100644
index e69de29..0000000
diff --git a/packs/armor/CURRENT b/packs/armor/CURRENT
index 3182b19..7530019 100644
--- a/packs/armor/CURRENT
+++ b/packs/armor/CURRENT
@@ -1 +1 @@
-MANIFEST-000114
+MANIFEST-000118
diff --git a/packs/armor/LOG b/packs/armor/LOG
index c9c5156..e9ba350 100644
--- a/packs/armor/LOG
+++ b/packs/armor/LOG
@@ -1,8 +1,8 @@
-2023/10/23-16:21:18.818735 7fc51b7fe6c0 Recovering log #112
-2023/10/23-16:21:18.828413 7fc51b7fe6c0 Delete type=3 #110
-2023/10/23-16:21:18.828468 7fc51b7fe6c0 Delete type=0 #112
-2023/10/23-16:38:21.235245 7fc299bff6c0 Level-0 table #117: started
-2023/10/23-16:38:21.235287 7fc299bff6c0 Level-0 table #117: 0 bytes OK
-2023/10/23-16:38:21.288685 7fc299bff6c0 Delete type=0 #115
-2023/10/23-16:38:21.402896 7fc299bff6c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
-2023/10/23-16:38:21.445657 7fc299bff6c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/10/23-23:27:50.391876 7fc51a7fc6c0 Recovering log #116
+2023/10/23-23:27:50.406730 7fc51a7fc6c0 Delete type=3 #114
+2023/10/23-23:27:50.406904 7fc51a7fc6c0 Delete type=0 #116
+2023/10/24-07:04:13.134268 7fc299bff6c0 Level-0 table #121: started
+2023/10/24-07:04:13.134315 7fc299bff6c0 Level-0 table #121: 0 bytes OK
+2023/10/24-07:04:13.142035 7fc299bff6c0 Delete type=0 #119
+2023/10/24-07:04:13.168857 7fc299bff6c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/10/24-07:04:13.168941 7fc299bff6c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
diff --git a/packs/armor/LOG.old b/packs/armor/LOG.old
index fa88450..c9c5156 100644
--- a/packs/armor/LOG.old
+++ b/packs/armor/LOG.old
@@ -1,8 +1,8 @@
-2023/10/23-16:10:20.406453 7fc51bfff6c0 Recovering log #108
-2023/10/23-16:10:20.455315 7fc51bfff6c0 Delete type=3 #106
-2023/10/23-16:10:20.455416 7fc51bfff6c0 Delete type=0 #108
-2023/10/23-16:21:11.331176 7fc299bff6c0 Level-0 table #113: started
-2023/10/23-16:21:11.331203 7fc299bff6c0 Level-0 table #113: 0 bytes OK
-2023/10/23-16:21:11.340134 7fc299bff6c0 Delete type=0 #111
-2023/10/23-16:21:11.358495 7fc299bff6c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
-2023/10/23-16:21:11.367303 7fc299bff6c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/10/23-16:21:18.818735 7fc51b7fe6c0 Recovering log #112
+2023/10/23-16:21:18.828413 7fc51b7fe6c0 Delete type=3 #110
+2023/10/23-16:21:18.828468 7fc51b7fe6c0 Delete type=0 #112
+2023/10/23-16:38:21.235245 7fc299bff6c0 Level-0 table #117: started
+2023/10/23-16:38:21.235287 7fc299bff6c0 Level-0 table #117: 0 bytes OK
+2023/10/23-16:38:21.288685 7fc299bff6c0 Delete type=0 #115
+2023/10/23-16:38:21.402896 7fc299bff6c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/10/23-16:38:21.445657 7fc299bff6c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
diff --git a/packs/armor/MANIFEST-000114 b/packs/armor/MANIFEST-000114
deleted file mode 100644
index 6b4b540..0000000
Binary files a/packs/armor/MANIFEST-000114 and /dev/null differ
diff --git a/packs/conditions/000116.log b/packs/conditions/000116.log
deleted file mode 100644
index e69de29..0000000
diff --git a/packs/conditions/CURRENT b/packs/conditions/CURRENT
index 3182b19..7530019 100644
--- a/packs/conditions/CURRENT
+++ b/packs/conditions/CURRENT
@@ -1 +1 @@
-MANIFEST-000114
+MANIFEST-000118
diff --git a/packs/conditions/LOG b/packs/conditions/LOG
index e7bb656..0a1a2f1 100644
--- a/packs/conditions/LOG
+++ b/packs/conditions/LOG
@@ -1,7 +1,7 @@
-2023/10/23-16:21:18.866233 7fc51b7fe6c0 Recovering log #112
-2023/10/23-16:21:18.876627 7fc51b7fe6c0 Delete type=3 #110
-2023/10/23-16:21:18.876726 7fc51b7fe6c0 Delete type=0 #112
-2023/10/23-16:38:21.562992 7fc299bff6c0 Level-0 table #117: started
-2023/10/23-16:38:21.563052 7fc299bff6c0 Level-0 table #117: 0 bytes OK
-2023/10/23-16:38:21.606768 7fc299bff6c0 Delete type=0 #115
-2023/10/23-16:38:21.649491 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/23-23:27:50.461489 7fc51a7fc6c0 Recovering log #116
+2023/10/23-23:27:50.476262 7fc51a7fc6c0 Delete type=3 #114
+2023/10/23-23:27:50.476363 7fc51a7fc6c0 Delete type=0 #116
+2023/10/24-07:04:13.180225 7fc299bff6c0 Level-0 table #121: started
+2023/10/24-07:04:13.180270 7fc299bff6c0 Level-0 table #121: 0 bytes OK
+2023/10/24-07:04:13.188564 7fc299bff6c0 Delete type=0 #119
+2023/10/24-07:04:13.206576 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs/conditions/LOG.old b/packs/conditions/LOG.old
index 300b7b7..e7bb656 100644
--- a/packs/conditions/LOG.old
+++ b/packs/conditions/LOG.old
@@ -1,7 +1,7 @@
-2023/10/23-16:10:20.672216 7fc51bfff6c0 Recovering log #108
-2023/10/23-16:10:20.732577 7fc51bfff6c0 Delete type=3 #106
-2023/10/23-16:10:20.732730 7fc51bfff6c0 Delete type=0 #108
-2023/10/23-16:21:11.375247 7fc299bff6c0 Level-0 table #113: started
-2023/10/23-16:21:11.375301 7fc299bff6c0 Level-0 table #113: 0 bytes OK
-2023/10/23-16:21:11.384595 7fc299bff6c0 Delete type=0 #111
-2023/10/23-16:21:11.403049 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/23-16:21:18.866233 7fc51b7fe6c0 Recovering log #112
+2023/10/23-16:21:18.876627 7fc51b7fe6c0 Delete type=3 #110
+2023/10/23-16:21:18.876726 7fc51b7fe6c0 Delete type=0 #112
+2023/10/23-16:38:21.562992 7fc299bff6c0 Level-0 table #117: started
+2023/10/23-16:38:21.563052 7fc299bff6c0 Level-0 table #117: 0 bytes OK
+2023/10/23-16:38:21.606768 7fc299bff6c0 Delete type=0 #115
+2023/10/23-16:38:21.649491 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs/conditions/MANIFEST-000114 b/packs/conditions/MANIFEST-000114
deleted file mode 100644
index 30f1562..0000000
Binary files a/packs/conditions/MANIFEST-000114 and /dev/null differ
diff --git a/packs/currency/000116.log b/packs/currency/000116.log
deleted file mode 100644
index e69de29..0000000
diff --git a/packs/currency/CURRENT b/packs/currency/CURRENT
index 3182b19..7530019 100644
--- a/packs/currency/CURRENT
+++ b/packs/currency/CURRENT
@@ -1 +1 @@
-MANIFEST-000114
+MANIFEST-000118
diff --git a/packs/currency/LOG b/packs/currency/LOG
index 50d483c..4443890 100644
--- a/packs/currency/LOG
+++ b/packs/currency/LOG
@@ -1,7 +1,7 @@
-2023/10/23-16:21:18.878355 7fc51a7fc6c0 Recovering log #112
-2023/10/23-16:21:18.889689 7fc51a7fc6c0 Delete type=3 #110
-2023/10/23-16:21:18.889751 7fc51a7fc6c0 Delete type=0 #112
-2023/10/23-16:38:21.520237 7fc299bff6c0 Level-0 table #117: started
-2023/10/23-16:38:21.520269 7fc299bff6c0 Level-0 table #117: 0 bytes OK
-2023/10/23-16:38:21.562758 7fc299bff6c0 Delete type=0 #115
-2023/10/23-16:38:21.649457 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/23-23:27:50.478831 7fc51b7fe6c0 Recovering log #116
+2023/10/23-23:27:50.493332 7fc51b7fe6c0 Delete type=3 #114
+2023/10/23-23:27:50.493444 7fc51b7fe6c0 Delete type=0 #116
+2023/10/24-07:04:13.169114 7fc299bff6c0 Level-0 table #121: started
+2023/10/24-07:04:13.169161 7fc299bff6c0 Level-0 table #121: 0 bytes OK
+2023/10/24-07:04:13.180064 7fc299bff6c0 Delete type=0 #119
+2023/10/24-07:04:13.206554 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs/currency/LOG.old b/packs/currency/LOG.old
index 14183b9..50d483c 100644
--- a/packs/currency/LOG.old
+++ b/packs/currency/LOG.old
@@ -1,7 +1,7 @@
-2023/10/23-16:10:20.739722 7fc51a7fc6c0 Recovering log #108
-2023/10/23-16:10:20.793493 7fc51a7fc6c0 Delete type=3 #106
-2023/10/23-16:10:20.793641 7fc51a7fc6c0 Delete type=0 #108
-2023/10/23-16:21:11.384741 7fc299bff6c0 Level-0 table #113: started
-2023/10/23-16:21:11.384782 7fc299bff6c0 Level-0 table #113: 0 bytes OK
-2023/10/23-16:21:11.394018 7fc299bff6c0 Delete type=0 #111
-2023/10/23-16:21:11.403106 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/23-16:21:18.878355 7fc51a7fc6c0 Recovering log #112
+2023/10/23-16:21:18.889689 7fc51a7fc6c0 Delete type=3 #110
+2023/10/23-16:21:18.889751 7fc51a7fc6c0 Delete type=0 #112
+2023/10/23-16:38:21.520237 7fc299bff6c0 Level-0 table #117: started
+2023/10/23-16:38:21.520269 7fc299bff6c0 Level-0 table #117: 0 bytes OK
+2023/10/23-16:38:21.562758 7fc299bff6c0 Delete type=0 #115
+2023/10/23-16:38:21.649457 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs/currency/MANIFEST-000114 b/packs/currency/MANIFEST-000114
deleted file mode 100644
index 30f1562..0000000
Binary files a/packs/currency/MANIFEST-000114 and /dev/null differ
diff --git a/packs/cybernetics/000044.log b/packs/cybernetics/000044.log
deleted file mode 100644
index e69de29..0000000
diff --git a/packs/cybernetics/CURRENT b/packs/cybernetics/CURRENT
index 8e0a062..a6d5883 100644
--- a/packs/cybernetics/CURRENT
+++ b/packs/cybernetics/CURRENT
@@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000046
diff --git a/packs/cybernetics/LOG b/packs/cybernetics/LOG
index 9336f1b..1e6a2f4 100644
--- a/packs/cybernetics/LOG
+++ b/packs/cybernetics/LOG
@@ -1,8 +1,8 @@
-2023/10/23-16:21:18.916086 7fc51b7fe6c0 Recovering log #40
-2023/10/23-16:21:18.926380 7fc51b7fe6c0 Delete type=3 #38
-2023/10/23-16:21:18.926444 7fc51b7fe6c0 Delete type=0 #40
-2023/10/23-16:38:21.687516 7fc299bff6c0 Level-0 table #45: started
-2023/10/23-16:38:21.687571 7fc299bff6c0 Level-0 table #45: 0 bytes OK
-2023/10/23-16:38:21.736925 7fc299bff6c0 Delete type=0 #43
-2023/10/23-16:38:21.737272 7fc299bff6c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
-2023/10/23-16:38:21.737344 7fc299bff6c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
+2023/10/23-23:27:50.534411 7fc51a7fc6c0 Recovering log #44
+2023/10/23-23:27:50.547268 7fc51a7fc6c0 Delete type=3 #42
+2023/10/23-23:27:50.547364 7fc51a7fc6c0 Delete type=0 #44
+2023/10/24-07:04:13.206805 7fc299bff6c0 Level-0 table #49: started
+2023/10/24-07:04:13.206870 7fc299bff6c0 Level-0 table #49: 0 bytes OK
+2023/10/24-07:04:13.213996 7fc299bff6c0 Delete type=0 #47
+2023/10/24-07:04:13.214197 7fc299bff6c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
+2023/10/24-07:04:13.214231 7fc299bff6c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
diff --git a/packs/cybernetics/LOG.old b/packs/cybernetics/LOG.old
index 6d179ce..9336f1b 100644
--- a/packs/cybernetics/LOG.old
+++ b/packs/cybernetics/LOG.old
@@ -1,8 +1,8 @@
-2023/10/23-16:10:20.951307 7fc51bfff6c0 Recovering log #36
-2023/10/23-16:10:21.100428 7fc51bfff6c0 Delete type=3 #34
-2023/10/23-16:10:21.100526 7fc51bfff6c0 Delete type=0 #36
-2023/10/23-16:21:11.413951 7fc299bff6c0 Level-0 table #41: started
-2023/10/23-16:21:11.413979 7fc299bff6c0 Level-0 table #41: 0 bytes OK
-2023/10/23-16:21:11.422105 7fc299bff6c0 Delete type=0 #39
-2023/10/23-16:21:11.422327 7fc299bff6c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
-2023/10/23-16:21:11.422382 7fc299bff6c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
+2023/10/23-16:21:18.916086 7fc51b7fe6c0 Recovering log #40
+2023/10/23-16:21:18.926380 7fc51b7fe6c0 Delete type=3 #38
+2023/10/23-16:21:18.926444 7fc51b7fe6c0 Delete type=0 #40
+2023/10/23-16:38:21.687516 7fc299bff6c0 Level-0 table #45: started
+2023/10/23-16:38:21.687571 7fc299bff6c0 Level-0 table #45: 0 bytes OK
+2023/10/23-16:38:21.736925 7fc299bff6c0 Delete type=0 #43
+2023/10/23-16:38:21.737272 7fc299bff6c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
+2023/10/23-16:38:21.737344 7fc299bff6c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
diff --git a/packs/cybernetics/MANIFEST-000042 b/packs/cybernetics/MANIFEST-000042
deleted file mode 100644
index 1161bcf..0000000
Binary files a/packs/cybernetics/MANIFEST-000042 and /dev/null differ
diff --git a/packs/equipment/000116.log b/packs/equipment/000116.log
deleted file mode 100644
index e69de29..0000000
diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT
index 3182b19..7530019 100644
--- a/packs/equipment/CURRENT
+++ b/packs/equipment/CURRENT
@@ -1 +1 @@
-MANIFEST-000114
+MANIFEST-000118
diff --git a/packs/equipment/LOG b/packs/equipment/LOG
index e5ec30f..8867cd3 100644
--- a/packs/equipment/LOG
+++ b/packs/equipment/LOG
@@ -1,7 +1,7 @@
-2023/10/23-16:21:18.830319 7fc51a7fc6c0 Recovering log #112
-2023/10/23-16:21:18.840025 7fc51a7fc6c0 Delete type=3 #110
-2023/10/23-16:21:18.840086 7fc51a7fc6c0 Delete type=0 #112
-2023/10/23-16:38:21.349441 7fc299bff6c0 Level-0 table #117: started
-2023/10/23-16:38:21.349501 7fc299bff6c0 Level-0 table #117: 0 bytes OK
-2023/10/23-16:38:21.402714 7fc299bff6c0 Delete type=0 #115
-2023/10/23-16:38:21.445484 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/23-23:27:50.410339 7fc51b7fe6c0 Recovering log #116
+2023/10/23-23:27:50.422120 7fc51b7fe6c0 Delete type=3 #114
+2023/10/23-23:27:50.422217 7fc51b7fe6c0 Delete type=0 #116
+2023/10/24-07:04:13.161070 7fc299bff6c0 Level-0 table #121: started
+2023/10/24-07:04:13.161129 7fc299bff6c0 Level-0 table #121: 0 bytes OK
+2023/10/24-07:04:13.168664 7fc299bff6c0 Delete type=0 #119
+2023/10/24-07:04:13.168925 7fc299bff6c0 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 be40295..e5ec30f 100644
--- a/packs/equipment/LOG.old
+++ b/packs/equipment/LOG.old
@@ -1,7 +1,7 @@
-2023/10/23-16:10:20.466941 7fc51a7fc6c0 Recovering log #108
-2023/10/23-16:10:20.525312 7fc51a7fc6c0 Delete type=3 #106
-2023/10/23-16:10:20.525371 7fc51a7fc6c0 Delete type=0 #108
-2023/10/23-16:21:11.349899 7fc299bff6c0 Level-0 table #113: started
-2023/10/23-16:21:11.349986 7fc299bff6c0 Level-0 table #113: 0 bytes OK
-2023/10/23-16:21:11.358380 7fc299bff6c0 Delete type=0 #111
-2023/10/23-16:21:11.367287 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/23-16:21:18.830319 7fc51a7fc6c0 Recovering log #112
+2023/10/23-16:21:18.840025 7fc51a7fc6c0 Delete type=3 #110
+2023/10/23-16:21:18.840086 7fc51a7fc6c0 Delete type=0 #112
+2023/10/23-16:38:21.349441 7fc299bff6c0 Level-0 table #117: started
+2023/10/23-16:38:21.349501 7fc299bff6c0 Level-0 table #117: 0 bytes OK
+2023/10/23-16:38:21.402714 7fc299bff6c0 Delete type=0 #115
+2023/10/23-16:38:21.445484 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs/equipment/MANIFEST-000114 b/packs/equipment/MANIFEST-000114
deleted file mode 100644
index 30f1562..0000000
Binary files a/packs/equipment/MANIFEST-000114 and /dev/null differ
diff --git a/packs/perks/000116.log b/packs/perks/000116.log
deleted file mode 100644
index e69de29..0000000
diff --git a/packs/perks/CURRENT b/packs/perks/CURRENT
index 3182b19..7530019 100644
--- a/packs/perks/CURRENT
+++ b/packs/perks/CURRENT
@@ -1 +1 @@
-MANIFEST-000114
+MANIFEST-000118
diff --git a/packs/perks/LOG b/packs/perks/LOG
index d01e2bc..cb22db0 100644
--- a/packs/perks/LOG
+++ b/packs/perks/LOG
@@ -1,8 +1,8 @@
-2023/10/23-16:21:18.903797 7fc51affd6c0 Recovering log #112
-2023/10/23-16:21:18.914282 7fc51affd6c0 Delete type=3 #110
-2023/10/23-16:21:18.914341 7fc51affd6c0 Delete type=0 #112
-2023/10/23-16:38:21.649612 7fc299bff6c0 Level-0 table #117: started
-2023/10/23-16:38:21.649693 7fc299bff6c0 Level-0 table #117: 0 bytes OK
-2023/10/23-16:38:21.687274 7fc299bff6c0 Delete type=0 #115
-2023/10/23-16:38:21.737212 7fc299bff6c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
-2023/10/23-16:38:21.737295 7fc299bff6c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/10/23-23:27:50.513819 7fc51bfff6c0 Recovering log #116
+2023/10/23-23:27:50.529859 7fc51bfff6c0 Delete type=3 #114
+2023/10/23-23:27:50.530088 7fc51bfff6c0 Delete type=0 #116
+2023/10/24-07:04:13.188715 7fc299bff6c0 Level-0 table #121: started
+2023/10/24-07:04:13.188752 7fc299bff6c0 Level-0 table #121: 0 bytes OK
+2023/10/24-07:04:13.198296 7fc299bff6c0 Delete type=0 #119
+2023/10/24-07:04:13.206600 7fc299bff6c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/10/24-07:04:13.206646 7fc299bff6c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
diff --git a/packs/perks/LOG.old b/packs/perks/LOG.old
index c6487fa..d01e2bc 100644
--- a/packs/perks/LOG.old
+++ b/packs/perks/LOG.old
@@ -1,8 +1,8 @@
-2023/10/23-16:10:20.851365 7fc51affd6c0 Recovering log #108
-2023/10/23-16:10:20.940844 7fc51affd6c0 Delete type=3 #106
-2023/10/23-16:10:20.940918 7fc51affd6c0 Delete type=0 #108
-2023/10/23-16:21:11.403299 7fc299bff6c0 Level-0 table #113: started
-2023/10/23-16:21:11.403360 7fc299bff6c0 Level-0 table #113: 0 bytes OK
-2023/10/23-16:21:11.413808 7fc299bff6c0 Delete type=0 #111
-2023/10/23-16:21:11.422303 7fc299bff6c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
-2023/10/23-16:21:11.422358 7fc299bff6c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/10/23-16:21:18.903797 7fc51affd6c0 Recovering log #112
+2023/10/23-16:21:18.914282 7fc51affd6c0 Delete type=3 #110
+2023/10/23-16:21:18.914341 7fc51affd6c0 Delete type=0 #112
+2023/10/23-16:38:21.649612 7fc299bff6c0 Level-0 table #117: started
+2023/10/23-16:38:21.649693 7fc299bff6c0 Level-0 table #117: 0 bytes OK
+2023/10/23-16:38:21.687274 7fc299bff6c0 Delete type=0 #115
+2023/10/23-16:38:21.737212 7fc299bff6c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/10/23-16:38:21.737295 7fc299bff6c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
diff --git a/packs/perks/MANIFEST-000114 b/packs/perks/MANIFEST-000114
deleted file mode 100644
index e30411d..0000000
Binary files a/packs/perks/MANIFEST-000114 and /dev/null differ
diff --git a/packs/shields/000116.log b/packs/shields/000116.log
deleted file mode 100644
index e69de29..0000000
diff --git a/packs/shields/CURRENT b/packs/shields/CURRENT
index 3182b19..7530019 100644
--- a/packs/shields/CURRENT
+++ b/packs/shields/CURRENT
@@ -1 +1 @@
-MANIFEST-000114
+MANIFEST-000118
diff --git a/packs/shields/LOG b/packs/shields/LOG
index 9c04729..a519991 100644
--- a/packs/shields/LOG
+++ b/packs/shields/LOG
@@ -1,7 +1,7 @@
-2023/10/23-16:21:18.841422 7fc51bfff6c0 Recovering log #112
-2023/10/23-16:21:18.851392 7fc51bfff6c0 Delete type=3 #110
-2023/10/23-16:21:18.851494 7fc51bfff6c0 Delete type=0 #112
-2023/10/23-16:38:21.402937 7fc299bff6c0 Level-0 table #117: started
-2023/10/23-16:38:21.402989 7fc299bff6c0 Level-0 table #117: 0 bytes OK
-2023/10/23-16:38:21.445303 7fc299bff6c0 Delete type=0 #115
-2023/10/23-16:38:21.520208 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/23-23:27:50.426680 7fc51affd6c0 Recovering log #116
+2023/10/23-23:27:50.441090 7fc51affd6c0 Delete type=3 #114
+2023/10/23-23:27:50.441243 7fc51affd6c0 Delete type=0 #116
+2023/10/24-07:04:13.151969 7fc299bff6c0 Level-0 table #121: started
+2023/10/24-07:04:13.152034 7fc299bff6c0 Level-0 table #121: 0 bytes OK
+2023/10/24-07:04:13.160843 7fc299bff6c0 Delete type=0 #119
+2023/10/24-07:04:13.168906 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs/shields/LOG.old b/packs/shields/LOG.old
index bf959fa..9c04729 100644
--- a/packs/shields/LOG.old
+++ b/packs/shields/LOG.old
@@ -1,7 +1,7 @@
-2023/10/23-16:10:20.532396 7fc51b7fe6c0 Recovering log #108
-2023/10/23-16:10:20.583047 7fc51b7fe6c0 Delete type=3 #106
-2023/10/23-16:10:20.583182 7fc51b7fe6c0 Delete type=0 #108
-2023/10/23-16:21:11.358565 7fc299bff6c0 Level-0 table #113: started
-2023/10/23-16:21:11.358632 7fc299bff6c0 Level-0 table #113: 0 bytes OK
-2023/10/23-16:21:11.367191 7fc299bff6c0 Delete type=0 #111
-2023/10/23-16:21:11.375219 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/23-16:21:18.841422 7fc51bfff6c0 Recovering log #112
+2023/10/23-16:21:18.851392 7fc51bfff6c0 Delete type=3 #110
+2023/10/23-16:21:18.851494 7fc51bfff6c0 Delete type=0 #112
+2023/10/23-16:38:21.402937 7fc299bff6c0 Level-0 table #117: started
+2023/10/23-16:38:21.402989 7fc299bff6c0 Level-0 table #117: 0 bytes OK
+2023/10/23-16:38:21.445303 7fc299bff6c0 Delete type=0 #115
+2023/10/23-16:38:21.520208 7fc299bff6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
diff --git a/packs/shields/MANIFEST-000114 b/packs/shields/MANIFEST-000114
deleted file mode 100644
index 30f1562..0000000
Binary files a/packs/shields/MANIFEST-000114 and /dev/null differ
diff --git a/packs/skills/000116.log b/packs/skills/000116.log
deleted file mode 100644
index e69de29..0000000
diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT
index 3182b19..7530019 100644
--- a/packs/skills/CURRENT
+++ b/packs/skills/CURRENT
@@ -1 +1 @@
-MANIFEST-000114
+MANIFEST-000118
diff --git a/packs/skills/LOG b/packs/skills/LOG
index 6a593c6..12c30b4 100644
--- a/packs/skills/LOG
+++ b/packs/skills/LOG
@@ -1,8 +1,8 @@
-2023/10/23-16:21:18.891042 7fc51bfff6c0 Recovering log #112
-2023/10/23-16:21:18.901616 7fc51bfff6c0 Delete type=3 #110
-2023/10/23-16:21:18.901698 7fc51bfff6c0 Delete type=0 #112
-2023/10/23-16:38:21.606929 7fc299bff6c0 Level-0 table #117: started
-2023/10/23-16:38:21.606959 7fc299bff6c0 Level-0 table #117: 0 bytes OK
-2023/10/23-16:38:21.649170 7fc299bff6c0 Delete type=0 #115
-2023/10/23-16:38:21.649544 7fc299bff6c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
-2023/10/23-16:38:21.737175 7fc299bff6c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/10/23-23:27:50.495684 7fc51affd6c0 Recovering log #116
+2023/10/23-23:27:50.509347 7fc51affd6c0 Delete type=3 #114
+2023/10/23-23:27:50.509455 7fc51affd6c0 Delete type=0 #116
+2023/10/24-07:04:13.198474 7fc299bff6c0 Level-0 table #121: started
+2023/10/24-07:04:13.198516 7fc299bff6c0 Level-0 table #121: 0 bytes OK
+2023/10/24-07:04:13.206393 7fc299bff6c0 Delete type=0 #119
+2023/10/24-07:04:13.206623 7fc299bff6c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/10/24-07:04:13.206665 7fc299bff6c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old
index 222c026..6a593c6 100644
--- a/packs/skills/LOG.old
+++ b/packs/skills/LOG.old
@@ -1,8 +1,8 @@
-2023/10/23-16:10:20.795855 7fc51b7fe6c0 Recovering log #108
-2023/10/23-16:10:20.847003 7fc51b7fe6c0 Delete type=3 #106
-2023/10/23-16:10:20.847142 7fc51b7fe6c0 Delete type=0 #108
-2023/10/23-16:21:11.394255 7fc299bff6c0 Level-0 table #113: started
-2023/10/23-16:21:11.394305 7fc299bff6c0 Level-0 table #113: 0 bytes OK
-2023/10/23-16:21:11.402795 7fc299bff6c0 Delete type=0 #111
-2023/10/23-16:21:11.403156 7fc299bff6c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
-2023/10/23-16:21:11.413937 7fc299bff6c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/10/23-16:21:18.891042 7fc51bfff6c0 Recovering log #112
+2023/10/23-16:21:18.901616 7fc51bfff6c0 Delete type=3 #110
+2023/10/23-16:21:18.901698 7fc51bfff6c0 Delete type=0 #112
+2023/10/23-16:38:21.606929 7fc299bff6c0 Level-0 table #117: started
+2023/10/23-16:38:21.606959 7fc299bff6c0 Level-0 table #117: 0 bytes OK
+2023/10/23-16:38:21.649170 7fc299bff6c0 Delete type=0 #115
+2023/10/23-16:38:21.649544 7fc299bff6c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/10/23-16:38:21.737175 7fc299bff6c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
diff --git a/packs/skills/MANIFEST-000114 b/packs/skills/MANIFEST-000114
deleted file mode 100644
index dea5e3e..0000000
Binary files a/packs/skills/MANIFEST-000114 and /dev/null differ
diff --git a/packs/weapons/000117.log b/packs/weapons/000117.log
deleted file mode 100644
index e69de29..0000000
diff --git a/packs/weapons/CURRENT b/packs/weapons/CURRENT
index 4843639..8880a30 100644
--- a/packs/weapons/CURRENT
+++ b/packs/weapons/CURRENT
@@ -1 +1 @@
-MANIFEST-000115
+MANIFEST-000119
diff --git a/packs/weapons/LOG b/packs/weapons/LOG
index fabb680..b5feecc 100644
--- a/packs/weapons/LOG
+++ b/packs/weapons/LOG
@@ -1,8 +1,8 @@
-2023/10/23-16:21:18.853136 7fc51affd6c0 Recovering log #113
-2023/10/23-16:21:18.864323 7fc51affd6c0 Delete type=3 #111
-2023/10/23-16:21:18.864379 7fc51affd6c0 Delete type=0 #113
-2023/10/23-16:38:21.445678 7fc299bff6c0 Level-0 table #118: started
-2023/10/23-16:38:21.445739 7fc299bff6c0 Level-0 table #118: 0 bytes OK
-2023/10/23-16:38:21.519996 7fc299bff6c0 Delete type=0 #116
-2023/10/23-16:38:21.606911 7fc299bff6c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
-2023/10/23-16:38:21.649518 7fc299bff6c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/10/23-23:27:50.444226 7fc51bfff6c0 Recovering log #117
+2023/10/23-23:27:50.457066 7fc51bfff6c0 Delete type=3 #115
+2023/10/23-23:27:50.457195 7fc51bfff6c0 Delete type=0 #117
+2023/10/24-07:04:13.142242 7fc299bff6c0 Level-0 table #122: started
+2023/10/24-07:04:13.142289 7fc299bff6c0 Level-0 table #122: 0 bytes OK
+2023/10/24-07:04:13.151711 7fc299bff6c0 Delete type=0 #120
+2023/10/24-07:04:13.168881 7fc299bff6c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/10/24-07:04:13.168957 7fc299bff6c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
diff --git a/packs/weapons/LOG.old b/packs/weapons/LOG.old
index b6ae7cd..fabb680 100644
--- a/packs/weapons/LOG.old
+++ b/packs/weapons/LOG.old
@@ -1,8 +1,8 @@
-2023/10/23-16:10:20.585116 7fc51affd6c0 Recovering log #109
-2023/10/23-16:10:20.661600 7fc51affd6c0 Delete type=3 #107
-2023/10/23-16:10:20.661671 7fc51affd6c0 Delete type=0 #109
-2023/10/23-16:21:11.367314 7fc299bff6c0 Level-0 table #114: started
-2023/10/23-16:21:11.367340 7fc299bff6c0 Level-0 table #114: 0 bytes OK
-2023/10/23-16:21:11.374984 7fc299bff6c0 Delete type=0 #112
-2023/10/23-16:21:11.394227 7fc299bff6c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
-2023/10/23-16:21:11.403131 7fc299bff6c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/10/23-16:21:18.853136 7fc51affd6c0 Recovering log #113
+2023/10/23-16:21:18.864323 7fc51affd6c0 Delete type=3 #111
+2023/10/23-16:21:18.864379 7fc51affd6c0 Delete type=0 #113
+2023/10/23-16:38:21.445678 7fc299bff6c0 Level-0 table #118: started
+2023/10/23-16:38:21.445739 7fc299bff6c0 Level-0 table #118: 0 bytes OK
+2023/10/23-16:38:21.519996 7fc299bff6c0 Delete type=0 #116
+2023/10/23-16:38:21.606911 7fc299bff6c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/10/23-16:38:21.649518 7fc299bff6c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
diff --git a/packs/weapons/MANIFEST-000115 b/packs/weapons/MANIFEST-000115
deleted file mode 100644
index e4f3d8e..0000000
Binary files a/packs/weapons/MANIFEST-000115 and /dev/null differ
diff --git a/styles/simple.css b/styles/simple.css
index 935398d..4ab09a2 100644
--- a/styles/simple.css
+++ b/styles/simple.css
@@ -1417,26 +1417,31 @@ Focus FOC: #ff0084
 }
 .item-name-label-header-long {
   flex-grow:2;
+  margin-top: 4px;
   max-width: 14rem;
   min-width: 14rem;
 }
 .item-name-label-header-long2 {
   flex-grow:2;
+  margin-top: 4px;
   max-width: 24rem;
   min-width: 24rem;
 }
 .item-name-label {
   flex-grow:2;
+  margin-top: 4px;
   max-width: 10rem;
   min-width: 10rem;
 }
 .item-name-label-long {
   flex-grow:2;
+  margin-top: 4px;
   max-width: 12rem;
   min-width: 12rem;
 }
 .item-name-label-long2 {
   flex-grow:2;
+  margin-top: 4px;
   max-width: 22rem;
   min-width: 22rem;
 }
@@ -1490,7 +1495,9 @@ Focus FOC: #ff0084
   min-width:2rem;
   max-width: 2rem;
 }
-
+.margin-left-4 {
+  margin-left: 4px;
+}
 .dice-pool-stack {
   flex: 1 1 5rem;
   display: flex !important;
diff --git a/system.json b/system.json
index 19e291e..c88c88e 100644
--- a/system.json
+++ b/system.json
@@ -109,14 +109,14 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "11.0.10",
+  "version": "11.0.11",
   "compatibility": {
     "minimum": "11",
     "verified": "11"
   },
   "title": "Dark Stars RPG",
   "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/raw/branch/main/system.json",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/archive/fvtt-dark-stars-v11.0.10.zip",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/archive/fvtt-dark-stars-v11.0.11.zip",
   "url": "https://www.uberwald.me/gitea/uberwald/",
   "background": "images/ui/dark_stars_welcome_page.webp",
   "id": "fvtt-dark-stars"
diff --git a/template.json b/template.json
index aca3d77..18d050d 100644
--- a/template.json
+++ b/template.json
@@ -415,6 +415,7 @@
     "weapon": {
       "weapontype": "",
       "associatedskill": "",
+      "skill": "",
       "penetrationmin": "",
       "penetrationmax": "",
       "needammo": false,
diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs
index 16c4288..f45313d 100644
--- a/templates/actors/actor-sheet.hbs
+++ b/templates/actors/actor-sheet.hbs
@@ -63,11 +63,18 @@
 
             {{#if (eq key "hp")}}
             <ul class="stat-list alternate-list item-list hplocation-column">
+              <li class="item stat flexrow list-item list-item-shadow">
+                <label class="item-field-label-short">Loc.</label>
+                <label class="item-field-label-short">Cur</label>
+                <label class="item-field-label-short">Max</label>
+                <label class="item-field-label-short">Armor</label>
+              </li>
               {{#each @root.system.hitlocations as |loc key|}}
               <li class="item stat flexrow list-item list-item-shadow">
                 <label class="item-field-label-short">{{loc.label}}</label>
                 <input type="text" class="item-field-label-short padd-right" name="system.hitlocations.{{key}}.value" value="{{loc.value}}" data-dtype="Number"/>
                 <label class="item-field-label-short">&nbsp;/&nbsp;{{loc.max}}</label>
+                <input type="text" class="item-field-label-short padd-right" name="system.hitlocations.{{key}}.armor" value="{{loc.armor}}" data-dtype="Number"/>
               </li>
               {{/each}}
             </ul>
@@ -115,7 +122,7 @@
         <li class="item flexrow list-item list-item-shadow" data-item-id="{{skill._id}}">
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{skill.img}}" />
           </a>
-          <span class="item-field-label-vlong2"><a class="roll-skill">{{skill.name}}</a></span>
+          <span class="item-field-label-vlong2"><i class="fa-solid fa-dice-d10"></i><a class="roll-skill">{{skill.name}}</a></span>
           <span class="item-field-label-medium">{{skill.system.value}}</span>
           <span class="item-field-label-long">{{skill.derivated.label}} ({{skill.derivated.value}})</span>
           <span class="item-field-label-medium">{{skill.system.bonus}}</span>
@@ -138,6 +145,11 @@
           <span class="item-name-label-header-long2">
             <h3><label class="items-title-text">Perks</label></h3>
           </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Type</label>
+          </span>
+
+          <div class="item-filler">&nbsp;</div>
           <span class="item-field-label-medium">
             <label class="short-label">&nbsp;</label>
           </span>
@@ -147,6 +159,8 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{perk.img}}" />
           </a>
           <span class="item-field-label-vlong2">{{perk.name}}</span>
+
+          <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
@@ -163,7 +177,7 @@
         <div>
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
-              <span class="item-name-label-header-long">
+              <span class="item-name-label-header">
                 <h3><label class="items-title-text">Weapons</label></h3>
               </span>
               <span class="item-field-label-medium">
@@ -175,19 +189,25 @@
               <span class="item-field-label-long">
                 <label class="short-label">Ammo</label>
               </span>
-              <span class="item-field-label-medium">
+              <span class="item-field-label-medium   margin-left-4">
                 <label class="short-label">Damage</label>
               </span>
+              <span class="item-field-label-short">
+                <label class="short-label">BR</label>
+              </span>
+              <span class="item-field-label-medium">
+                <label class="short-label">Penetration</label>
+              </span>
             </li>
             {{#each equippedWeapons as |weapon key|}}
             <li class="item flexrow list-item list-item-shadow" data-item-id="{{weapon._id}}">
               <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                   src="{{weapon.img}}" /></a>
-              <span class="item-name-label-long"><a class ="roll-weapon">{{weapon.name}}</a></span>
+              <span class="item-name-label"><a class ="roll-weapon"><i class="fa-solid fa-dice-d10"></i>{{weapon.name}}</a></span>
 
               <span class="item-field-label-medium">{{upperFirst weapon.system.weapontype}}</span>
 
-              <span class="item-field-label-long">{{upperFirst weapon.system.associatedskill}}</span>
+              <span class="item-field-label-long">{{upperFirst weapon.system.skill}}</span>
               
               {{#if weapon.system.needammo}}
                 <select class="item-field-label-long edit-weapon-ammo" type="text" data-dtype="String">
@@ -199,19 +219,25 @@
                   {{/select}}
                 </select>
                 {{#if weapon.ammo}}              
-                  <span class="item-field-label-medium"><label>{{weapon.ammo.system.damage}}</label></span>
+                  <span class="item-field-label-medium   margin-left-4"><label>{{weapon.ammo.system.damage}}</label></span>
                 {{else}}
-                  <span class="item-field-label-medium"><label>-</label></span>
+                  <span class="item-field-label-medium  margin-left-4"><label>-</label></span>
                 {{/if}}
               {{else}}
                 <span class="item-field-label-long"><label>N/A</label></span>
-                <span class="item-field-label-medium"><label>{{weapon.system.damage}}</label></span>
+                <span class="item-field-label-medium  margin-left-4"><label>{{weapon.system.damage}}</label></span>
               {{/if}}
 
+              <span class="item-field-label-short">{{weapon.system.br}}</span>
+
+              <span class="item-field-label-medium">{{weapon.system.penetrationmin}} - {{weapon.system.penetrationmax}}</span>
+
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
+
+
             </li>
             {{/each}}
           </ul>
@@ -351,7 +377,7 @@
               src="{{weapon.img}}" /></a>
           <span class="item-name-label">{{weapon.name}}</span>
 
-          <span class="item-field-label-medium"><label>{{weapon.system.weapontype}}</label></span>
+          <span class="item-field-label-medium"><label>{{upperFirst weapon.system.weapontype}}</label></span>
 
           {{#if weapon.system.needammo}}
             <select class="item-field-label-vlong edit-weapon-ammo" type="text" data-dtype="String">
diff --git a/templates/chat/chat-generic-result.hbs b/templates/chat/chat-generic-result.hbs
index cf068cc..b99a14f 100644
--- a/templates/chat/chat-generic-result.hbs
+++ b/templates/chat/chat-generic-result.hbs
@@ -61,7 +61,7 @@
           {{#if weapon.system.hasfatiguedamage}}
             <li>Roll Fatigue Damage: [[/r {{weapon.ammo.system.fatiguedamage}}*{{damageMultiplier}}]]</li>
           {{/if}}
-          <li>BR: [[/r {{weapon.system.br}}]]</li>          
+          <li>BR: {{weapon.system.br}}</li>          
         {{/if}}
           <li>Penetration : {{mul weapon.system.penetrationmin damageMultiplier}} - {{mul weapon.system.penetrationmax damageMultiplier}}</li>          
       {{/if}}