diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 98ce4f0d..4b1c0c15 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,8 +18,14 @@ jobs:
       - name: Set Release Notes for Github
         id: set-release-notes-github
         run: |
+          echo "- General:" >> release_notes.txt
+          echo "  - Template Visibility: Added native setting to hide template visibility, Walled Templates is no longer a requirement to do so. This is always enabled for Opportunity Attacks, turning the module setting on will hide other automations templates in my module. Walled Templates will still work with this setting, but I would recommend disabling it if the only functionality you are using it for is to hide OA templates." >> release_notes.txt
+          echo "- Additions:" >> release_notes.txt
+          echo "  - Ball Bearings: Automation for ball bearings with dialog to GM to confirm whether target is moving at half speed." >> release_notes.txt
           echo "- Updates:" >> release_notes.txt
-          echo "  - Opportunity Attack: Second big update. Removed need for an Opportunity Attack item which has been removed. Updated deployment to finally fix canvas freezing on combat start definitivelyTM. Fix bug when selecting a favorited weapon for the first time where the attack would not process. Fix bug with Walled Templates display template on token hover suppression flag. Hugely increase speed of deployment. Most instances should now be looking at a couple seconds of additional processing time max when starting combat." >> release_notes.txt
+          echo "  - Caltrops: Add dialog to GM to confirm whether target is moving at half speed." >> release_notes.txt
+          echo "- Bugfixes:" >> release_notes.txt
+          echo "  - Protection: Fix homebrew feature Enable Protection on Success incorrect key" >> release_notes.txt
           echo "release-notes-github<<EOF" >> $GITHUB_ENV
           cat release_notes.txt >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
diff --git a/assets/images/ballBearings.webp b/assets/images/ballBearings.webp
new file mode 100644
index 00000000..43c55d54
Binary files /dev/null and b/assets/images/ballBearings.webp differ
diff --git a/module.json b/module.json
index f3f7bd2a..d910355c 100644
--- a/module.json
+++ b/module.json
@@ -7,7 +7,7 @@
 		"name": "Gambit"
 		}
 	],
