diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e16dec17..b35ca65d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,7 +17,7 @@ jobs:
         id: set-release-notes-github
         run: |
           echo "- Bugfixes:" >> release_notes.txt
-          echo "  - Opportunity Attack: Fixed an issue with workflow always returning a hitTarget for Riposte, various other Riposte bugfixes. Fixed an issue with favorited weapons causing an attack not to occur." >> release_notes.txt
+          echo "  - Opportunity Attack: Cleaned up OA item and template removal process. This has now been moved into the module to resolve issues with player specific permissions." >> release_notes.txt
           echo "release-notes-github<<EOF" >> $GITHUB_ENV
           cat release_notes.txt >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
diff --git a/module.json b/module.json
index 981b7e3a..f9bb975b 100644
--- a/module.json
+++ b/module.json
@@ -7,7 +7,7 @@
 		"name": "Gambit"
 		}
 	],
-  "version": "0.0.78",
+  "version": "0.0.79",
 	"compatibility": {
 	"minimum": "11",
 	"verified": "11",
diff --git a/packs/gps-actors/000008.log b/packs/gps-actors/000018.log
similarity index 100%
rename from packs/gps-actors/000008.log
rename to packs/gps-actors/000018.log
diff --git a/packs/gps-actors/CURRENT b/packs/gps-actors/CURRENT
index f7753e22..32108be6 100644
--- a/packs/gps-actors/CURRENT
+++ b/packs/gps-actors/CURRENT
@@ -1 +1 @@
-MANIFEST-000006
+MANIFEST-000016
diff --git a/packs/gps-actors/LOG b/packs/gps-actors/LOG
index 1cf0787e..817d193d 100644
--- a/packs/gps-actors/LOG
+++ b/packs/gps-actors/LOG
@@ -1,8 +1,8 @@
-2024/02/27-16:07:31.327 6e10 Recovering log #4
-2024/02/27-16:07:31.336 6e10 Delete type=0 #4
-2024/02/27-16:07:31.336 6e10 Delete type=3 #2
-2024/02/27-18:30:38.034 e18 Level-0 table #9: started
-2024/02/27-18:30:38.034 e18 Level-0 table #9: 0 bytes OK
-2024/02/27-18:30:38.037 e18 Delete type=0 #7
-2024/02/27-18:30:38.037 e18 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
-2024/02/27-18:30:38.037 e18 Manual compaction at level-1 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
+2024/02/28-11:56:09.450 2e04 Recovering log #14
+2024/02/28-11:56:09.457 2e04 Delete type=0 #14
+2024/02/28-11:56:09.458 2e04 Delete type=3 #12
+2024/02/28-12:02:17.359 920 Level-0 table #19: started
+2024/02/28-12:02:17.359 920 Level-0 table #19: 0 bytes OK
+2024/02/28-12:02:17.364 920 Delete type=0 #17
+2024/02/28-12:02:17.365 920 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
+2024/02/28-12:02:17.366 920 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 61606547..7a432d32 100644
--- a/packs/gps-actors/LOG.old
+++ b/packs/gps-actors/LOG.old
@@ -1,5 +1,8 @@
-2024/02/27-15:49:33.395 6e68 Delete type=3 #1
-2024/02/27-15:55:12.484 e18 Level-0 table #5: started
-2024/02/27-15:55:12.487 e18 Level-0 table #5: 11268 bytes OK
-2024/02/27-15:55:12.488 e18 Delete type=0 #3
-2024/02/27-15:55:12.497 e18 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
+2024/02/27-19:00:04.152 6fc8 Recovering log #11
+2024/02/27-19:00:04.158 6fc8 Delete type=0 #11
+2024/02/27-19:00:04.158 6fc8 Delete type=3 #10
+2024/02/28-11:55:15.116 920 Level-0 table #15: started
+2024/02/28-11:55:15.116 920 Level-0 table #15: 0 bytes OK
+2024/02/28-11:55:15.119 920 Delete type=0 #13
+2024/02/28-11:55:15.126 920 Manual compaction at level-0 from '!actors!2Q055cZ4Q4eMWCQT' @ 72057594037927935 : 1 .. '!actors.items.effects!2Q055cZ4Q4eMWCQT.icorevoMIkBVXL37.jFKhp34XZd32ryYT' @ 0 : 0; will stop at (end)
+2024/02/28-11:55:15.126 920 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-000006 b/packs/gps-actors/MANIFEST-000016
similarity index 69%
rename from packs/gps-actors/MANIFEST-000006
rename to packs/gps-actors/MANIFEST-000016
index 7343e7b7..523b3199 100644
Binary files a/packs/gps-actors/MANIFEST-000006 and b/packs/gps-actors/MANIFEST-000016 differ
diff --git a/packs/gps-class-features/001161.log b/packs/gps-class-features/001171.log
similarity index 100%
rename from packs/gps-class-features/001161.log
rename to packs/gps-class-features/001171.log
diff --git a/packs/gps-class-features/CURRENT b/packs/gps-class-features/CURRENT
index da900dc0..acaa538a 100644
--- a/packs/gps-class-features/CURRENT
+++ b/packs/gps-class-features/CURRENT
@@ -1 +1 @@
-MANIFEST-001159
+MANIFEST-001169
diff --git a/packs/gps-class-features/LOG b/packs/gps-class-features/LOG
index afe817a3..178e42e6 100644
--- a/packs/gps-class-features/LOG
+++ b/packs/gps-class-features/LOG
@@ -1,8 +1,8 @@
-2024/02/27-16:07:31.212 6e10 Recovering log #1157
-2024/02/27-16:07:31.222 6e10 Delete type=0 #1157
-2024/02/27-16:07:31.222 6e10 Delete type=3 #1155
-2024/02/27-18:30:37.967 e18 Level-0 table #1162: started
-2024/02/27-18:30:37.967 e18 Level-0 table #1162: 0 bytes OK
-2024/02/27-18:30:37.970 e18 Delete type=0 #1160
-2024/02/27-18:30:37.976 e18 Manual compaction at level-0 from '!folders!Bx9M27esbZ3oMhQa' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
-2024/02/27-18:30:37.977 e18 Manual compaction at level-1 from '!folders!Bx9M27esbZ3oMhQa' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/02/28-11:56:09.111 2e04 Recovering log #1167
+2024/02/28-11:56:09.119 2e04 Delete type=0 #1167
+2024/02/28-11:56:09.119 2e04 Delete type=3 #1165
+2024/02/28-12:02:17.294 920 Level-0 table #1172: started
+2024/02/28-12:02:17.295 920 Level-0 table #1172: 0 bytes OK
+2024/02/28-12:02:17.299 920 Delete type=0 #1170
+2024/02/28-12:02:17.300 920 Manual compaction at level-0 from '!folders!Bx9M27esbZ3oMhQa' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/02/28-12:02:17.301 920 Manual compaction at level-1 from '!folders!Bx9M27esbZ3oMhQa' @ 72057594037927935 : 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 369468eb..e7ae2828 100644
--- a/packs/gps-class-features/LOG.old
+++ b/packs/gps-class-features/LOG.old
@@ -1,8 +1,8 @@
-2024/02/26-16:41:29.427 6db8 Recovering log #1153
-2024/02/26-16:41:29.434 6db8 Delete type=0 #1153
-2024/02/26-16:41:29.434 6db8 Delete type=3 #1151
-2024/02/27-15:55:11.836 e18 Level-0 table #1158: started
-2024/02/27-15:55:11.836 e18 Level-0 table #1158: 0 bytes OK
-2024/02/27-15:55:11.838 e18 Delete type=0 #1156
-2024/02/27-15:55:11.843 e18 Manual compaction at level-0 from '!folders!Bx9M27esbZ3oMhQa' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
-2024/02/27-15:55:11.843 e18 Manual compaction at level-1 from '!folders!Bx9M27esbZ3oMhQa' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/02/27-19:00:03.988 6fc8 Recovering log #1164
+2024/02/27-19:00:03.993 6fc8 Delete type=0 #1164
+2024/02/27-19:00:03.993 6fc8 Delete type=3 #1163
+2024/02/28-11:55:15.061 920 Level-0 table #1168: started
+2024/02/28-11:55:15.061 920 Level-0 table #1168: 0 bytes OK
+2024/02/28-11:55:15.064 920 Delete type=0 #1166
+2024/02/28-11:55:15.064 920 Manual compaction at level-0 from '!folders!Bx9M27esbZ3oMhQa' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/02/28-11:55:15.091 920 Manual compaction at level-1 from '!folders!Bx9M27esbZ3oMhQa' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-class-features/MANIFEST-001159 b/packs/gps-class-features/MANIFEST-001169
similarity index 63%
rename from packs/gps-class-features/MANIFEST-001159
rename to packs/gps-class-features/MANIFEST-001169
index a99dc1c6..34dd4a67 100644
Binary files a/packs/gps-class-features/MANIFEST-001159 and b/packs/gps-class-features/MANIFEST-001169 differ
diff --git a/packs/gps-generic-features/001202.ldb b/packs/gps-generic-features/001209.ldb
similarity index 88%
rename from packs/gps-generic-features/001202.ldb
rename to packs/gps-generic-features/001209.ldb
index 64733257..b6885cbb 100644
Binary files a/packs/gps-generic-features/001202.ldb and b/packs/gps-generic-features/001209.ldb differ
diff --git a/packs/gps-generic-features/001200.log b/packs/gps-generic-features/001212.log
similarity index 100%
rename from packs/gps-generic-features/001200.log
rename to packs/gps-generic-features/001212.log
diff --git a/packs/gps-generic-features/CURRENT b/packs/gps-generic-features/CURRENT
index c82c9c49..12be24b4 100644
--- a/packs/gps-generic-features/CURRENT
+++ b/packs/gps-generic-features/CURRENT
@@ -1 +1 @@
-MANIFEST-001198
+MANIFEST-001210
diff --git a/packs/gps-generic-features/LOG b/packs/gps-generic-features/LOG
index 67e3d04a..ff8c618f 100644
--- a/packs/gps-generic-features/LOG
+++ b/packs/gps-generic-features/LOG
@@ -1,15 +1,8 @@
-2024/02/27-16:07:31.247 2190 Recovering log #1195
-2024/02/27-16:07:31.259 2190 Delete type=0 #1195
-2024/02/27-16:07:31.259 2190 Delete type=3 #1193
-2024/02/27-18:30:37.986 e18 Level-0 table #1201: started
-2024/02/27-18:30:38.005 e18 Level-0 table #1201: 103877 bytes OK
-2024/02/27-18:30:38.007 e18 Delete type=0 #1199
-2024/02/27-18:30:38.008 e18 Manual compaction at level-0 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
-2024/02/27-18:30:38.008 e18 Manual compaction at level-1 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at '!items!eUTU3JSbo7X98INw' @ 283 : 1
-2024/02/27-18:30:38.008 e18 Compacting 1@1 + 1@2 files
-2024/02/27-18:30:38.022 e18 Generated table #1202@1: 8 keys, 21602 bytes
-2024/02/27-18:30:38.022 e18 Compacted 1@1 + 1@2 files => 21602 bytes
-2024/02/27-18:30:38.024 e18 compacted to: files[ 0 0 1 0 0 0 0 ]
-2024/02/27-18:30:38.024 e18 Delete type=2 #1197
-2024/02/27-18:30:38.024 e18 Delete type=2 #1201
-2024/02/27-18:30:38.028 e18 Manual compaction at level-1 from '!items!eUTU3JSbo7X98INw' @ 283 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/02/28-11:56:09.269 5984 Recovering log #1207
+2024/02/28-11:56:09.283 5984 Delete type=0 #1207
+2024/02/28-11:56:09.284 5984 Delete type=3 #1205
+2024/02/28-12:02:17.312 920 Level-0 table #1213: started
+2024/02/28-12:02:17.312 920 Level-0 table #1213: 0 bytes OK
+2024/02/28-12:02:17.318 920 Delete type=0 #1211
+2024/02/28-12:02:17.331 920 Manual compaction at level-0 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/02/28-12:02:17.332 920 Manual compaction at level-1 from '!items!1ZFwig1DSBIyGfDL' @ 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 41196dd3..d9ea44c3 100644
--- a/packs/gps-generic-features/LOG.old
+++ b/packs/gps-generic-features/LOG.old
@@ -1,15 +1,15 @@
-2024/02/26-16:41:29.472 6e68 Recovering log #1191
-2024/02/26-16:41:29.477 6e68 Delete type=0 #1191
-2024/02/26-16:41:29.477 6e68 Delete type=3 #1189
-2024/02/27-15:55:11.861 e18 Level-0 table #1196: started
-2024/02/27-15:55:11.870 e18 Level-0 table #1196: 132532 bytes OK
-2024/02/27-15:55:11.872 e18 Delete type=0 #1194
-2024/02/27-15:55:11.872 e18 Manual compaction at level-0 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
-2024/02/27-15:55:11.879 e18 Manual compaction at level-1 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at '!items!eUTU3JSbo7X98INw' @ 274 : 1
-2024/02/27-15:55:11.879 e18 Compacting 1@1 + 1@2 files
-2024/02/27-15:55:11.885 e18 Generated table #1197@1: 8 keys, 21415 bytes
-2024/02/27-15:55:11.885 e18 Compacted 1@1 + 1@2 files => 21415 bytes
-2024/02/27-15:55:11.887 e18 compacted to: files[ 0 0 1 0 0 0 0 ]
-2024/02/27-15:55:11.887 e18 Delete type=2 #1132
-2024/02/27-15:55:11.887 e18 Delete type=2 #1196
-2024/02/27-15:55:11.894 e18 Manual compaction at level-1 from '!items!eUTU3JSbo7X98INw' @ 274 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/02/27-19:00:04.053 5984 Recovering log #1204
+2024/02/27-19:00:04.059 5984 Delete type=0 #1204
+2024/02/27-19:00:04.059 5984 Delete type=3 #1203
+2024/02/28-11:55:15.018 920 Level-0 table #1208: started
+2024/02/28-11:55:15.058 920 Level-0 table #1208: 45435 bytes OK
+2024/02/28-11:55:15.061 920 Delete type=0 #1206
+2024/02/28-11:55:15.064 920 Manual compaction at level-0 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/02/28-11:55:15.065 920 Manual compaction at level-1 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at '!items.effects!eUTU3JSbo7X98INw.ney4KMf0uBXJjZAn' @ 291 : 1
+2024/02/28-11:55:15.065 920 Compacting 1@1 + 1@2 files
+2024/02/28-11:55:15.077 920 Generated table #1209@1: 8 keys, 21423 bytes
+2024/02/28-11:55:15.077 920 Compacted 1@1 + 1@2 files => 21423 bytes
+2024/02/28-11:55:15.090 920 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/02/28-11:55:15.090 920 Delete type=2 #1202
+2024/02/28-11:55:15.091 920 Delete type=2 #1208
+2024/02/28-11:55:15.100 920 Manual compaction at level-1 from '!items.effects!eUTU3JSbo7X98INw.ney4KMf0uBXJjZAn' @ 291 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-generic-features/MANIFEST-001198 b/packs/gps-generic-features/MANIFEST-001198
deleted file mode 100644
index 0e33cb44..00000000
Binary files a/packs/gps-generic-features/MANIFEST-001198 and /dev/null differ
diff --git a/packs/gps-generic-features/MANIFEST-001210 b/packs/gps-generic-features/MANIFEST-001210
new file mode 100644
index 00000000..5676b50f
Binary files /dev/null and b/packs/gps-generic-features/MANIFEST-001210 differ
diff --git a/packs/gps-homebrew-features/001160.log b/packs/gps-homebrew-features/001170.log
similarity index 100%
rename from packs/gps-homebrew-features/001160.log
rename to packs/gps-homebrew-features/001170.log
diff --git a/packs/gps-homebrew-features/CURRENT b/packs/gps-homebrew-features/CURRENT
index 8c498c49..e2888688 100644
--- a/packs/gps-homebrew-features/CURRENT
+++ b/packs/gps-homebrew-features/CURRENT
@@ -1 +1 @@
-MANIFEST-001158
+MANIFEST-001168
diff --git a/packs/gps-homebrew-features/LOG b/packs/gps-homebrew-features/LOG
index 6d154ea8..53d62596 100644
--- a/packs/gps-homebrew-features/LOG
+++ b/packs/gps-homebrew-features/LOG
@@ -1,8 +1,8 @@
-2024/02/27-16:07:31.262 6e10 Recovering log #1156
-2024/02/27-16:07:31.273 6e10 Delete type=0 #1156
-2024/02/27-16:07:31.273 6e10 Delete type=3 #1154
-2024/02/27-18:30:38.024 e18 Level-0 table #1161: started
-2024/02/27-18:30:38.024 e18 Level-0 table #1161: 0 bytes OK
-2024/02/27-18:30:38.028 e18 Delete type=0 #1159
-2024/02/27-18:30:38.034 e18 Manual compaction at level-0 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
-2024/02/27-18:30:38.037 e18 Manual compaction at level-1 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/02/28-11:56:09.314 2e04 Recovering log #1166
+2024/02/28-11:56:09.323 2e04 Delete type=0 #1166
+2024/02/28-11:56:09.323 2e04 Delete type=3 #1164
+2024/02/28-12:02:17.325 920 Level-0 table #1171: started
+2024/02/28-12:02:17.326 920 Level-0 table #1171: 0 bytes OK
+2024/02/28-12:02:17.331 920 Delete type=0 #1169
+2024/02/28-12:02:17.331 920 Manual compaction at level-0 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/02/28-12:02:17.332 920 Manual compaction at level-1 from '!folders!rvG7tD4SnTeXT7ji' @ 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 4280a6f1..8e9b6207 100644
--- a/packs/gps-homebrew-features/LOG.old
+++ b/packs/gps-homebrew-features/LOG.old
@@ -1,8 +1,8 @@
-2024/02/26-16:41:29.485 6db8 Recovering log #1152
-2024/02/26-16:41:29.495 6db8 Delete type=0 #1152
-2024/02/26-16:41:29.496 6db8 Delete type=3 #1150
-2024/02/27-15:55:11.846 e18 Level-0 table #1157: started
-2024/02/27-15:55:11.846 e18 Level-0 table #1157: 0 bytes OK
-2024/02/27-15:55:11.849 e18 Delete type=0 #1155
-2024/02/27-15:55:11.872 e18 Manual compaction at level-0 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
-2024/02/27-15:55:11.872 e18 Manual compaction at level-1 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/02/27-19:00:04.073 6fc8 Recovering log #1163
+2024/02/27-19:00:04.080 6fc8 Delete type=0 #1163
+2024/02/27-19:00:04.080 6fc8 Delete type=3 #1162
+2024/02/28-11:55:15.012 920 Level-0 table #1167: started
+2024/02/28-11:55:15.013 920 Level-0 table #1167: 0 bytes OK
+2024/02/28-11:55:15.017 920 Delete type=0 #1165
+2024/02/28-11:55:15.064 920 Manual compaction at level-0 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/02/28-11:55:15.064 920 Manual compaction at level-1 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-features/MANIFEST-001158 b/packs/gps-homebrew-features/MANIFEST-001168
similarity index 82%
rename from packs/gps-homebrew-features/MANIFEST-001158
rename to packs/gps-homebrew-features/MANIFEST-001168
index a989b68b..216bd761 100644
Binary files a/packs/gps-homebrew-features/MANIFEST-001158 and b/packs/gps-homebrew-features/MANIFEST-001168 differ
diff --git a/packs/gps-homebrew-items/001163.log b/packs/gps-homebrew-items/001173.log
similarity index 100%
rename from packs/gps-homebrew-items/001163.log
rename to packs/gps-homebrew-items/001173.log
diff --git a/packs/gps-homebrew-items/CURRENT b/packs/gps-homebrew-items/CURRENT
index e8262f9e..e63a35c8 100644
--- a/packs/gps-homebrew-items/CURRENT
+++ b/packs/gps-homebrew-items/CURRENT
@@ -1 +1 @@
-MANIFEST-001161
+MANIFEST-001171
diff --git a/packs/gps-homebrew-items/LOG b/packs/gps-homebrew-items/LOG
index 60395e80..75448bcb 100644
--- a/packs/gps-homebrew-items/LOG
+++ b/packs/gps-homebrew-items/LOG
@@ -1,8 +1,8 @@
-2024/02/27-16:07:31.274 2190 Recovering log #1159
-2024/02/27-16:07:31.285 2190 Delete type=0 #1159
-2024/02/27-16:07:31.285 2190 Delete type=3 #1157
-2024/02/27-18:30:38.032 e18 Level-0 table #1164: started
-2024/02/27-18:30:38.032 e18 Level-0 table #1164: 0 bytes OK
-2024/02/27-18:30:38.034 e18 Delete type=0 #1162
-2024/02/27-18:30:38.037 e18 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zU5rb6IHhnrk4kHv.s5vVugxWuFKNWeL3' @ 0 : 0; will stop at (end)
-2024/02/27-18:30:38.037 e18 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zU5rb6IHhnrk4kHv.s5vVugxWuFKNWeL3' @ 0 : 0; will stop at (end)
+2024/02/28-11:56:09.342 5984 Recovering log #1169
+2024/02/28-11:56:09.349 5984 Delete type=0 #1169
+2024/02/28-11:56:09.349 5984 Delete type=3 #1167
+2024/02/28-12:02:17.335 920 Level-0 table #1174: started
+2024/02/28-12:02:17.336 920 Level-0 table #1174: 0 bytes OK
+2024/02/28-12:02:17.344 920 Delete type=0 #1172
+2024/02/28-12:02:17.365 920 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zU5rb6IHhnrk4kHv.s5vVugxWuFKNWeL3' @ 0 : 0; will stop at (end)
+2024/02/28-12:02:17.365 920 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zU5rb6IHhnrk4kHv.s5vVugxWuFKNWeL3' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-items/LOG.old b/packs/gps-homebrew-items/LOG.old
index 43b971b1..5d067c3c 100644
--- a/packs/gps-homebrew-items/LOG.old
+++ b/packs/gps-homebrew-items/LOG.old
@@ -1,8 +1,8 @@
-2024/02/26-16:41:29.502 6e68 Recovering log #1155
-2024/02/26-16:41:29.510 6e68 Delete type=0 #1155
-2024/02/26-16:41:29.510 6e68 Delete type=3 #1153
-2024/02/27-15:55:11.858 e18 Level-0 table #1160: started
-2024/02/27-15:55:11.858 e18 Level-0 table #1160: 0 bytes OK
-2024/02/27-15:55:11.861 e18 Delete type=0 #1158
-2024/02/27-15:55:11.872 e18 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zU5rb6IHhnrk4kHv.s5vVugxWuFKNWeL3' @ 0 : 0; will stop at (end)
-2024/02/27-15:55:11.879 e18 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zU5rb6IHhnrk4kHv.s5vVugxWuFKNWeL3' @ 0 : 0; will stop at (end)
+2024/02/27-19:00:04.092 5984 Recovering log #1166
+2024/02/27-19:00:04.098 5984 Delete type=0 #1166
+2024/02/27-19:00:04.098 5984 Delete type=3 #1165
+2024/02/28-11:55:15.100 920 Level-0 table #1170: started
+2024/02/28-11:55:15.100 920 Level-0 table #1170: 0 bytes OK
+2024/02/28-11:55:15.104 920 Delete type=0 #1168
+2024/02/28-11:55:15.109 920 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zU5rb6IHhnrk4kHv.s5vVugxWuFKNWeL3' @ 0 : 0; will stop at (end)
+2024/02/28-11:55:15.109 920 Manual compaction at level-1 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zU5rb6IHhnrk4kHv.s5vVugxWuFKNWeL3' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-items/MANIFEST-001161 b/packs/gps-homebrew-items/MANIFEST-001171
similarity index 75%
rename from packs/gps-homebrew-items/MANIFEST-001161
rename to packs/gps-homebrew-items/MANIFEST-001171
index 5bd8dc10..7c33f05d 100644
Binary files a/packs/gps-homebrew-items/MANIFEST-001161 and b/packs/gps-homebrew-items/MANIFEST-001171 differ
diff --git a/packs/gps-homebrew-spells/000839.log b/packs/gps-homebrew-spells/000849.log
similarity index 100%
rename from packs/gps-homebrew-spells/000839.log
rename to packs/gps-homebrew-spells/000849.log
diff --git a/packs/gps-homebrew-spells/CURRENT b/packs/gps-homebrew-spells/CURRENT
index da4c9ef4..9c47353f 100644
--- a/packs/gps-homebrew-spells/CURRENT
+++ b/packs/gps-homebrew-spells/CURRENT
@@ -1 +1 @@
-MANIFEST-000837
+MANIFEST-000847
diff --git a/packs/gps-homebrew-spells/LOG b/packs/gps-homebrew-spells/LOG
index 1cc9a954..d9e9e6b7 100644
--- a/packs/gps-homebrew-spells/LOG
+++ b/packs/gps-homebrew-spells/LOG
@@ -1,8 +1,8 @@
-2024/02/27-16:07:31.288 6e10 Recovering log #834
-2024/02/27-16:07:31.299 6e10 Delete type=0 #834
-2024/02/27-16:07:31.300 6e10 Delete type=3 #832
-2024/02/27-18:30:38.042 e18 Level-0 table #840: started
-2024/02/27-18:30:38.042 e18 Level-0 table #840: 0 bytes OK
-2024/02/27-18:30:38.044 e18 Delete type=0 #838
-2024/02/27-18:30:38.050 e18 Manual compaction at level-0 from '!items!6QBzihrPx5u059k4' @ 72057594037927935 : 1 .. '!items.effects!y6DAdalDF9gQbDUX.oxzWSYduqkFWENzC' @ 0 : 0; will stop at (end)
-2024/02/27-18:30:38.051 e18 Manual compaction at level-1 from '!items!6QBzihrPx5u059k4' @ 72057594037927935 : 1 .. '!items.effects!y6DAdalDF9gQbDUX.oxzWSYduqkFWENzC' @ 0 : 0; will stop at (end)
+2024/02/28-11:56:09.360 2e04 Recovering log #845
+2024/02/28-11:56:09.374 2e04 Delete type=0 #845
+2024/02/28-11:56:09.374 2e04 Delete type=3 #843
+2024/02/28-12:02:17.352 920 Level-0 table #850: started
+2024/02/28-12:02:17.353 920 Level-0 table #850: 0 bytes OK
+2024/02/28-12:02:17.358 920 Delete type=0 #848
+2024/02/28-12:02:17.365 920 Manual compaction at level-0 from '!items!6QBzihrPx5u059k4' @ 72057594037927935 : 1 .. '!items.effects!y6DAdalDF9gQbDUX.oxzWSYduqkFWENzC' @ 0 : 0; will stop at (end)
+2024/02/28-12:02:17.366 920 Manual compaction at level-1 from '!items!6QBzihrPx5u059k4' @ 72057594037927935 : 1 .. '!items.effects!y6DAdalDF9gQbDUX.oxzWSYduqkFWENzC' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-spells/LOG.old b/packs/gps-homebrew-spells/LOG.old
index 34a5f8db..aa4a6117 100644
--- a/packs/gps-homebrew-spells/LOG.old
+++ b/packs/gps-homebrew-spells/LOG.old
@@ -1,15 +1,8 @@
-2024/02/26-16:41:29.516 6db8 Recovering log #830
-2024/02/26-16:41:29.525 6db8 Delete type=0 #830
-2024/02/26-16:41:29.525 6db8 Delete type=3 #828
-2024/02/27-15:55:11.849 e18 Level-0 table #835: started
-2024/02/27-15:55:11.855 e18 Level-0 table #835: 43883 bytes OK
-2024/02/27-15:55:11.858 e18 Delete type=0 #833
-2024/02/27-15:55:11.872 e18 Manual compaction at level-0 from '!items!6QBzihrPx5u059k4' @ 72057594037927935 : 1 .. '!items.effects!y6DAdalDF9gQbDUX.oxzWSYduqkFWENzC' @ 0 : 0; will stop at (end)
-2024/02/27-15:55:11.872 e18 Manual compaction at level-1 from '!items!6QBzihrPx5u059k4' @ 72057594037927935 : 1 .. '!items.effects!y6DAdalDF9gQbDUX.oxzWSYduqkFWENzC' @ 0 : 0; will stop at '!items.effects!DNMd8aCqnoIToyuT.ndzAaBnWczGEKgP1' @ 95 : 1
-2024/02/27-15:55:11.872 e18 Compacting 1@1 + 1@2 files
-2024/02/27-15:55:11.877 e18 Generated table #836@1: 17 keys, 34677 bytes
-2024/02/27-15:55:11.877 e18 Compacted 1@1 + 1@2 files => 34677 bytes
-2024/02/27-15:55:11.879 e18 compacted to: files[ 0 0 1 0 0 0 0 ]
-2024/02/27-15:55:11.879 e18 Delete type=2 #763
-2024/02/27-15:55:11.879 e18 Delete type=2 #835
-2024/02/27-15:55:11.890 e18 Manual compaction at level-1 from '!items.effects!DNMd8aCqnoIToyuT.ndzAaBnWczGEKgP1' @ 95 : 1 .. '!items.effects!y6DAdalDF9gQbDUX.oxzWSYduqkFWENzC' @ 0 : 0; will stop at (end)
+2024/02/27-19:00:04.109 6fc8 Recovering log #842
+2024/02/27-19:00:04.115 6fc8 Delete type=0 #842
+2024/02/27-19:00:04.116 6fc8 Delete type=3 #841
+2024/02/28-11:55:15.091 920 Level-0 table #846: started
+2024/02/28-11:55:15.092 920 Level-0 table #846: 0 bytes OK
+2024/02/28-11:55:15.095 920 Delete type=0 #844
+2024/02/28-11:55:15.104 920 Manual compaction at level-0 from '!items!6QBzihrPx5u059k4' @ 72057594037927935 : 1 .. '!items.effects!y6DAdalDF9gQbDUX.oxzWSYduqkFWENzC' @ 0 : 0; will stop at (end)
+2024/02/28-11:55:15.109 920 Manual compaction at level-1 from '!items!6QBzihrPx5u059k4' @ 72057594037927935 : 1 .. '!items.effects!y6DAdalDF9gQbDUX.oxzWSYduqkFWENzC' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-homebrew-spells/MANIFEST-000837 b/packs/gps-homebrew-spells/MANIFEST-000847
similarity index 57%
rename from packs/gps-homebrew-spells/MANIFEST-000837
rename to packs/gps-homebrew-spells/MANIFEST-000847
index be93f242..8ea7339e 100644
Binary files a/packs/gps-homebrew-spells/MANIFEST-000837 and b/packs/gps-homebrew-spells/MANIFEST-000847 differ
diff --git a/packs/gps-items/001159.log b/packs/gps-items/001169.log
similarity index 100%
rename from packs/gps-items/001159.log
rename to packs/gps-items/001169.log
diff --git a/packs/gps-items/CURRENT b/packs/gps-items/CURRENT
index f85c3911..e366c50b 100644
--- a/packs/gps-items/CURRENT
+++ b/packs/gps-items/CURRENT
@@ -1 +1 @@
-MANIFEST-001157
+MANIFEST-001167
diff --git a/packs/gps-items/LOG b/packs/gps-items/LOG
index 4183cc1e..dd734976 100644
--- a/packs/gps-items/LOG
+++ b/packs/gps-items/LOG
@@ -1,8 +1,8 @@
-2024/02/27-16:07:31.225 2190 Recovering log #1155
-2024/02/27-16:07:31.235 2190 Delete type=0 #1155
-2024/02/27-16:07:31.235 2190 Delete type=3 #1153
-2024/02/27-18:30:37.978 e18 Level-0 table #1160: started
-2024/02/27-18:30:37.978 e18 Level-0 table #1160: 0 bytes OK
-2024/02/27-18:30:37.980 e18 Delete type=0 #1158
-2024/02/27-18:30:38.007 e18 Manual compaction at level-0 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
-2024/02/27-18:30:38.024 e18 Manual compaction at level-1 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
+2024/02/28-11:56:09.164 5984 Recovering log #1165
+2024/02/28-11:56:09.174 5984 Delete type=0 #1165
+2024/02/28-11:56:09.175 5984 Delete type=3 #1163
+2024/02/28-12:02:17.305 920 Level-0 table #1170: started
+2024/02/28-12:02:17.305 920 Level-0 table #1170: 0 bytes OK
+2024/02/28-12:02:17.311 920 Delete type=0 #1168
+2024/02/28-12:02:17.331 920 Manual compaction at level-0 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
+2024/02/28-12:02:17.331 920 Manual compaction at level-1 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-items/LOG.old b/packs/gps-items/LOG.old
index a78de46f..ed53edc9 100644
--- a/packs/gps-items/LOG.old
+++ b/packs/gps-items/LOG.old
@@ -1,8 +1,8 @@
-2024/02/26-16:41:29.439 6e68 Recovering log #1151
-2024/02/26-16:41:29.449 6e68 Delete type=0 #1151
-2024/02/26-16:41:29.449 6e68 Delete type=3 #1149
-2024/02/27-15:55:11.841 e18 Level-0 table #1156: started
-2024/02/27-15:55:11.841 e18 Level-0 table #1156: 0 bytes OK
-2024/02/27-15:55:11.843 e18 Delete type=0 #1154
-2024/02/27-15:55:11.843 e18 Manual compaction at level-0 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
-2024/02/27-15:55:11.843 e18 Manual compaction at level-1 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
+2024/02/27-19:00:04.005 5984 Recovering log #1162
+2024/02/27-19:00:04.010 5984 Delete type=0 #1162
+2024/02/27-19:00:04.010 5984 Delete type=3 #1161
+2024/02/28-11:55:15.004 920 Level-0 table #1166: started
+2024/02/28-11:55:15.004 920 Level-0 table #1166: 0 bytes OK
+2024/02/28-11:55:15.011 920 Delete type=0 #1164
+2024/02/28-11:55:15.064 920 Manual compaction at level-0 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
+2024/02/28-11:55:15.064 920 Manual compaction at level-1 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-items/MANIFEST-001157 b/packs/gps-items/MANIFEST-001167
similarity index 57%
rename from packs/gps-items/MANIFEST-001157
rename to packs/gps-items/MANIFEST-001167
index 5b18e6cb..30df4a93 100644
Binary files a/packs/gps-items/MANIFEST-001157 and b/packs/gps-items/MANIFEST-001167 differ
diff --git a/packs/gps-monster-features/001154.log b/packs/gps-monster-features/001164.log
similarity index 100%
rename from packs/gps-monster-features/001154.log
rename to packs/gps-monster-features/001164.log
diff --git a/packs/gps-monster-features/CURRENT b/packs/gps-monster-features/CURRENT
index 680d437f..a6083a43 100644
--- a/packs/gps-monster-features/CURRENT
+++ b/packs/gps-monster-features/CURRENT
@@ -1 +1 @@
-MANIFEST-001152
+MANIFEST-001162
diff --git a/packs/gps-monster-features/LOG b/packs/gps-monster-features/LOG
index 93e697dd..b380938e 100644
--- a/packs/gps-monster-features/LOG
+++ b/packs/gps-monster-features/LOG
@@ -1,8 +1,8 @@
-2024/02/27-16:07:31.239 6e10 Recovering log #1150
-2024/02/27-16:07:31.245 6e10 Delete type=0 #1150
-2024/02/27-16:07:31.245 6e10 Delete type=3 #1148
-2024/02/27-18:30:37.984 e18 Level-0 table #1155: started
-2024/02/27-18:30:37.984 e18 Level-0 table #1155: 0 bytes OK
-2024/02/27-18:30:37.986 e18 Delete type=0 #1153
-2024/02/27-18:30:38.008 e18 Manual compaction at level-0 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!wnAD6qbWIxSXoi86.WD5mCPXLxpFSZZon' @ 0 : 0; will stop at (end)
-2024/02/27-18:30:38.024 e18 Manual compaction at level-1 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!wnAD6qbWIxSXoi86.WD5mCPXLxpFSZZon' @ 0 : 0; will stop at (end)
+2024/02/28-11:56:09.215 2e04 Recovering log #1160
+2024/02/28-11:56:09.226 2e04 Delete type=0 #1160
+2024/02/28-11:56:09.226 2e04 Delete type=3 #1158
+2024/02/28-12:02:17.319 920 Level-0 table #1165: started
+2024/02/28-12:02:17.319 920 Level-0 table #1165: 0 bytes OK
+2024/02/28-12:02:17.325 920 Delete type=0 #1163
+2024/02/28-12:02:17.331 920 Manual compaction at level-0 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!wnAD6qbWIxSXoi86.WD5mCPXLxpFSZZon' @ 0 : 0; will stop at (end)
+2024/02/28-12:02:17.332 920 Manual compaction at level-1 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!wnAD6qbWIxSXoi86.WD5mCPXLxpFSZZon' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-monster-features/LOG.old b/packs/gps-monster-features/LOG.old
index 212d17f4..0b7cb1ba 100644
--- a/packs/gps-monster-features/LOG.old
+++ b/packs/gps-monster-features/LOG.old
@@ -1,8 +1,8 @@
-2024/02/26-16:41:29.455 6db8 Recovering log #1146
-2024/02/26-16:41:29.464 6db8 Delete type=0 #1146
-2024/02/26-16:41:29.464 6db8 Delete type=3 #1144
-2024/02/27-15:55:11.838 e18 Level-0 table #1151: started
-2024/02/27-15:55:11.838 e18 Level-0 table #1151: 0 bytes OK
-2024/02/27-15:55:11.841 e18 Delete type=0 #1149
-2024/02/27-15:55:11.843 e18 Manual compaction at level-0 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!wnAD6qbWIxSXoi86.WD5mCPXLxpFSZZon' @ 0 : 0; will stop at (end)
-2024/02/27-15:55:11.843 e18 Manual compaction at level-1 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!wnAD6qbWIxSXoi86.WD5mCPXLxpFSZZon' @ 0 : 0; will stop at (end)
+2024/02/27-19:00:04.018 6fc8 Recovering log #1157
+2024/02/27-19:00:04.023 6fc8 Delete type=0 #1157
+2024/02/27-19:00:04.024 6fc8 Delete type=3 #1156
+2024/02/28-11:55:15.095 920 Level-0 table #1161: started
+2024/02/28-11:55:15.096 920 Level-0 table #1161: 0 bytes OK
+2024/02/28-11:55:15.100 920 Delete type=0 #1159
+2024/02/28-11:55:15.104 920 Manual compaction at level-0 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!wnAD6qbWIxSXoi86.WD5mCPXLxpFSZZon' @ 0 : 0; will stop at (end)
+2024/02/28-11:55:15.109 920 Manual compaction at level-1 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!wnAD6qbWIxSXoi86.WD5mCPXLxpFSZZon' @ 0 : 0; will stop at (end)
diff --git a/packs/gps-monster-features/MANIFEST-001152 b/packs/gps-monster-features/MANIFEST-001162
similarity index 64%
rename from packs/gps-monster-features/MANIFEST-001152
rename to packs/gps-monster-features/MANIFEST-001162
index 3ab2d646..ebe4941d 100644
Binary files a/packs/gps-monster-features/MANIFEST-001152 and b/packs/gps-monster-features/MANIFEST-001162 differ
diff --git a/packs/gps-spells/001167.log b/packs/gps-spells/001177.log
similarity index 100%
rename from packs/gps-spells/001167.log
rename to packs/gps-spells/001177.log
diff --git a/packs/gps-spells/CURRENT b/packs/gps-spells/CURRENT
index 4cc94a54..2f1f1d2d 100644
--- a/packs/gps-spells/CURRENT
+++ b/packs/gps-spells/CURRENT
@@ -1 +1 @@
-MANIFEST-001165
+MANIFEST-001175
diff --git a/packs/gps-spells/LOG b/packs/gps-spells/LOG
index 63e03679..1c4ce884 100644
--- a/packs/gps-spells/LOG
+++ b/packs/gps-spells/LOG
@@ -1,8 +1,8 @@
-2024/02/27-16:07:31.200 2190 Recovering log #1163
-2024/02/27-16:07:31.210 2190 Delete type=0 #1163
-2024/02/27-16:07:31.210 2190 Delete type=3 #1161
-2024/02/27-18:30:37.980 e18 Level-0 table #1168: started
-2024/02/27-18:30:37.980 e18 Level-0 table #1168: 0 bytes OK
-2024/02/27-18:30:37.983 e18 Delete type=0 #1166
-2024/02/27-18:30:38.008 e18 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
-2024/02/27-18:30:38.008 e18 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/02/28-11:56:09.088 5984 Recovering log #1173
+2024/02/28-11:56:09.095 5984 Delete type=0 #1173
+2024/02/28-11:56:09.096 5984 Delete type=3 #1171
+2024/02/28-12:02:17.271 920 Level-0 table #1178: started
+2024/02/28-12:02:17.271 920 Level-0 table #1178: 0 bytes OK
+2024/02/28-12:02:17.279 920 Delete type=0 #1176
+2024/02/28-12:02:17.300 920 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/02/28-12:02:17.300 920 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/LOG.old b/packs/gps-spells/LOG.old
index cfdb8aa3..8c135a17 100644
--- a/packs/gps-spells/LOG.old
+++ b/packs/gps-spells/LOG.old
@@ -1,8 +1,8 @@
-2024/02/26-16:41:29.407 6e68 Recovering log #1159
-2024/02/26-16:41:29.416 6e68 Delete type=0 #1159
-2024/02/26-16:41:29.417 6e68 Delete type=3 #1157
-2024/02/27-15:55:11.831 e18 Level-0 table #1164: started
-2024/02/27-15:55:11.832 e18 Level-0 table #1164: 0 bytes OK
-2024/02/27-15:55:11.836 e18 Delete type=0 #1162
-2024/02/27-15:55:11.843 e18 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
-2024/02/27-15:55:11.843 e18 Manual compaction at level-1 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/02/27-19:00:03.972 5984 Recovering log #1170
+2024/02/27-19:00:03.977 5984 Delete type=0 #1170
+2024/02/27-19:00:03.977 5984 Delete type=3 #1169
+2024/02/28-11:55:14.996 920 Level-0 table #1174: started
+2024/02/28-11:55:14.996 920 Level-0 table #1174: 0 bytes OK
+2024/02/28-11:55:15.000 920 Delete type=0 #1172
+2024/02/28-11:55:15.000 920 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/02/28-11:55:15.000 920 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-001165 b/packs/gps-spells/MANIFEST-001175
similarity index 63%
rename from packs/gps-spells/MANIFEST-001165
rename to packs/gps-spells/MANIFEST-001175
index 97f42bd3..8f3f00b8 100644
Binary files a/packs/gps-spells/MANIFEST-001165 and b/packs/gps-spells/MANIFEST-001175 differ
diff --git a/scripts/macroFunctions.js b/scripts/macroFunctions.js
index e6b71821..965ec145 100644
--- a/scripts/macroFunctions.js
+++ b/scripts/macroFunctions.js
@@ -63,13 +63,16 @@ async function enableOpportunityAttack(combat, combatEvent) {
         if(combatEvent === "enterCombat") {
             let combatant = combat;
                 if (combatant.actor.type === 'npc' || combatant.actor.type === 'character') {
-                    let existingItem = combatant.actor.items.find(i => i.name === itemName);
+                    const itemsToDelete = combatant.actor.items.filter(item => item.name === itemName);
+                    const itemIdsToDelete = itemsToDelete.map(item => item.id);
+            
+                    if (itemIdsToDelete.length > 0) {
+                        await combatant.actor.deleteEmbeddedDocuments("Item", itemIdsToDelete);
+                    }
                     
                     if (combatant.token.disposition === -1) {
-                        if (existingItem) await combatant.actor.deleteEmbeddedDocuments("Item", [existingItem.id]);
                         npcs.push(combatant);
                     } else if (combatant.token.disposition === 1) {
-                        if (existingItem) await combatant.actor.deleteEmbeddedDocuments("Item", [existingItem.id]);
                         pcs.push(combatant);
                     }
                 }
@@ -86,26 +89,43 @@ async function disableOpportunityAttack(combat, combatEvent) {
 
     if(combatEvent === "endCombat") {    
         for (let combatant of combat.combatants.values()) {
-            const itemsToDelete = combatant.actor.items.filter(item => item.name === itemName);
-            const itemIdsToDelete = itemsToDelete.map(item => item.id);
+            let existingItems = combatant.actor.items.filter(item => item.name === itemName);
+            let itemIdsToDelete = existingItems.map(item => item.id);
+            let templateFlag = await combatant.actor.getFlag("midi-qol", "opportunityAttackTemplate");
+            let checkRiposteFlag = await combatant.actor.getFlag("midi-qol", "checkRiposteDecision");
+            let checkBraceFlag = await combatant.actor.getFlag("midi-qol", "checkBraceDecision");
     
             if (itemIdsToDelete.length > 0) {
                 await combatant.actor.deleteEmbeddedDocuments("Item", itemIdsToDelete);
             }
 
-            let templateFlag = await combatant.actor.getFlag("midi-qol", "opportunityAttackTemplate");
+            let templateData = await fromUuid(templateFlag);
+            templateData.delete();
+    
             if (templateFlag) await combatant.actor.unsetFlag("midi-qol", "opportunityAttackTemplate");
+            if(checkRiposteFlag) await combatant.actor.unsetFlag("midi-qol", "checkRiposteDecision");
+            if(checkBraceFlag) await combatant.actor.unsetFlag("midi-qol", "checkBraceDecision");
         }
+    }
 
-        if(combatEvent === "exitCombat") {       
-            let combatant = combat;
-            let existingItem = combatant.actor.items.getName(itemName);
-            let templateFlag = await combatant.actor.getFlag("midi-qol", "opportunityAttackTemplate");
-    
-            if (existingItem) await combatant.actor.deleteEmbeddedDocuments("Item", [existingItem.id]);
-    
-            if (templateFlag) await combatant.actor.unsetFlag("midi-qol", "opportunityAttackTemplate");
+    if(combatEvent === "exitCombat") {       
+        let combatant = combat;
+        let existingItems = combatant.actor.items.filter(item => item.name === itemName);
+        let itemIdsToDelete = existingItems.map(item => item.id);
+        let templateFlag = await combatant.actor.getFlag("midi-qol", "opportunityAttackTemplate");
+        let checkRiposteFlag = await combatant.actor.getFlag("midi-qol", "checkRiposteDecision");
+        let checkBraceFlag = await combatant.actor.getFlag("midi-qol", "checkBraceDecision");
+
+        if (itemIdsToDelete.length > 0) {
+            await combatant.actor.deleteEmbeddedDocuments("Item", itemIdsToDelete);
         }
+
+        let templateData = await fromUuid(templateFlag);
+        templateData.delete();
+
+        if (templateFlag) await combatant.actor.unsetFlag("midi-qol", "opportunityAttackTemplate");
+        if(checkRiposteFlag) await combatant.actor.unsetFlag("midi-qol", "checkRiposteDecision");
+        if(checkBraceFlag) await combatant.actor.unsetFlag("midi-qol", "checkBraceDecision");
     }
 };