-  "version": "0.1.53",
+  "version": "0.1.54",
 	"compatibility": {
 	"minimum": "11",
 	"verified": "11",
diff --git a/packs/gps-3rd-party-features/000503.log b/packs/gps-3rd-party-features/000547.log
similarity index 100%
rename from packs/gps-3rd-party-features/000503.log
rename to packs/gps-3rd-party-features/000547.log
diff --git a/packs/gps-3rd-party-features/CURRENT b/packs/gps-3rd-party-features/CURRENT
index b9260078..7f02150a 100644
--- a/packs/gps-3rd-party-features/CURRENT
+++ b/packs/gps-3rd-party-features/CURRENT
@@ -1 +1 @@
-MANIFEST-000501
+MANIFEST-000545
diff --git a/packs/gps-3rd-party-features/LOG b/packs/gps-3rd-party-features/LOG
index f84f8648..8347c8c3 100644
--- a/packs/gps-3rd-party-features/LOG
+++ b/packs/gps-3rd-party-features/LOG
@@ -1,8 +1,8 @@
-2024/05/30-00:06:21.465 6b00 Recovering log #499
-2024/05/30-00:06:21.476 6b00 Delete type=0 #499
-2024/05/30-00:06:21.476 6b00 Delete type=3 #497
-2024/05/30-11:29:13.361 5698 Level-0 table #504: started
-2024/05/30-11:29:13.361 5698 Level-0 table #504: 0 bytes OK
-2024/05/30-11:29:13.366 5698 Delete type=0 #502
-2024/05/30-11:29:13.366 5698 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end)
-2024/05/30-11:29:13.367 5698 Manual compaction at level-1 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:32.557 683c Recovering log #543
+2024/06/01-00:56:32.562 683c Delete type=0 #543
+2024/06/01-00:56:32.562 683c Delete type=3 #541
+2024/06/01-15:59:09.072 5698 Level-0 table #548: started
+2024/06/01-15:59:09.072 5698 Level-0 table #548: 0 bytes OK
+2024/06/01-15:59:09.077 5698 Delete type=0 #546
+2024/06/01-15:59:09.088 5698 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end)
+2024/06/01-15:59:09.088 5698 Manual compaction at level-1 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-3rd-party-features/LOG.old b/packs/gps-3rd-party-features/LOG.old
index 458dc114..9e4e930c 100644
--- a/packs/gps-3rd-party-features/LOG.old
+++ b/packs/gps-3rd-party-features/LOG.old
@@ -1,8 +1,8 @@
-2024/05/30-00:00:46.366 6b00 Recovering log #494
-2024/05/30-00:00:46.372 6b00 Delete type=0 #494
-2024/05/30-00:00:46.372 6b00 Delete type=3 #492
-2024/05/30-00:05:36.002 5698 Level-0 table #500: started
-2024/05/30-00:05:36.002 5698 Level-0 table #500: 0 bytes OK
-2024/05/30-00:05:36.006 5698 Delete type=0 #498
-2024/05/30-00:05:36.015 5698 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end)
-2024/05/30-00:05:36.015 5698 Manual compaction at level-1 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end)
+2024/05/31-02:08:12.923 6b00 Recovering log #539
+2024/05/31-02:08:12.929 6b00 Delete type=0 #539
+2024/05/31-02:08:12.929 6b00 Delete type=3 #537
+2024/06/01-00:56:15.515 5698 Level-0 table #544: started
+2024/06/01-00:56:15.515 5698 Level-0 table #544: 0 bytes OK
+2024/06/01-00:56:15.517 5698 Delete type=0 #542
+2024/06/01-00:56:15.526 5698 Manual compaction at level-0 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:15.527 5698 Manual compaction at level-1 from '!folders!4Ecsdk7k1FvMs9OF' @ 72057594037927935 : 1 .. '!items.effects!G2IDv711EWrOF7ef.kE7T0D7E6CnMvjvr' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-3rd-party-features/MANIFEST-000501 b/packs/gps-3rd-party-features/MANIFEST-000545
similarity index 56%
rename from packs/gps-3rd-party-features/MANIFEST-000501
rename to packs/gps-3rd-party-features/MANIFEST-000545
index 75b63839..738386c8 100644
Binary files a/packs/gps-3rd-party-features/MANIFEST-000501 and b/packs/gps-3rd-party-features/MANIFEST-000545 differ
diff --git a/packs/gps-3rd-party-items/000500.log b/packs/gps-3rd-party-items/000544.log
similarity index 100%
rename from packs/gps-3rd-party-items/000500.log
rename to packs/gps-3rd-party-items/000544.log
diff --git a/packs/gps-3rd-party-items/CURRENT b/packs/gps-3rd-party-items/CURRENT
index b8caea65..29647ae4 100644
--- a/packs/gps-3rd-party-items/CURRENT
+++ b/packs/gps-3rd-party-items/CURRENT
@@ -1 +1 @@
-MANIFEST-000498
+MANIFEST-000542
diff --git a/packs/gps-3rd-party-items/LOG b/packs/gps-3rd-party-items/LOG
index 6ca83f1a..58e6f18e 100644
--- a/packs/gps-3rd-party-items/LOG
+++ b/packs/gps-3rd-party-items/LOG
@@ -1,8 +1,8 @@
-2024/05/30-00:06:21.479 6834 Recovering log #496
-2024/05/30-00:06:21.489 6834 Delete type=0 #496
-2024/05/30-00:06:21.489 6834 Delete type=3 #494
-2024/05/30-11:29:13.377 5698 Level-0 table #501: started
-2024/05/30-11:29:13.377 5698 Level-0 table #501: 0 bytes OK
-2024/05/30-11:29:13.382 5698 Delete type=0 #499
-2024/05/30-11:29:13.395 5698 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
-2024/05/30-11:29:13.395 5698 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:32.569 6834 Recovering log #540
+2024/06/01-00:56:32.575 6834 Delete type=0 #540
+2024/06/01-00:56:32.575 6834 Delete type=3 #538
+2024/06/01-15:59:09.083 5698 Level-0 table #545: started
+2024/06/01-15:59:09.083 5698 Level-0 table #545: 0 bytes OK
+2024/06/01-15:59:09.086 5698 Delete type=0 #543
+2024/06/01-15:59:09.088 5698 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
+2024/06/01-15:59:09.103 5698 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-3rd-party-items/LOG.old b/packs/gps-3rd-party-items/LOG.old
index 2db8e31c..c4b5416c 100644
--- a/packs/gps-3rd-party-items/LOG.old
+++ b/packs/gps-3rd-party-items/LOG.old
@@ -1,8 +1,8 @@
-2024/05/30-00:00:46.374 683c Recovering log #492
-2024/05/30-00:00:46.379 683c Delete type=0 #492
-2024/05/30-00:00:46.380 683c Delete type=3 #490
-2024/05/30-00:05:36.011 5698 Level-0 table #497: started
-2024/05/30-00:05:36.011 5698 Level-0 table #497: 0 bytes OK
-2024/05/30-00:05:36.015 5698 Delete type=0 #495
-2024/05/30-00:05:36.015 5698 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
-2024/05/30-00:05:36.016 5698 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
+2024/05/31-02:08:12.930 683c Recovering log #536
+2024/05/31-02:08:12.936 683c Delete type=0 #536
+2024/05/31-02:08:12.936 683c Delete type=3 #534
+2024/06/01-00:56:15.517 5698 Level-0 table #541: started
+2024/06/01-00:56:15.518 5698 Level-0 table #541: 0 bytes OK
+2024/06/01-00:56:15.521 5698 Delete type=0 #539
+2024/06/01-00:56:15.527 5698 Manual compaction at level-0 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:15.527 5698 Manual compaction at level-1 from '!items!A4JIbc14vM5IKbuT' @ 72057594037927935 : 1 .. '!items.effects!qHY9RXV48OmvCrw1.UNiU6zoPTpbrxoIA' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-3rd-party-items/MANIFEST-000498 b/packs/gps-3rd-party-items/MANIFEST-000542
similarity index 57%
rename from packs/gps-3rd-party-items/MANIFEST-000498
rename to packs/gps-3rd-party-items/MANIFEST-000542
index ed2acd3e..ae0dde87 100644
Binary files a/packs/gps-3rd-party-items/MANIFEST-000498 and b/packs/gps-3rd-party-items/MANIFEST-000542 differ
diff --git a/packs/gps-3rd-party-spells/000507.log b/packs/gps-3rd-party-spells/000551.log
similarity index 100%
rename from packs/gps-3rd-party-spells/000507.log
rename to packs/gps-3rd-party-spells/000551.log
diff --git a/packs/gps-3rd-party-spells/000492.ldb b/packs/gps-3rd-party-spells/000553.ldb
similarity index 89%
rename from packs/gps-3rd-party-spells/000492.ldb
rename to packs/gps-3rd-party-spells/000553.ldb
index da6f7cd4..c29cb937 100644
Binary files a/packs/gps-3rd-party-spells/000492.ldb and b/packs/gps-3rd-party-spells/000553.ldb differ
diff --git a/packs/gps-3rd-party-spells/CURRENT b/packs/gps-3rd-party-spells/CURRENT
index ee7cf6d2..e4084dc9 100644
--- a/packs/gps-3rd-party-spells/CURRENT
+++ b/packs/gps-3rd-party-spells/CURRENT
@@ -1 +1 @@
-MANIFEST-000505
+MANIFEST-000549
diff --git a/packs/gps-3rd-party-spells/LOG b/packs/gps-3rd-party-spells/LOG
index 04b2e551..274659eb 100644
--- a/packs/gps-3rd-party-spells/LOG
+++ b/packs/gps-3rd-party-spells/LOG
@@ -1,8 +1,15 @@
-2024/05/30-00:06:21.493 6b00 Recovering log #503
-2024/05/30-00:06:21.500 6b00 Delete type=0 #503
-2024/05/30-00:06:21.500 6b00 Delete type=3 #501
-2024/05/30-11:29:13.383 5698 Level-0 table #508: started
-2024/05/30-11:29:13.383 5698 Level-0 table #508: 0 bytes OK
-2024/05/30-11:29:13.389 5698 Delete type=0 #506
-2024/05/30-11:29:13.395 5698 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!sR2IAM3IQAq6m4xU.N6BqEfnUtgKmw2xw' @ 0 : 0; will stop at (end)
-2024/05/30-11:29:13.395 5698 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!sR2IAM3IQAq6m4xU.N6BqEfnUtgKmw2xw' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:32.581 683c Recovering log #547
+2024/06/01-00:56:32.587 683c Delete type=0 #547
+2024/06/01-00:56:32.587 683c Delete type=3 #545
+2024/06/01-15:59:09.077 5698 Level-0 table #552: started
+2024/06/01-15:59:09.081 5698 Level-0 table #552: 21029 bytes OK
+2024/06/01-15:59:09.083 5698 Delete type=0 #550
+2024/06/01-15:59:09.088 5698 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!sR2IAM3IQAq6m4xU.N6BqEfnUtgKmw2xw' @ 0 : 0; will stop at (end)
+2024/06/01-15:59:09.088 5698 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!sR2IAM3IQAq6m4xU.N6BqEfnUtgKmw2xw' @ 0 : 0; will stop at '!items!NjthP5BWntNXzcZt' @ 104 : 1
+2024/06/01-15:59:09.088 5698 Compacting 1@1 + 1@2 files
+2024/06/01-15:59:09.101 5698 Generated table #553@1: 27 keys, 59553 bytes
+2024/06/01-15:59:09.101 5698 Compacted 1@1 + 1@2 files => 59553 bytes
+2024/06/01-15:59:09.103 5698 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/06/01-15:59:09.103 5698 Delete type=2 #492
+2024/06/01-15:59:09.103 5698 Delete type=2 #552
+2024/06/01-15:59:09.108 5698 Manual compaction at level-1 from '!items!NjthP5BWntNXzcZt' @ 104 : 1 .. '!items.effects!sR2IAM3IQAq6m4xU.N6BqEfnUtgKmw2xw' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-3rd-party-spells/LOG.old b/packs/gps-3rd-party-spells/LOG.old
index 5bde1478..cfc49972 100644
--- a/packs/gps-3rd-party-spells/LOG.old
+++ b/packs/gps-3rd-party-spells/LOG.old
@@ -1,8 +1,8 @@
-2024/05/30-00:00:46.382 6b00 Recovering log #499
-2024/05/30-00:00:46.388 6b00 Delete type=0 #499
-2024/05/30-00:00:46.388 6b00 Delete type=3 #497
-2024/05/30-00:05:36.019 5698 Level-0 table #504: started
-2024/05/30-00:05:36.019 5698 Level-0 table #504: 0 bytes OK
-2024/05/30-00:05:36.025 5698 Delete type=0 #502
-2024/05/30-00:05:36.042 5698 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!sR2IAM3IQAq6m4xU.N6BqEfnUtgKmw2xw' @ 0 : 0; will stop at (end)
-2024/05/30-00:05:36.042 5698 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!sR2IAM3IQAq6m4xU.N6BqEfnUtgKmw2xw' @ 0 : 0; will stop at (end)
+2024/05/31-02:08:12.938 6b00 Recovering log #543
+2024/05/31-02:08:12.943 6b00 Delete type=0 #543
+2024/05/31-02:08:12.943 6b00 Delete type=3 #541
+2024/06/01-00:56:15.523 5698 Level-0 table #548: started
+2024/06/01-00:56:15.523 5698 Level-0 table #548: 0 bytes OK
+2024/06/01-00:56:15.526 5698 Delete type=0 #546
+2024/06/01-00:56:15.527 5698 Manual compaction at level-0 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!sR2IAM3IQAq6m4xU.N6BqEfnUtgKmw2xw' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:15.527 5698 Manual compaction at level-1 from '!items!2YNbYocBRdEDgO4Q' @ 72057594037927935 : 1 .. '!items.effects!sR2IAM3IQAq6m4xU.N6BqEfnUtgKmw2xw' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-3rd-party-spells/MANIFEST-000505 b/packs/gps-3rd-party-spells/MANIFEST-000505
deleted file mode 100644
index a4f2854e..00000000
Binary files a/packs/gps-3rd-party-spells/MANIFEST-000505 and /dev/null differ
diff --git a/packs/gps-3rd-party-spells/MANIFEST-000549 b/packs/gps-3rd-party-spells/MANIFEST-000549
new file mode 100644
index 00000000..77c55b86
Binary files /dev/null and b/packs/gps-3rd-party-spells/MANIFEST-000549 differ
diff --git a/packs/gps-actors/000972.log b/packs/gps-actors/001016.log
similarity index 100%
rename from packs/gps-actors/000972.log
rename to packs/gps-actors/001016.log
diff --git a/packs/gps-actors/CURRENT b/packs/gps-actors/CURRENT
index ff619c7a..60908576 100644
--- a/packs/gps-actors/CURRENT
+++ b/packs/gps-actors/CURRENT
@@ -1 +1 @@
-MANIFEST-000970
+MANIFEST-001014
diff --git a/packs/gps-actors/LOG b/packs/gps-actors/LOG
index a83fb5d5..63e81e3a 100644
--- a/packs/gps-actors/LOG
+++ b/packs/gps-actors/LOG
@@ -1,8 +1,8 @@
-2024/05/30-00:06:21.451 6834 Recovering log #968
-2024/05/30-00:06:21.462 6834 Delete type=0 #968
-2024/05/30-00:06:21.462 6834 Delete type=3 #966
-2024/05/30-11:29:13.351 5698 Level-0 table #973: started
-2024/05/30-11:29:13.352 5698 Level-0 table #973: 0 bytes OK
-2024/05/30-11:29:13.355 5698 Delete type=0 #971
-2024/05/30-11:29:13.366 5698 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
-2024/05/30-11:29:13.367 5698 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:32.543 6834 Recovering log #1012
+2024/06/01-00:56:32.549 6834 Delete type=0 #1012
+2024/06/01-00:56:32.549 6834 Delete type=3 #1010
+2024/06/01-15:59:09.068 5698 Level-0 table #1017: started
+2024/06/01-15:59:09.068 5698 Level-0 table #1017: 0 bytes OK
+2024/06/01-15:59:09.070 5698 Delete type=0 #1015
+2024/06/01-15:59:09.070 5698 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
+2024/06/01-15:59:09.070 5698 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-actors/LOG.old b/packs/gps-actors/LOG.old
index bc18017a..e23ed976 100644
--- a/packs/gps-actors/LOG.old
+++ b/packs/gps-actors/LOG.old
@@ -1,8 +1,8 @@
-2024/05/30-00:00:46.358 683c Recovering log #964
-2024/05/30-00:00:46.364 683c Delete type=0 #964
-2024/05/30-00:00:46.364 683c Delete type=3 #962
-2024/05/30-00:05:36.006 5698 Level-0 table #969: started
-2024/05/30-00:05:36.006 5698 Level-0 table #969: 0 bytes OK
-2024/05/30-00:05:36.011 5698 Delete type=0 #967
-2024/05/30-00:05:36.015 5698 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
-2024/05/30-00:05:36.015 5698 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
+2024/05/31-02:08:12.916 683c Recovering log #1008
+2024/05/31-02:08:12.921 683c Delete type=0 #1008
+2024/05/31-02:08:12.921 683c Delete type=3 #1006
+2024/06/01-00:56:15.521 5698 Level-0 table #1013: started
+2024/06/01-00:56:15.521 5698 Level-0 table #1013: 0 bytes OK
+2024/06/01-00:56:15.523 5698 Delete type=0 #1011
+2024/06/01-00:56:15.527 5698 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:15.527 5698 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-actors/MANIFEST-000970 b/packs/gps-actors/MANIFEST-001014
similarity index 70%
rename from packs/gps-actors/MANIFEST-000970
rename to packs/gps-actors/MANIFEST-001014
index 08e2c48c..a2a41ce6 100644
Binary files a/packs/gps-actors/MANIFEST-000970 and b/packs/gps-actors/MANIFEST-001014 differ
diff --git a/packs/gps-class-features/002148.log b/packs/gps-class-features/002192.log
similarity index 100%
rename from packs/gps-class-features/002148.log
rename to packs/gps-class-features/002192.log
diff --git a/packs/gps-class-features/002029.ldb b/packs/gps-class-features/002194.ldb
similarity index 90%
rename from packs/gps-class-features/002029.ldb
rename to packs/gps-class-features/002194.ldb
index e5bcfc39..e2a7dc5a 100644
Binary files a/packs/gps-class-features/002029.ldb and b/packs/gps-class-features/002194.ldb differ
diff --git a/packs/gps-class-features/CURRENT b/packs/gps-class-features/CURRENT
index c5c4ef77..28219056 100644
--- a/packs/gps-class-features/CURRENT
+++ b/packs/gps-class-features/CURRENT
@@ -1 +1 @@
-MANIFEST-002146
+MANIFEST-002190
diff --git a/packs/gps-class-features/LOG b/packs/gps-class-features/LOG
index e537ea7d..78b8d796 100644
--- a/packs/gps-class-features/LOG
+++ b/packs/gps-class-features/LOG
@@ -1,8 +1,15 @@
-2024/05/30-00:06:21.349 6834 Recovering log #2144
-2024/05/30-00:06:21.359 6834 Delete type=0 #2144
-2024/05/30-00:06:21.359 6834 Delete type=3 #2142
-2024/05/30-11:29:13.275 5698 Level-0 table #2149: started
-2024/05/30-11:29:13.276 5698 Level-0 table #2149: 0 bytes OK
-2024/05/30-11:29:13.280 5698 Delete type=0 #2147
-2024/05/30-11:29:13.285 5698 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
-2024/05/30-11:29:13.285 5698 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:32.420 6834 Recovering log #2188
+2024/06/01-00:56:32.425 6834 Delete type=0 #2188
+2024/06/01-00:56:32.425 6834 Delete type=3 #2186
+2024/06/01-15:59:09.038 5698 Level-0 table #2193: started
+2024/06/01-15:59:09.041 5698 Level-0 table #2193: 23286 bytes OK
+2024/06/01-15:59:09.044 5698 Delete type=0 #2191
+2024/06/01-15:59:09.046 5698 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/06/01-15:59:09.050 5698 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at '!items!hjYFwyYR4Ttvozjw' @ 358 : 1
+2024/06/01-15:59:09.050 5698 Compacting 1@1 + 1@2 files
+2024/06/01-15:59:09.054 5698 Generated table #2194@1: 55 keys, 99834 bytes
+2024/06/01-15:59:09.054 5698 Compacted 1@1 + 1@2 files => 99834 bytes
+2024/06/01-15:59:09.055 5698 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/06/01-15:59:09.055 5698 Delete type=2 #2029
+2024/06/01-15:59:09.055 5698 Delete type=2 #2193
+2024/06/01-15:59:09.058 5698 Manual compaction at level-1 from '!items!hjYFwyYR4Ttvozjw' @ 358 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-class-features/LOG.old b/packs/gps-class-features/LOG.old
index 661008d9..7b1125af 100644
--- a/packs/gps-class-features/LOG.old
+++ b/packs/gps-class-features/LOG.old
@@ -1,8 +1,8 @@
-2024/05/30-00:00:46.292 683c Recovering log #2140
-2024/05/30-00:00:46.298 683c Delete type=0 #2140
-2024/05/30-00:00:46.298 683c Delete type=3 #2138
-2024/05/30-00:05:35.932 5698 Level-0 table #2145: started
-2024/05/30-00:05:35.932 5698 Level-0 table #2145: 0 bytes OK
-2024/05/30-00:05:35.941 5698 Delete type=0 #2143
-2024/05/30-00:05:35.966 5698 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
-2024/05/30-00:05:35.967 5698 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/05/31-02:08:12.849 683c Recovering log #2184
+2024/05/31-02:08:12.854 683c Delete type=0 #2184
+2024/05/31-02:08:12.854 683c Delete type=3 #2182
+2024/06/01-00:56:15.486 5698 Level-0 table #2189: started
+2024/06/01-00:56:15.486 5698 Level-0 table #2189: 0 bytes OK
+2024/06/01-00:56:15.489 5698 Delete type=0 #2187
+2024/06/01-00:56:15.499 5698 Manual compaction at level-0 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:15.499 5698 Manual compaction at level-1 from '!folders!89rvrtGjpBsZz1Tr' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-class-features/MANIFEST-002146 b/packs/gps-class-features/MANIFEST-002146
deleted file mode 100644
index 1694abfd..00000000
Binary files a/packs/gps-class-features/MANIFEST-002146 and /dev/null differ
diff --git a/packs/gps-class-features/MANIFEST-002190 b/packs/gps-class-features/MANIFEST-002190
new file mode 100644
index 00000000..3dd544c2
Binary files /dev/null and b/packs/gps-class-features/MANIFEST-002190 differ
diff --git a/packs/gps-generic-features/002227.log b/packs/gps-generic-features/002272.log
similarity index 100%
rename from packs/gps-generic-features/002227.log
rename to packs/gps-generic-features/002272.log
diff --git a/packs/gps-generic-features/CURRENT b/packs/gps-generic-features/CURRENT
index ac2827ec..c7647806 100644
--- a/packs/gps-generic-features/CURRENT
+++ b/packs/gps-generic-features/CURRENT
@@ -1 +1 @@
-MANIFEST-002225
+MANIFEST-002270
diff --git a/packs/gps-generic-features/LOG b/packs/gps-generic-features/LOG
index 6c93d048..6bbad3f2 100644
--- a/packs/gps-generic-features/LOG
+++ b/packs/gps-generic-features/LOG
@@ -1,15 +1,8 @@
-2024/05/30-00:06:21.385 6b00 Recovering log #2222
-2024/05/30-00:06:21.397 6b00 Delete type=0 #2222
-2024/05/30-00:06:21.397 6b00 Delete type=3 #2220
-2024/05/30-11:29:13.295 5698 Level-0 table #2228: started
-2024/05/30-11:29:13.314 5698 Level-0 table #2228: 237 bytes OK
-2024/05/30-11:29:13.318 5698 Delete type=0 #2226
-2024/05/30-11:29:13.329 5698 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
-2024/05/30-11:29:13.329 5698 Manual compaction at level-1 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at '!items.effects!YWXTlGDKC2GH5VAS.1IkBgxOFEYJd4z53' @ 580 : 0
-2024/05/30-11:29:13.329 5698 Compacting 1@1 + 1@2 files
-2024/05/30-11:29:13.341 5698 Generated table #2229@1: 10 keys, 9581 bytes
-2024/05/30-11:29:13.341 5698 Compacted 1@1 + 1@2 files => 9581 bytes
-2024/05/30-11:29:13.345 5698 compacted to: files[ 0 0 1 0 0 0 0 ]
-2024/05/30-11:29:13.345 5698 Delete type=2 #2224
-2024/05/30-11:29:13.346 5698 Delete type=2 #2228
-2024/05/30-11:29:13.351 5698 Manual compaction at level-1 from '!items.effects!YWXTlGDKC2GH5VAS.1IkBgxOFEYJd4z53' @ 580 : 0 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:32.457 683c Recovering log #2268
+2024/06/01-00:56:32.463 683c Delete type=0 #2268
+2024/06/01-00:56:32.463 683c Delete type=3 #2266
+2024/06/01-15:59:09.046 5698 Level-0 table #2273: started
+2024/06/01-15:59:09.046 5698 Level-0 table #2273: 0 bytes OK
+2024/06/01-15:59:09.050 5698 Delete type=0 #2271
+2024/06/01-15:59:09.058 5698 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/06/01-15:59:09.058 5698 Manual compaction at level-1 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-generic-features/LOG.old b/packs/gps-generic-features/LOG.old
index 91d8b6fd..8f5f60cd 100644
--- a/packs/gps-generic-features/LOG.old
+++ b/packs/gps-generic-features/LOG.old
@@ -1,15 +1,8 @@
-2024/05/30-00:00:46.316 6b00 Recovering log #2217
-2024/05/30-00:00:46.322 6b00 Delete type=0 #2217
-2024/05/30-00:00:46.322 6b00 Delete type=3 #2215
-2024/05/30-00:05:35.954 5698 Level-0 table #2223: started
-2024/05/30-00:05:35.962 5698 Level-0 table #2223: 34431 bytes OK
-2024/05/30-00:05:35.966 5698 Delete type=0 #2221
-2024/05/30-00:05:35.967 5698 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
-2024/05/30-00:05:35.967 5698 Manual compaction at level-1 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at '!items!YWXTlGDKC2GH5VAS' @ 578 : 1
-2024/05/30-00:05:35.967 5698 Compacting 1@1 + 1@2 files
-2024/05/30-00:05:35.976 5698 Generated table #2224@1: 12 keys, 29831 bytes
-2024/05/30-00:05:35.976 5698 Compacted 1@1 + 1@2 files => 29831 bytes
-2024/05/30-00:05:35.978 5698 compacted to: files[ 0 0 1 0 0 0 0 ]
-2024/05/30-00:05:35.978 5698 Delete type=2 #2219
-2024/05/30-00:05:35.978 5698 Delete type=2 #2223
-2024/05/30-00:05:35.992 5698 Manual compaction at level-1 from '!items!YWXTlGDKC2GH5VAS' @ 578 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/05/31-02:08:12.872 6b00 Recovering log #2264
+2024/05/31-02:08:12.879 6b00 Delete type=0 #2264
+2024/05/31-02:08:12.879 6b00 Delete type=3 #2262
+2024/06/01-00:56:15.495 5698 Level-0 table #2269: started
+2024/06/01-00:56:15.495 5698 Level-0 table #2269: 0 bytes OK
+2024/06/01-00:56:15.499 5698 Delete type=0 #2267
+2024/06/01-00:56:15.499 5698 Manual compaction at level-0 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:15.499 5698 Manual compaction at level-1 from '!items!0XoQ7lGPSwjM8Gw4' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-generic-features/MANIFEST-002225 b/packs/gps-generic-features/MANIFEST-002225
deleted file mode 100644
index fc797930..00000000
Binary files a/packs/gps-generic-features/MANIFEST-002225 and /dev/null differ
diff --git a/packs/gps-generic-features/MANIFEST-002270 b/packs/gps-generic-features/MANIFEST-002270
new file mode 100644
index 00000000..05816274
Binary files /dev/null and b/packs/gps-generic-features/MANIFEST-002270 differ
diff --git a/packs/gps-homebrew-features/002128.log b/packs/gps-homebrew-features/002172.log
similarity index 100%
rename from packs/gps-homebrew-features/002128.log
rename to packs/gps-homebrew-features/002172.log
diff --git a/packs/gps-homebrew-features/CURRENT b/packs/gps-homebrew-features/CURRENT
index e2d3744f..25a22c79 100644
--- a/packs/gps-homebrew-features/CURRENT
+++ b/packs/gps-homebrew-features/CURRENT
@@ -1 +1 @@
-MANIFEST-002126
+MANIFEST-002170
diff --git a/packs/gps-homebrew-features/LOG b/packs/gps-homebrew-features/LOG
index b63e9488..aa00b4f8 100644
--- a/packs/gps-homebrew-features/LOG
+++ b/packs/gps-homebrew-features/LOG
@@ -1,8 +1,8 @@
-2024/05/30-00:06:21.399 6834 Recovering log #2124
-2024/05/30-00:06:21.408 6834 Delete type=0 #2124
-2024/05/30-00:06:21.409 6834 Delete type=3 #2122
-2024/05/30-11:29:13.318 5698 Level-0 table #2129: started
-2024/05/30-11:29:13.318 5698 Level-0 table #2129: 0 bytes OK
-2024/05/30-11:29:13.324 5698 Delete type=0 #2127
-2024/05/30-11:29:13.329 5698 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
-2024/05/30-11:29:13.346 5698 Manual compaction at level-1 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:32.466 6834 Recovering log #2168
+2024/06/01-00:56:32.471 6834 Delete type=0 #2168
+2024/06/01-00:56:32.471 6834 Delete type=3 #2166
+2024/06/01-15:59:09.055 5698 Level-0 table #2173: started
+2024/06/01-15:59:09.055 5698 Level-0 table #2173: 0 bytes OK
+2024/06/01-15:59:09.058 5698 Delete type=0 #2171
+2024/06/01-15:59:09.058 5698 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/06/01-15:59:09.058 5698 Manual compaction at level-1 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-features/LOG.old b/packs/gps-homebrew-features/LOG.old
index f612b6d7..4a5f5a15 100644
--- a/packs/gps-homebrew-features/LOG.old
+++ b/packs/gps-homebrew-features/LOG.old
@@ -1,8 +1,8 @@
-2024/05/30-00:00:46.323 683c Recovering log #2120
-2024/05/30-00:00:46.329 683c Delete type=0 #2120
-2024/05/30-00:00:46.329 683c Delete type=3 #2118
-2024/05/30-00:05:35.983 5698 Level-0 table #2125: started
-2024/05/30-00:05:35.983 5698 Level-0 table #2125: 0 bytes OK
-2024/05/30-00:05:35.987 5698 Delete type=0 #2123
-2024/05/30-00:05:35.992 5698 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
-2024/05/30-00:05:35.992 5698 Manual compaction at level-1 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/05/31-02:08:12.881 683c Recovering log #2164
+2024/05/31-02:08:12.886 683c Delete type=0 #2164
+2024/05/31-02:08:12.886 683c Delete type=3 #2162
+2024/06/01-00:56:15.510 5698 Level-0 table #2169: started
+2024/06/01-00:56:15.510 5698 Level-0 table #2169: 0 bytes OK
+2024/06/01-00:56:15.512 5698 Delete type=0 #2167
+2024/06/01-00:56:15.512 5698 Manual compaction at level-0 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:15.512 5698 Manual compaction at level-1 from '!folders!4OzV9QdsPgTyK99q' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-features/MANIFEST-002126 b/packs/gps-homebrew-features/MANIFEST-002170
similarity index 67%
rename from packs/gps-homebrew-features/MANIFEST-002126
rename to packs/gps-homebrew-features/MANIFEST-002170
index d0ac6542..f18178ae 100644
Binary files a/packs/gps-homebrew-features/MANIFEST-002126 and b/packs/gps-homebrew-features/MANIFEST-002170 differ
diff --git a/packs/gps-homebrew-items/002137.log b/packs/gps-homebrew-items/002181.log
similarity index 100%
rename from packs/gps-homebrew-items/002137.log
rename to packs/gps-homebrew-items/002181.log
diff --git a/packs/gps-homebrew-items/CURRENT b/packs/gps-homebrew-items/CURRENT
index 966b72be..824236f2 100644
--- a/packs/gps-homebrew-items/CURRENT
+++ b/packs/gps-homebrew-items/CURRENT
@@ -1 +1 @@
-MANIFEST-002135
+MANIFEST-002179
diff --git a/packs/gps-homebrew-items/LOG b/packs/gps-homebrew-items/LOG
index 1b1bc08c..23546eb7 100644
--- a/packs/gps-homebrew-items/LOG
+++ b/packs/gps-homebrew-items/LOG
@@ -1,8 +1,8 @@
-2024/05/30-00:06:21.412 6b00 Recovering log #2133
-2024/05/30-00:06:21.420 6b00 Delete type=0 #2133
-2024/05/30-00:06:21.420 6b00 Delete type=3 #2131
-2024/05/30-11:29:13.346 5698 Level-0 table #2138: started
-2024/05/30-11:29:13.346 5698 Level-0 table #2138: 0 bytes OK
-2024/05/30-11:29:13.351 5698 Delete type=0 #2136
-2024/05/30-11:29:13.360 5698 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
-2024/05/30-11:29:13.366 5698 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:32.478 683c Recovering log #2177
+2024/06/01-00:56:32.484 683c Delete type=0 #2177
+2024/06/01-00:56:32.484 683c Delete type=3 #2175
+2024/06/01-15:59:09.060 5698 Level-0 table #2182: started
+2024/06/01-15:59:09.060 5698 Level-0 table #2182: 0 bytes OK
+2024/06/01-15:59:09.063 5698 Delete type=0 #2180
+2024/06/01-15:59:09.070 5698 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
+2024/06/01-15:59:09.070 5698 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-items/LOG.old b/packs/gps-homebrew-items/LOG.old
index a6557f44..efe40f05 100644
--- a/packs/gps-homebrew-items/LOG.old
+++ b/packs/gps-homebrew-items/LOG.old
@@ -1,8 +1,8 @@
-2024/05/30-00:00:46.332 6b00 Recovering log #2129
-2024/05/30-00:00:46.338 6b00 Delete type=0 #2129
-2024/05/30-00:00:46.338 6b00 Delete type=3 #2127
-2024/05/30-00:05:35.978 5698 Level-0 table #2134: started
-2024/05/30-00:05:35.978 5698 Level-0 table #2134: 0 bytes OK
-2024/05/30-00:05:35.983 5698 Delete type=0 #2132
-2024/05/30-00:05:35.992 5698 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
-2024/05/30-00:05:35.992 5698 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
+2024/05/31-02:08:12.889 6b00 Recovering log #2173
+2024/05/31-02:08:12.894 6b00 Delete type=0 #2173
+2024/05/31-02:08:12.894 6b00 Delete type=3 #2171
+2024/06/01-00:56:15.500 5698 Level-0 table #2178: started
+2024/06/01-00:56:15.500 5698 Level-0 table #2178: 0 bytes OK
+2024/06/01-00:56:15.504 5698 Delete type=0 #2176
+2024/06/01-00:56:15.512 5698 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:15.512 5698 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zEXJxqsAmVM7Pohu.eA3jhjz26f35OLfw' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-items/MANIFEST-002135 b/packs/gps-homebrew-items/MANIFEST-002179
similarity index 81%
rename from packs/gps-homebrew-items/MANIFEST-002135
rename to packs/gps-homebrew-items/MANIFEST-002179
index 200a7ec4..b68f0cec 100644
Binary files a/packs/gps-homebrew-items/MANIFEST-002135 and b/packs/gps-homebrew-items/MANIFEST-002179 differ
diff --git a/packs/gps-homebrew-spells/001805.log b/packs/gps-homebrew-spells/001849.log
similarity index 100%
rename from packs/gps-homebrew-spells/001805.log
rename to packs/gps-homebrew-spells/001849.log
diff --git a/packs/gps-homebrew-spells/CURRENT b/packs/gps-homebrew-spells/CURRENT
index 370665aa..39043300 100644
--- a/packs/gps-homebrew-spells/CURRENT
+++ b/packs/gps-homebrew-spells/CURRENT
@@ -1 +1 @@
-MANIFEST-001803
+MANIFEST-001847
diff --git a/packs/gps-homebrew-spells/LOG b/packs/gps-homebrew-spells/LOG
index 284ff621..e8ddb902 100644
--- a/packs/gps-homebrew-spells/LOG
+++ b/packs/gps-homebrew-spells/LOG
@@ -1,8 +1,8 @@
-2024/05/30-00:06:21.423 6834 Recovering log #1801
-2024/05/30-00:06:21.431 6834 Delete type=0 #1801
-2024/05/30-00:06:21.432 6834 Delete type=3 #1799
-2024/05/30-11:29:13.369 5698 Level-0 table #1806: started
-2024/05/30-11:29:13.369 5698 Level-0 table #1806: 0 bytes OK
-2024/05/30-11:29:13.377 5698 Delete type=0 #1804
-2024/05/30-11:29:13.395 5698 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
-2024/05/30-11:29:13.395 5698 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:32.490 6834 Recovering log #1845
+2024/06/01-00:56:32.495 6834 Delete type=0 #1845
+2024/06/01-00:56:32.495 6834 Delete type=3 #1843
+2024/06/01-15:59:09.063 5698 Level-0 table #1850: started
+2024/06/01-15:59:09.063 5698 Level-0 table #1850: 0 bytes OK
+2024/06/01-15:59:09.065 5698 Delete type=0 #1848
+2024/06/01-15:59:09.070 5698 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
+2024/06/01-15:59:09.070 5698 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-spells/LOG.old b/packs/gps-homebrew-spells/LOG.old
index a14d7632..f0071fb2 100644
--- a/packs/gps-homebrew-spells/LOG.old
+++ b/packs/gps-homebrew-spells/LOG.old
@@ -1,8 +1,8 @@
-2024/05/30-00:00:46.340 683c Recovering log #1797
-2024/05/30-00:00:46.346 683c Delete type=0 #1797
-2024/05/30-00:00:46.346 683c Delete type=3 #1795
-2024/05/30-00:05:35.987 5698 Level-0 table #1802: started
-2024/05/30-00:05:35.987 5698 Level-0 table #1802: 0 bytes OK
-2024/05/30-00:05:35.992 5698 Delete type=0 #1800
-2024/05/30-00:05:35.992 5698 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
-2024/05/30-00:05:35.992 5698 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
+2024/05/31-02:08:12.897 683c Recovering log #1841
+2024/05/31-02:08:12.903 683c Delete type=0 #1841
+2024/05/31-02:08:12.903 683c Delete type=3 #1839
+2024/06/01-00:56:15.504 5698 Level-0 table #1846: started
+2024/06/01-00:56:15.504 5698 Level-0 table #1846: 0 bytes OK
+2024/06/01-00:56:15.506 5698 Delete type=0 #1844
+2024/06/01-00:56:15.512 5698 Manual compaction at level-0 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:15.512 5698 Manual compaction at level-1 from '!items!iVqgFn89rGOnPTK4' @ 72057594037927935 : 1 .. '!items.effects!iVqgFn89rGOnPTK4.fAK9x7lIORqSnaz1' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-spells/MANIFEST-001803 b/packs/gps-homebrew-spells/MANIFEST-001847
similarity index 56%
rename from packs/gps-homebrew-spells/MANIFEST-001803
rename to packs/gps-homebrew-spells/MANIFEST-001847
index fe0f71c0..a985c1d1 100644
Binary files a/packs/gps-homebrew-spells/MANIFEST-001803 and b/packs/gps-homebrew-spells/MANIFEST-001847 differ
diff --git a/packs/gps-items/002130.log b/packs/gps-items/002174.log
similarity index 100%
rename from packs/gps-items/002130.log
rename to packs/gps-items/002174.log
diff --git a/packs/gps-items/002019.ldb b/packs/gps-items/002176.ldb
similarity index 68%
rename from packs/gps-items/002019.ldb
rename to packs/gps-items/002176.ldb
index 25eb1faf..bfcce802 100644
Binary files a/packs/gps-items/002019.ldb and b/packs/gps-items/002176.ldb differ
diff --git a/packs/gps-items/CURRENT b/packs/gps-items/CURRENT
index 9f34405b..c56ab5c9 100644
--- a/packs/gps-items/CURRENT
+++ b/packs/gps-items/CURRENT
@@ -1 +1 @@
-MANIFEST-002128
+MANIFEST-002172
diff --git a/packs/gps-items/LOG b/packs/gps-items/LOG
index b8fc29a5..723f793c 100644
--- a/packs/gps-items/LOG
+++ b/packs/gps-items/LOG
@@ -1,8 +1,15 @@
-2024/05/30-00:06:21.361 6b00 Recovering log #2126
-2024/05/30-00:06:21.371 6b00 Delete type=0 #2126
-2024/05/30-00:06:21.371 6b00 Delete type=3 #2124
-2024/05/30-11:29:13.288 5698 Level-0 table #2131: started
-2024/05/30-11:29:13.289 5698 Level-0 table #2131: 0 bytes OK
-2024/05/30-11:29:13.294 5698 Delete type=0 #2129
-2024/05/30-11:29:13.329 5698 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end)
-2024/05/30-11:29:13.329 5698 Manual compaction at level-1 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:32.432 683c Recovering log #2170
+2024/06/01-00:56:32.437 683c Delete type=0 #2170
+2024/06/01-00:56:32.437 683c Delete type=3 #2168
+2024/06/01-15:59:08.997 5698 Level-0 table #2175: started
+2024/06/01-15:59:09.005 5698 Level-0 table #2175: 57184 bytes OK
+2024/06/01-15:59:09.009 5698 Delete type=0 #2173
+2024/06/01-15:59:09.010 5698 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end)
+2024/06/01-15:59:09.031 5698 Manual compaction at level-1 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at '!items.effects!9qeaOpsa4QQXFTl6.Tj3xZ0r7rdGHSNoV' @ 144 : 1
+2024/06/01-15:59:09.031 5698 Compacting 1@1 + 1@2 files
+2024/06/01-15:59:09.035 5698 Generated table #2176@1: 27 keys, 63171 bytes
+2024/06/01-15:59:09.035 5698 Compacted 1@1 + 1@2 files => 63171 bytes
+2024/06/01-15:59:09.037 5698 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/06/01-15:59:09.038 5698 Delete type=2 #2019
+2024/06/01-15:59:09.038 5698 Delete type=2 #2175
+2024/06/01-15:59:09.046 5698 Manual compaction at level-1 from '!items.effects!9qeaOpsa4QQXFTl6.Tj3xZ0r7rdGHSNoV' @ 144 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-items/LOG.old b/packs/gps-items/LOG.old
index 4b6ab76c..b8634501 100644
--- a/packs/gps-items/LOG.old
+++ b/packs/gps-items/LOG.old
@@ -1,8 +1,8 @@
-2024/05/30-00:00:46.301 6b00 Recovering log #2122
-2024/05/30-00:00:46.306 6b00 Delete type=0 #2122
-2024/05/30-00:00:46.306 6b00 Delete type=3 #2120
-2024/05/30-00:05:35.942 5698 Level-0 table #2127: started
-2024/05/30-00:05:35.942 5698 Level-0 table #2127: 0 bytes OK
-2024/05/30-00:05:35.947 5698 Delete type=0 #2125
-2024/05/30-00:05:35.966 5698 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end)
-2024/05/30-00:05:35.967 5698 Manual compaction at level-1 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end)
+2024/05/31-02:08:12.856 6b00 Recovering log #2166
+2024/05/31-02:08:12.862 6b00 Delete type=0 #2166
+2024/05/31-02:08:12.862 6b00 Delete type=3 #2164
+2024/06/01-00:56:15.492 5698 Level-0 table #2171: started
+2024/06/01-00:56:15.492 5698 Level-0 table #2171: 0 bytes OK
+2024/06/01-00:56:15.495 5698 Delete type=0 #2169
+2024/06/01-00:56:15.499 5698 Manual compaction at level-0 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:15.499 5698 Manual compaction at level-1 from '!items!0qTQDQ2Cipf15JGW' @ 72057594037927935 : 1 .. '!items.effects!wds22ulA8PSTvYWP.ZrTNMwai89gqFKJo' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-items/MANIFEST-002128 b/packs/gps-items/MANIFEST-002128
deleted file mode 100644
index f59404a5..00000000
Binary files a/packs/gps-items/MANIFEST-002128 and /dev/null differ
diff --git a/packs/gps-items/MANIFEST-002172 b/packs/gps-items/MANIFEST-002172
new file mode 100644
index 00000000..fa02a7b6
Binary files /dev/null and b/packs/gps-items/MANIFEST-002172 differ
diff --git a/packs/gps-monster-features/002128.log b/packs/gps-monster-features/002172.log
similarity index 100%
rename from packs/gps-monster-features/002128.log
rename to packs/gps-monster-features/002172.log
diff --git a/packs/gps-monster-features/CURRENT b/packs/gps-monster-features/CURRENT
index e2d3744f..25a22c79 100644
--- a/packs/gps-monster-features/CURRENT
+++ b/packs/gps-monster-features/CURRENT
@@ -1 +1 @@
-MANIFEST-002126
+MANIFEST-002170
diff --git a/packs/gps-monster-features/LOG b/packs/gps-monster-features/LOG
index 01021b27..9d9a90dc 100644
--- a/packs/gps-monster-features/LOG
+++ b/packs/gps-monster-features/LOG
@@ -1,8 +1,8 @@
-2024/05/30-00:06:21.373 6834 Recovering log #2124
-2024/05/30-00:06:21.383 6834 Delete type=0 #2124
-2024/05/30-00:06:21.383 6834 Delete type=3 #2122
-2024/05/30-11:29:13.324 5698 Level-0 table #2129: started
-2024/05/30-11:29:13.324 5698 Level-0 table #2129: 0 bytes OK
-2024/05/30-11:29:13.329 5698 Delete type=0 #2127
-2024/05/30-11:29:13.329 5698 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
-2024/05/30-11:29:13.346 5698 Manual compaction at level-1 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:32.446 6834 Recovering log #2168
+2024/06/01-00:56:32.452 6834 Delete type=0 #2168
+2024/06/01-00:56:32.452 6834 Delete type=3 #2166
+2024/06/01-15:59:09.044 5698 Level-0 table #2173: started
+2024/06/01-15:59:09.044 5698 Level-0 table #2173: 0 bytes OK
+2024/06/01-15:59:09.046 5698 Delete type=0 #2171
+2024/06/01-15:59:09.050 5698 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
+2024/06/01-15:59:09.058 5698 Manual compaction at level-1 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-monster-features/LOG.old b/packs/gps-monster-features/LOG.old
index 4f40ffca..52e409cb 100644
--- a/packs/gps-monster-features/LOG.old
+++ b/packs/gps-monster-features/LOG.old
@@ -1,8 +1,8 @@
-2024/05/30-00:00:46.309 683c Recovering log #2120
-2024/05/30-00:00:46.314 683c Delete type=0 #2120
-2024/05/30-00:00:46.314 683c Delete type=3 #2118
-2024/05/30-00:05:35.947 5698 Level-0 table #2125: started
-2024/05/30-00:05:35.948 5698 Level-0 table #2125: 0 bytes OK
-2024/05/30-00:05:35.953 5698 Delete type=0 #2123
-2024/05/30-00:05:35.966 5698 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
-2024/05/30-00:05:35.967 5698 Manual compaction at level-1 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
+2024/05/31-02:08:12.864 683c Recovering log #2164
+2024/05/31-02:08:12.870 683c Delete type=0 #2164
+2024/05/31-02:08:12.870 683c Delete type=3 #2162
+2024/06/01-00:56:15.489 5698 Level-0 table #2169: started
+2024/06/01-00:56:15.489 5698 Level-0 table #2169: 0 bytes OK
+2024/06/01-00:56:15.492 5698 Delete type=0 #2167
+2024/06/01-00:56:15.499 5698 Manual compaction at level-0 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:15.499 5698 Manual compaction at level-1 from '!folders!44lJ4L7xySVYZzED' @ 72057594037927935 : 1 .. '!items.effects!yp0IIuvsEkJd6KKW.WlySPDKKWMIOowHi' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-monster-features/MANIFEST-002126 b/packs/gps-monster-features/MANIFEST-002170
similarity index 67%
rename from packs/gps-monster-features/MANIFEST-002126
rename to packs/gps-monster-features/MANIFEST-002170
index 10dca3e8..20654f66 100644
Binary files a/packs/gps-monster-features/MANIFEST-002126 and b/packs/gps-monster-features/MANIFEST-002170 differ
diff --git a/packs/gps-spells/002176.log b/packs/gps-spells/002220.log
similarity index 100%
rename from packs/gps-spells/002176.log
rename to packs/gps-spells/002220.log
diff --git a/packs/gps-spells/002161.ldb b/packs/gps-spells/002222.ldb
similarity index 89%
rename from packs/gps-spells/002161.ldb
rename to packs/gps-spells/002222.ldb
index e226f23c..44725256 100644
Binary files a/packs/gps-spells/002161.ldb and b/packs/gps-spells/002222.ldb differ
diff --git a/packs/gps-spells/CURRENT b/packs/gps-spells/CURRENT
index 24977640..2ac11408 100644
--- a/packs/gps-spells/CURRENT
+++ b/packs/gps-spells/CURRENT
@@ -1 +1 @@
-MANIFEST-002174
+MANIFEST-002218
diff --git a/packs/gps-spells/LOG b/packs/gps-spells/LOG
index 7e17ac52..ef00b7ad 100644
--- a/packs/gps-spells/LOG
+++ b/packs/gps-spells/LOG
@@ -1,8 +1,15 @@
-2024/05/30-00:06:21.339 6b00 Recovering log #2172
-2024/05/30-00:06:21.346 6b00 Delete type=0 #2172
-2024/05/30-00:06:21.346 6b00 Delete type=3 #2170
-2024/05/30-11:29:13.281 5698 Level-0 table #2177: started
-2024/05/30-11:29:13.281 5698 Level-0 table #2177: 0 bytes OK
-2024/05/30-11:29:13.285 5698 Delete type=0 #2175
-2024/05/30-11:29:13.285 5698 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
-2024/05/30-11:29:13.285 5698 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:32.407 683c Recovering log #2216
+2024/06/01-00:56:32.412 683c Delete type=0 #2216
+2024/06/01-00:56:32.412 683c Delete type=3 #2214
+2024/06/01-15:59:08.966 5698 Level-0 table #2221: started
+2024/06/01-15:59:08.985 5698 Level-0 table #2221: 77104 bytes OK
+2024/06/01-15:59:08.988 5698 Delete type=0 #2219
+2024/06/01-15:59:09.010 5698 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/06/01-15:59:09.010 5698 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at '!items!vxrggTopkxhq3MAn' @ 831 : 1
+2024/06/01-15:59:09.010 5698 Compacting 1@1 + 1@2 files
+2024/06/01-15:59:09.027 5698 Generated table #2222@1: 47 keys, 159466 bytes
+2024/06/01-15:59:09.028 5698 Compacted 1@1 + 1@2 files => 159466 bytes
+2024/06/01-15:59:09.031 5698 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/06/01-15:59:09.031 5698 Delete type=2 #2161
+2024/06/01-15:59:09.031 5698 Delete type=2 #2221
+2024/06/01-15:59:09.044 5698 Manual compaction at level-1 from '!items!vxrggTopkxhq3MAn' @ 831 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-spells/LOG.old b/packs/gps-spells/LOG.old
index e04dcbb0..82d1afb3 100644
--- a/packs/gps-spells/LOG.old
+++ b/packs/gps-spells/LOG.old
@@ -1,8 +1,8 @@
-2024/05/30-00:00:46.285 6b00 Recovering log #2168
-2024/05/30-00:00:46.290 6b00 Delete type=0 #2168
-2024/05/30-00:00:46.290 6b00 Delete type=3 #2166
-2024/05/30-00:05:35.915 5698 Level-0 table #2173: started
-2024/05/30-00:05:35.915 5698 Level-0 table #2173: 0 bytes OK
-2024/05/30-00:05:35.921 5698 Delete type=0 #2171
-2024/05/30-00:05:35.929 5698 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
-2024/05/30-00:05:35.929 5698 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/05/31-02:08:12.841 6b00 Recovering log #2212
+2024/05/31-02:08:12.847 6b00 Delete type=0 #2212
+2024/05/31-02:08:12.847 6b00 Delete type=3 #2210
+2024/06/01-00:56:15.481 5698 Level-0 table #2217: started
+2024/06/01-00:56:15.481 5698 Level-0 table #2217: 0 bytes OK
+2024/06/01-00:56:15.483 5698 Delete type=0 #2215
+2024/06/01-00:56:15.483 5698 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/06/01-00:56:15.483 5698 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-spells/MANIFEST-002174 b/packs/gps-spells/MANIFEST-002174
deleted file mode 100644
index 072a71a6..00000000
Binary files a/packs/gps-spells/MANIFEST-002174 and /dev/null differ
diff --git a/packs/gps-spells/MANIFEST-002218 b/packs/gps-spells/MANIFEST-002218
new file mode 100644
index 00000000..492631e9
Binary files /dev/null and b/packs/gps-spells/MANIFEST-002218 differ
diff --git a/scripts/macros/opportunityAttack.js b/scripts/macros/opportunityAttack.js
index bd3c3089..8f6d49dd 100644
--- a/scripts/macros/opportunityAttack.js
+++ b/scripts/macros/opportunityAttack.js
@@ -104,6 +104,9 @@ export async function enableOpportunityAttack(combat, combatEvent) {
                     'hideHighlighting': 'alwaysHide',
                     'showOnHover': 'alwaysHide'
                 },
+                "gambits-premades": {
+                    "templateHiddenOA": true
+                },
                 "templatemacro": {
                     "never": {
                       "asGM": false,
@@ -139,7 +142,7 @@ export async function enableOpportunityAttack(combat, combatEvent) {
                 const firstTemplate = createdTemplates[0];
           
                 try {
-                tokenAttacher.attachElementsToToken([firstTemplate], token.object, true);
+                tokenAttacher.attachElementToToken(firstTemplate.object, token.object, true);
                 //Handle rippers tooltip overlay
                 if(firstTemplate.object && firstTemplate.object.tooltip) firstTemplate.object.tooltip.visible = false;
                 actor.setFlag("midi-qol", "opportunityAttackTemplate", firstTemplate.uuid);
@@ -169,6 +172,8 @@ export async function disableOpportunityAttack(combat, combatEvent) {
 
     async function processCombatant(combatant) {
         const { actor } = combatant;
+        const { token } = combatant;
+
         let templateFlag = await actor.getFlag("midi-qol", "opportunityAttackTemplate");
         let checkBraceFlag = await actor.getFlag("midi-qol", "checkBraceDecision");
         let templateData = templateFlag ? await fromUuid(templateFlag) : null;
@@ -182,7 +187,11 @@ export async function disableOpportunityAttack(combat, combatEvent) {
             await actor.deleteEmbeddedDocuments("ActiveEffect", effectIdsToDelete);
         }
 
-        if (templateData) await templateData.delete();
+        if (templateData) {
+            await tokenAttacher.detachElementFromToken(templateData.object, token.object, true);
+            if(token.flags["token-attacher"]?.attached?.MeasuredTemplate?.length === 0) await token.unsetFlag("token-attacher", "attached.MeasuredTemplate");
+            await templateData.delete();
+        }
         if (templateFlag) await actor.unsetFlag("midi-qol", "opportunityAttackTemplate");
         if (checkBraceFlag) await actor.unsetFlag("midi-qol", "checkBraceDecision");
     }
diff --git a/scripts/module.js b/scripts/module.js
index 3a4a5fb5..627a07f1 100644
--- a/scripts/module.js
+++ b/scripts/module.js
@@ -70,6 +70,9 @@ Hooks.once('ready', async function() {
         socket
     };
 
+    setupTemplateVisibilityHook();
+    setupTemplateCreationUpdateHooks();
+
     async function executeWorkflow({ workflowItem, workflowData, workflowType, workflowCombat }) {
         if (game.user.isGM) {
             await socket.executeAsGM( workflowItem, { workflowData: workflowData, workflowType: workflowType, workflowCombat: workflowCombat });
@@ -92,13 +95,13 @@ Hooks.once('ready', async function() {
 
     Hooks.on("midi-qol.preAttackRoll", async (workflow) => {
         let workflowItemUuid = workflow.itemUuid;
-        if (game.gpsSettings.protectionEnabled && !enableProtectionOnSuccess) await executeWorkflow({ workflowItem: "protection", workflowData: workflowItemUuid, workflowType: "attack", workflowCombat: true });
+        if (game.gpsSettings.protectionEnabled && !game.gpsSettings.enableProtectionOnSuccess) await executeWorkflow({ workflowItem: "protection", workflowData: workflowItemUuid, workflowType: "attack", workflowCombat: true });
     });
 
     Hooks.on("midi-qol.preAttackRollComplete", async (workflow) => {
         let workflowItemUuid = workflow.itemUuid;
         if (game.gpsSettings.sentinelEnabled) await executeWorkflow({ workflowItem: "sentinel", workflowData: workflowItemUuid, workflowType: "attack", workflowCombat: true });
-        if (game.gpsSettings.protectionEnabled && enableProtectionOnSuccess) await executeWorkflow({ workflowItem: "protection", workflowData: workflowItemUuid, workflowType: "attack", workflowCombat: true });
+        if (game.gpsSettings.protectionEnabled && game.gpsSettings.enableProtectionOnSuccess) await executeWorkflow({ workflowItem: "protection", workflowData: workflowItemUuid, workflowType: "attack", workflowCombat: true });
     });
 
     Hooks.on("midi-qol.postAttackRollComplete", async (workflow) => {
@@ -220,6 +223,9 @@ async function updateSettings(settingKey = null) {
     if (settingKey === null || settingKey === 'gambits-premades.Enable Identify Restrictions') {
         game.gpsSettings.identifyRestrictionEnabled = game.settings.get('gambits-premades', 'Enable Identify Restrictions');
     }
+    if (settingKey === null || settingKey === 'gambits-premades.hideTemplates') {
+        game.gpsSettings.hideTemplates = game.settings.get('gambits-premades', 'hideTemplates');
+    }
 }
 
 Hooks.on('updateSetting', (setting) => {
@@ -228,37 +234,60 @@ Hooks.on('updateSetting', (setting) => {
     }
 });
 
-/* Store initial positions
-let initialPositions = new Map();
+function hideTemplateElements(template) {
+  if (!template) return;
 
-Hooks.on('canvasReady', (canvas) => {
-    console.log('Canvas is ready. Setting up token movement tracking.');
+  // Check if we're on the template layer, in which case I still want template visibility
+  if(canvas?.activeLayer?.constructor?.name === "TemplateLayer") return;
 
-    canvas.tokens.placeables.forEach(token => {
-        initialPositions.set(token.id, {x: token.x, y: token.y});
-    });
+  // Hide primary template
+  if (template.template) {
+    template.template.alpha = 0;
+  }
 
-    canvas.stage.on('pointerdown', (event) => {
-        let interactionData = canvas.mouseInteractionManager.interactionData;
-        if (interactionData.origin) {
-            let token = interactionData.origin;
-            initialPositions.set(token.id, {x: token.x, y: token.y});
-            console.log(`Token ${token.name} is moving from (${token.x}, ${token.y}).`);
-        }
-    });
-});
+  // Hide highlight
+  const hl = canvas.grid.getHighlightLayer(template.highlightId);
+  if (hl) {
+    hl.alpha = 0;
+  }
 
-Hooks.on('preUpdateToken', (token, updateData, options, userId) => {
-    //if (updateData.x !== undefined || updateData.y !== undefined) {
-        let startX = initialPositions.get(token.id).x;
-        let startY = initialPositions.get(token.id).y;
-        let endX = updateData.x !== undefined ? updateData.x : token.x;
-        let endY = updateData.y !== undefined ? updateData.y : token.y;
+  // Hide border
+  if (template.ruler) {
+    template.ruler.visible = false;
+  }
 
-        console.log(`Token ${token.name} is moving from (${startX}, ${startY}) to (${endX}, ${endY}).`);
-    //}
-});
+  //Reduce unneeded (I think?) refresh activity
+  template.hitArea = null;
+}
 
-Hooks.on('updateToken', (token, updateData, options, userId) => {
-    initialPositions.set(token.id, {x: token.x, y: token.y});
-});*/
\ No newline at end of file
+// Make sure we re-apply invisibility, may need more stuff here?
+function setupTemplateVisibilityHook() {
+  Hooks.on('refreshMeasuredTemplate', (template) => {
+    if ((template.document.getFlag('gambits-premades', 'templateHidden') && game.gpsSettings.hideTemplates) || template.document.getFlag('gambits-premades', 'templateHiddenOA')) {
+      hideTemplateElements(template);
+    }
+  });
+
+  canvas.templates.placeables.forEach(template => {
+    if ((template.document.getFlag('gambits-premades', 'templateHidden') && game.gpsSettings.hideTemplates) || template.document.getFlag('gambits-premades', 'templateHiddenOA')) {
+      hideTemplateElements(template);
+    }
+  });
+}
+
+// Hide templates on creation or update, we may need more stuff here?
+function setupTemplateCreationUpdateHooks() {
+  Hooks.on('createMeasuredTemplate', (templateDocument) => {
+    const template = canvas.templates.get(templateDocument.id);
+    if (template && (templateDocument.getFlag('gambits-premades', 'templateHidden') && game.gpsSettings.hideTemplates) || templateDocument.getFlag('gambits-premades', 'templateHiddenOA')) {
+      hideTemplateElements(template);
+    }
+  });
+
+  Hooks.on('updateMeasuredTemplate', (templateDocument) => {
+    const template = canvas.templates.get(templateDocument.id);
+    if (template && (templateDocument.getFlag('gambits-premades', 'templateHidden') && game.gpsSettings.hideTemplates) || templateDocument.getFlag('gambits-premades', 'templateHiddenOA')) {
+      hideTemplateElements(template);
+    }
+  });
+}
\ No newline at end of file
diff --git a/scripts/settings.js b/scripts/settings.js
index 156ef721..475fdf7e 100644
--- a/scripts/settings.js
+++ b/scripts/settings.js
@@ -303,6 +303,15 @@ function registerSettings() {
         default: "Nice try, DENIED ;)"
     });
 
+    game.settings.register('gambits-premades', 'hideTemplates', {
+        name: "Hide Templates",
+        hint: "This option is always enabled for Opportunity Attacks. If this setting is enabled, it will fully hide templates for other automations that use templates in my module. It will NOT hide templates for automations or templates created outside of my module.",
+        scope: 'world',
+        config: true,
+        type: Boolean,
+        default: false
+    });
+
     game.settings.register('gambits-premades', 'debugEnabled', {
         name: "Enable Debug",
         hint: "If enabled, this will output console logs for the reaction validation process for troubleshooting.",