diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b35ca65d..a8c6ec42 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: 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 "  - Opportunity Attack: Resolved a few problems related to trying to remove the OA item, cleaned up OA addition. The Opportunity Attack Targets setting no longer exists, and Opportunity Attack will be enabled for all valid characters in Combat/entering Combat" >> 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 f9bb975b..10f643ee 100644
--- a/module.json
+++ b/module.json
@@ -7,7 +7,7 @@
 		"name": "Gambit"
 		}
 	],
-  "version": "0.0.79",
+  "version": "0.0.80",
 	"compatibility": {
 	"minimum": "11",
 	"verified": "11",
diff --git a/packs/gps-actors/000018.log b/packs/gps-actors/000030.log
similarity index 100%
rename from packs/gps-actors/000018.log
rename to packs/gps-actors/000030.log
diff --git a/packs/gps-actors/CURRENT b/packs/gps-actors/CURRENT
index 32108be6..5d0fffb3 100644
--- a/packs/gps-actors/CURRENT
+++ b/packs/gps-actors/CURRENT
@@ -1 +1 @@
-MANIFEST-000016
+MANIFEST-000028
diff --git a/packs/gps-actors/LOG b/packs/gps-actors/LOG
index 817d193d..b2c2a11d 100644
--- a/packs/gps-actors/LOG
+++ b/packs/gps-actors/LOG
@@ -1,8 +1,8 @@
-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)
+2024/02/28-13:53:02.887 2e88 Recovering log #26
+2024/02/28-13:53:02.894 2e88 Delete type=0 #26
+2024/02/28-13:53:02.894 2e88 Delete type=3 #24
+2024/02/28-14:14:50.360 920 Level-0 table #31: started
+2024/02/28-14:14:50.360 920 Level-0 table #31: 0 bytes OK
+2024/02/28-14:14:50.362 920 Delete type=0 #29
+2024/02/28-14:14:50.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-14:14:50.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 7a432d32..93bea198 100644
--- a/packs/gps-actors/LOG.old
+++ b/packs/gps-actors/LOG.old
@@ -1,8 +1,8 @@
-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)
+2024/02/28-12:48:30.479 2e88 Recovering log #22
+2024/02/28-12:48:30.487 2e88 Delete type=0 #22
+2024/02/28-12:48:30.487 2e88 Delete type=3 #20
+2024/02/28-13:52:34.654 920 Level-0 table #27: started
+2024/02/28-13:52:34.654 920 Level-0 table #27: 0 bytes OK
+2024/02/28-13:52:34.657 920 Delete type=0 #25
+2024/02/28-13:52:34.657 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-13:52:34.657 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-000016 b/packs/gps-actors/MANIFEST-000028
similarity index 69%
rename from packs/gps-actors/MANIFEST-000016
rename to packs/gps-actors/MANIFEST-000028
index 523b3199..1bcff40f 100644
Binary files a/packs/gps-actors/MANIFEST-000016 and b/packs/gps-actors/MANIFEST-000028 differ
diff --git a/packs/gps-class-features/001171.log b/packs/gps-class-features/001183.log
similarity index 100%
rename from packs/gps-class-features/001171.log
rename to packs/gps-class-features/001183.log
diff --git a/packs/gps-class-features/CURRENT b/packs/gps-class-features/CURRENT
index acaa538a..beedb4b2 100644
--- a/packs/gps-class-features/CURRENT
+++ b/packs/gps-class-features/CURRENT
@@ -1 +1 @@
-MANIFEST-001169
+MANIFEST-001181
diff --git a/packs/gps-class-features/LOG b/packs/gps-class-features/LOG
index 178e42e6..c96840a3 100644
--- a/packs/gps-class-features/LOG
+++ b/packs/gps-class-features/LOG
@@ -1,8 +1,8 @@
-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)
+2024/02/28-13:53:02.783 2e88 Recovering log #1179
+2024/02/28-13:53:02.789 2e88 Delete type=0 #1179
+2024/02/28-13:53:02.789 2e88 Delete type=3 #1177
+2024/02/28-14:14:50.323 920 Level-0 table #1184: started
+2024/02/28-14:14:50.323 920 Level-0 table #1184: 0 bytes OK
+2024/02/28-14:14:50.326 920 Delete type=0 #1182
+2024/02/28-14:14:50.326 920 Manual compaction at level-0 from '!folders!Bx9M27esbZ3oMhQa' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/02/28-14:14:50.326 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 e7ae2828..48456f68 100644
--- a/packs/gps-class-features/LOG.old
+++ b/packs/gps-class-features/LOG.old
@@ -1,8 +1,8 @@
-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)
+2024/02/28-12:48:30.339 2e88 Recovering log #1175
+2024/02/28-12:48:30.347 2e88 Delete type=0 #1175
+2024/02/28-12:48:30.347 2e88 Delete type=3 #1173
+2024/02/28-13:52:34.626 920 Level-0 table #1180: started
+2024/02/28-13:52:34.626 920 Level-0 table #1180: 0 bytes OK
+2024/02/28-13:52:34.629 920 Delete type=0 #1178
+2024/02/28-13:52:34.629 920 Manual compaction at level-0 from '!folders!Bx9M27esbZ3oMhQa' @ 72057594037927935 : 1 .. '!items.effects!wLd8HBhcDcpEy0Gp.DWegiMAKX43CuDbS' @ 0 : 0; will stop at (end)
+2024/02/28-13:52:34.629 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-001169 b/packs/gps-class-features/MANIFEST-001181
similarity index 63%
rename from packs/gps-class-features/MANIFEST-001169
rename to packs/gps-class-features/MANIFEST-001181
index 34dd4a67..a2ba58c1 100644
Binary files a/packs/gps-class-features/MANIFEST-001169 and b/packs/gps-class-features/MANIFEST-001181 differ
diff --git a/packs/gps-generic-features/001212.log b/packs/gps-generic-features/001224.log
similarity index 100%
rename from packs/gps-generic-features/001212.log
rename to packs/gps-generic-features/001224.log
diff --git a/packs/gps-generic-features/001209.ldb b/packs/gps-generic-features/001226.ldb
similarity index 64%
rename from packs/gps-generic-features/001209.ldb
rename to packs/gps-generic-features/001226.ldb
index b6885cbb..198f27f9 100644
Binary files a/packs/gps-generic-features/001209.ldb and b/packs/gps-generic-features/001226.ldb differ
diff --git a/packs/gps-generic-features/CURRENT b/packs/gps-generic-features/CURRENT
index 12be24b4..2679688c 100644
--- a/packs/gps-generic-features/CURRENT
+++ b/packs/gps-generic-features/CURRENT
@@ -1 +1 @@
-MANIFEST-001210
+MANIFEST-001222
diff --git a/packs/gps-generic-features/LOG b/packs/gps-generic-features/LOG
index ff8c618f..a1c1c4a7 100644
--- a/packs/gps-generic-features/LOG
+++ b/packs/gps-generic-features/LOG
@@ -1,8 +1,15 @@
-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)
+2024/02/28-13:53:02.824 6fc8 Recovering log #1220
+2024/02/28-13:53:02.831 6fc8 Delete type=0 #1220
+2024/02/28-13:53:02.831 6fc8 Delete type=3 #1218
+2024/02/28-14:14:50.332 920 Level-0 table #1225: started
+2024/02/28-14:14:50.336 920 Level-0 table #1225: 29526 bytes OK
+2024/02/28-14:14:50.339 920 Delete type=0 #1223
+2024/02/28-14:14:50.345 920 Manual compaction at level-0 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/02/28-14:14:50.345 920 Manual compaction at level-1 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at '!items!eUTU3JSbo7X98INw' @ 294 : 1
+2024/02/28-14:14:50.345 920 Compacting 1@1 + 1@2 files
+2024/02/28-14:14:50.349 920 Generated table #1226@1: 8 keys, 21423 bytes
+2024/02/28-14:14:50.349 920 Compacted 1@1 + 1@2 files => 21423 bytes
+2024/02/28-14:14:50.352 920 compacted to: files[ 0 0 1 0 0 0 0 ]
+2024/02/28-14:14:50.352 920 Delete type=2 #1209
+2024/02/28-14:14:50.353 920 Delete type=2 #1225
+2024/02/28-14:14:50.356 920 Manual compaction at level-1 from '!items!eUTU3JSbo7X98INw' @ 294 : 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 d9ea44c3..ed3a35b3 100644
--- a/packs/gps-generic-features/LOG.old
+++ b/packs/gps-generic-features/LOG.old
@@ -1,15 +1,8 @@
-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)
+2024/02/28-12:48:30.376 6fc8 Recovering log #1216
+2024/02/28-12:48:30.386 6fc8 Delete type=0 #1216
+2024/02/28-12:48:30.387 6fc8 Delete type=3 #1214
+2024/02/28-13:52:34.634 920 Level-0 table #1221: started
+2024/02/28-13:52:34.634 920 Level-0 table #1221: 0 bytes OK
+2024/02/28-13:52:34.636 920 Delete type=0 #1219
+2024/02/28-13:52:34.642 920 Manual compaction at level-0 from '!items!1ZFwig1DSBIyGfDL' @ 72057594037927935 : 1 .. '!items.effects!svKaRfNtOXMOXoW6.NcYMpQ7B3RwBuLC7' @ 0 : 0; will stop at (end)
+2024/02/28-13:52:34.642 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/MANIFEST-001210 b/packs/gps-generic-features/MANIFEST-001210
deleted file mode 100644
index 5676b50f..00000000
Binary files a/packs/gps-generic-features/MANIFEST-001210 and /dev/null differ
diff --git a/packs/gps-generic-features/MANIFEST-001222 b/packs/gps-generic-features/MANIFEST-001222
new file mode 100644
index 00000000..010a7ee3
Binary files /dev/null and b/packs/gps-generic-features/MANIFEST-001222 differ
diff --git a/packs/gps-homebrew-features/001170.log b/packs/gps-homebrew-features/001182.log
similarity index 100%
rename from packs/gps-homebrew-features/001170.log
rename to packs/gps-homebrew-features/001182.log
diff --git a/packs/gps-homebrew-features/CURRENT b/packs/gps-homebrew-features/CURRENT
index e2888688..ee6edfa0 100644
--- a/packs/gps-homebrew-features/CURRENT
+++ b/packs/gps-homebrew-features/CURRENT
@@ -1 +1 @@
-MANIFEST-001168
+MANIFEST-001180
diff --git a/packs/gps-homebrew-features/LOG b/packs/gps-homebrew-features/LOG
index 53d62596..6efa6331 100644
--- a/packs/gps-homebrew-features/LOG
+++ b/packs/gps-homebrew-features/LOG
@@ -1,8 +1,8 @@
-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)
+2024/02/28-13:53:02.835 2e88 Recovering log #1178
+2024/02/28-13:53:02.841 2e88 Delete type=0 #1178
+2024/02/28-13:53:02.841 2e88 Delete type=3 #1176
+2024/02/28-14:14:50.339 920 Level-0 table #1183: started
+2024/02/28-14:14:50.340 920 Level-0 table #1183: 0 bytes OK
+2024/02/28-14:14:50.342 920 Delete type=0 #1181
+2024/02/28-14:14:50.345 920 Manual compaction at level-0 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/02/28-14:14:50.353 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 8e9b6207..777c8e4d 100644
--- a/packs/gps-homebrew-features/LOG.old
+++ b/packs/gps-homebrew-features/LOG.old
@@ -1,8 +1,8 @@
-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)
+2024/02/28-12:48:30.394 2e88 Recovering log #1174
+2024/02/28-12:48:30.402 2e88 Delete type=0 #1174
+2024/02/28-12:48:30.402 2e88 Delete type=3 #1172
+2024/02/28-13:52:34.636 920 Level-0 table #1179: started
+2024/02/28-13:52:34.636 920 Level-0 table #1179: 0 bytes OK
+2024/02/28-13:52:34.639 920 Delete type=0 #1177
+2024/02/28-13:52:34.642 920 Manual compaction at level-0 from '!folders!rvG7tD4SnTeXT7ji' @ 72057594037927935 : 1 .. '!items.effects!ba3fwkX1XMdyqBaE.hPR9ii2vho7FqWlZ' @ 0 : 0; will stop at (end)
+2024/02/28-13:52:34.642 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-001168 b/packs/gps-homebrew-features/MANIFEST-001180
similarity index 82%
rename from packs/gps-homebrew-features/MANIFEST-001168
rename to packs/gps-homebrew-features/MANIFEST-001180
index 216bd761..1990b5b5 100644
Binary files a/packs/gps-homebrew-features/MANIFEST-001168 and b/packs/gps-homebrew-features/MANIFEST-001180 differ
diff --git a/packs/gps-homebrew-items/001173.log b/packs/gps-homebrew-items/001185.log
similarity index 100%
rename from packs/gps-homebrew-items/001173.log
rename to packs/gps-homebrew-items/001185.log
diff --git a/packs/gps-homebrew-items/CURRENT b/packs/gps-homebrew-items/CURRENT
index e63a35c8..2346a7df 100644
--- a/packs/gps-homebrew-items/CURRENT
+++ b/packs/gps-homebrew-items/CURRENT
@@ -1 +1 @@
-MANIFEST-001171
+MANIFEST-001183
diff --git a/packs/gps-homebrew-items/LOG b/packs/gps-homebrew-items/LOG
index 75448bcb..7051b172 100644
--- a/packs/gps-homebrew-items/LOG
+++ b/packs/gps-homebrew-items/LOG
@@ -1,8 +1,8 @@
-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)
+2024/02/28-13:53:02.845 6fc8 Recovering log #1181
+2024/02/28-13:53:02.852 6fc8 Delete type=0 #1181
+2024/02/28-13:53:02.852 6fc8 Delete type=3 #1179
+2024/02/28-14:14:50.353 920 Level-0 table #1186: started
+2024/02/28-14:14:50.353 920 Level-0 table #1186: 0 bytes OK
+2024/02/28-14:14:50.355 920 Delete type=0 #1184
+2024/02/28-14:14:50.360 920 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zU5rb6IHhnrk4kHv.s5vVugxWuFKNWeL3' @ 0 : 0; will stop at (end)
+2024/02/28-14:14:50.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 5d067c3c..f460eb60 100644
--- a/packs/gps-homebrew-items/LOG.old
+++ b/packs/gps-homebrew-items/LOG.old
@@ -1,8 +1,8 @@
-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)
+2024/02/28-12:48:30.411 6fc8 Recovering log #1177
+2024/02/28-12:48:30.420 6fc8 Delete type=0 #1177
+2024/02/28-12:48:30.420 6fc8 Delete type=3 #1175
+2024/02/28-13:52:34.651 920 Level-0 table #1182: started
+2024/02/28-13:52:34.652 920 Level-0 table #1182: 0 bytes OK
+2024/02/28-13:52:34.654 920 Delete type=0 #1180
+2024/02/28-13:52:34.657 920 Manual compaction at level-0 from '!items!1WSJjnpLJhilXEgO' @ 72057594037927935 : 1 .. '!items.effects!zU5rb6IHhnrk4kHv.s5vVugxWuFKNWeL3' @ 0 : 0; will stop at (end)
+2024/02/28-13:52:34.657 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-001171 b/packs/gps-homebrew-items/MANIFEST-001183
similarity index 75%
rename from packs/gps-homebrew-items/MANIFEST-001171
rename to packs/gps-homebrew-items/MANIFEST-001183
index 7c33f05d..6214e0ef 100644
Binary files a/packs/gps-homebrew-items/MANIFEST-001171 and b/packs/gps-homebrew-items/MANIFEST-001183 differ
diff --git a/packs/gps-homebrew-spells/000849.log b/packs/gps-homebrew-spells/000861.log
similarity index 100%
rename from packs/gps-homebrew-spells/000849.log
rename to packs/gps-homebrew-spells/000861.log
diff --git a/packs/gps-homebrew-spells/CURRENT b/packs/gps-homebrew-spells/CURRENT
index 9c47353f..90435324 100644
--- a/packs/gps-homebrew-spells/CURRENT
+++ b/packs/gps-homebrew-spells/CURRENT
@@ -1 +1 @@
-MANIFEST-000847
+MANIFEST-000859
diff --git a/packs/gps-homebrew-spells/LOG b/packs/gps-homebrew-spells/LOG
index d9e9e6b7..b495d26b 100644
--- a/packs/gps-homebrew-spells/LOG
+++ b/packs/gps-homebrew-spells/LOG
@@ -1,8 +1,8 @@
-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)
+2024/02/28-13:53:02.856 2e88 Recovering log #857
+2024/02/28-13:53:02.863 2e88 Delete type=0 #857
+2024/02/28-13:53:02.863 2e88 Delete type=3 #855
+2024/02/28-14:14:50.342 920 Level-0 table #862: started
+2024/02/28-14:14:50.342 920 Level-0 table #862: 0 bytes OK
+2024/02/28-14:14:50.345 920 Delete type=0 #860
+2024/02/28-14:14:50.353 920 Manual compaction at level-0 from '!items!6QBzihrPx5u059k4' @ 72057594037927935 : 1 .. '!items.effects!y6DAdalDF9gQbDUX.oxzWSYduqkFWENzC' @ 0 : 0; will stop at (end)
+2024/02/28-14:14:50.356 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 aa4a6117..024edb01 100644
--- a/packs/gps-homebrew-spells/LOG.old
+++ b/packs/gps-homebrew-spells/LOG.old
@@ -1,8 +1,8 @@
-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)
+2024/02/28-12:48:30.427 2e88 Recovering log #853
+2024/02/28-12:48:30.437 2e88 Delete type=0 #853
+2024/02/28-12:48:30.438 2e88 Delete type=3 #851
+2024/02/28-13:52:34.648 920 Level-0 table #858: started
+2024/02/28-13:52:34.648 920 Level-0 table #858: 0 bytes OK
+2024/02/28-13:52:34.651 920 Delete type=0 #856
+2024/02/28-13:52:34.657 920 Manual compaction at level-0 from '!items!6QBzihrPx5u059k4' @ 72057594037927935 : 1 .. '!items.effects!y6DAdalDF9gQbDUX.oxzWSYduqkFWENzC' @ 0 : 0; will stop at (end)
+2024/02/28-13:52:34.657 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-000847 b/packs/gps-homebrew-spells/MANIFEST-000859
similarity index 57%
rename from packs/gps-homebrew-spells/MANIFEST-000847
rename to packs/gps-homebrew-spells/MANIFEST-000859
index 8ea7339e..886bd637 100644
Binary files a/packs/gps-homebrew-spells/MANIFEST-000847 and b/packs/gps-homebrew-spells/MANIFEST-000859 differ
diff --git a/packs/gps-items/001169.log b/packs/gps-items/001181.log
similarity index 100%
rename from packs/gps-items/001169.log
rename to packs/gps-items/001181.log
diff --git a/packs/gps-items/CURRENT b/packs/gps-items/CURRENT
index e366c50b..f4af3123 100644
--- a/packs/gps-items/CURRENT
+++ b/packs/gps-items/CURRENT
@@ -1 +1 @@
-MANIFEST-001167
+MANIFEST-001179
diff --git a/packs/gps-items/LOG b/packs/gps-items/LOG
index dd734976..5a929723 100644
--- a/packs/gps-items/LOG
+++ b/packs/gps-items/LOG
@@ -1,8 +1,8 @@
-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)
+2024/02/28-13:53:02.798 6fc8 Recovering log #1177
+2024/02/28-13:53:02.805 6fc8 Delete type=0 #1177
+2024/02/28-13:53:02.805 6fc8 Delete type=3 #1175
+2024/02/28-14:14:50.321 920 Level-0 table #1182: started
+2024/02/28-14:14:50.321 920 Level-0 table #1182: 0 bytes OK
+2024/02/28-14:14:50.323 920 Delete type=0 #1180
+2024/02/28-14:14:50.326 920 Manual compaction at level-0 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
+2024/02/28-14:14:50.326 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 ed53edc9..df7264ac 100644
--- a/packs/gps-items/LOG.old
+++ b/packs/gps-items/LOG.old
@@ -1,8 +1,8 @@
-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)
+2024/02/28-12:48:30.352 6fc8 Recovering log #1173
+2024/02/28-12:48:30.359 6fc8 Delete type=0 #1173
+2024/02/28-12:48:30.359 6fc8 Delete type=3 #1171
+2024/02/28-13:52:34.640 920 Level-0 table #1178: started
+2024/02/28-13:52:34.640 920 Level-0 table #1178: 0 bytes OK
+2024/02/28-13:52:34.642 920 Delete type=0 #1176
+2024/02/28-13:52:34.642 920 Manual compaction at level-0 from '!items!6k4ycpLSro1bWCMa' @ 72057594037927935 : 1 .. '!items.effects!rPLED9VTdrxEzpRX.gCMcWr5UW0b0GirN' @ 0 : 0; will stop at (end)
+2024/02/28-13:52:34.642 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-001167 b/packs/gps-items/MANIFEST-001179
similarity index 57%
rename from packs/gps-items/MANIFEST-001167
rename to packs/gps-items/MANIFEST-001179
index 30df4a93..47dfd0d9 100644
Binary files a/packs/gps-items/MANIFEST-001167 and b/packs/gps-items/MANIFEST-001179 differ
diff --git a/packs/gps-monster-features/001164.log b/packs/gps-monster-features/001176.log
similarity index 100%
rename from packs/gps-monster-features/001164.log
rename to packs/gps-monster-features/001176.log
diff --git a/packs/gps-monster-features/CURRENT b/packs/gps-monster-features/CURRENT
index a6083a43..cbe243d6 100644
--- a/packs/gps-monster-features/CURRENT
+++ b/packs/gps-monster-features/CURRENT
@@ -1 +1 @@
-MANIFEST-001162
+MANIFEST-001174
diff --git a/packs/gps-monster-features/LOG b/packs/gps-monster-features/LOG
index b380938e..264764a6 100644
--- a/packs/gps-monster-features/LOG
+++ b/packs/gps-monster-features/LOG
@@ -1,8 +1,8 @@
-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)
+2024/02/28-13:53:02.810 2e88 Recovering log #1172
+2024/02/28-13:53:02.817 2e88 Delete type=0 #1172
+2024/02/28-13:53:02.817 2e88 Delete type=3 #1170
+2024/02/28-14:14:50.327 920 Level-0 table #1177: started
+2024/02/28-14:14:50.327 920 Level-0 table #1177: 0 bytes OK
+2024/02/28-14:14:50.332 920 Delete type=0 #1175
+2024/02/28-14:14:50.345 920 Manual compaction at level-0 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!wnAD6qbWIxSXoi86.WD5mCPXLxpFSZZon' @ 0 : 0; will stop at (end)
+2024/02/28-14:14:50.345 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 0b7cb1ba..2965f538 100644
--- a/packs/gps-monster-features/LOG.old
+++ b/packs/gps-monster-features/LOG.old
@@ -1,8 +1,8 @@
-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)
+2024/02/28-12:48:30.362 2e88 Recovering log #1168
+2024/02/28-12:48:30.368 2e88 Delete type=0 #1168
+2024/02/28-12:48:30.368 2e88 Delete type=3 #1166
+2024/02/28-13:52:34.630 920 Level-0 table #1173: started
+2024/02/28-13:52:34.630 920 Level-0 table #1173: 0 bytes OK
+2024/02/28-13:52:34.634 920 Delete type=0 #1171
+2024/02/28-13:52:34.642 920 Manual compaction at level-0 from '!items!OViIIfcfXLb8lv6C' @ 72057594037927935 : 1 .. '!items.effects!wnAD6qbWIxSXoi86.WD5mCPXLxpFSZZon' @ 0 : 0; will stop at (end)
+2024/02/28-13:52:34.642 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-001162 b/packs/gps-monster-features/MANIFEST-001174
similarity index 64%
rename from packs/gps-monster-features/MANIFEST-001162
rename to packs/gps-monster-features/MANIFEST-001174
index ebe4941d..5d7601d1 100644
Binary files a/packs/gps-monster-features/MANIFEST-001162 and b/packs/gps-monster-features/MANIFEST-001174 differ
diff --git a/packs/gps-spells/001177.log b/packs/gps-spells/001189.log
similarity index 100%
rename from packs/gps-spells/001177.log
rename to packs/gps-spells/001189.log
diff --git a/packs/gps-spells/CURRENT b/packs/gps-spells/CURRENT
index 2f1f1d2d..b2e6c299 100644
--- a/packs/gps-spells/CURRENT
+++ b/packs/gps-spells/CURRENT
@@ -1 +1 @@
-MANIFEST-001175
+MANIFEST-001187
diff --git a/packs/gps-spells/LOG b/packs/gps-spells/LOG
index 1c4ce884..365105ee 100644
--- a/packs/gps-spells/LOG
+++ b/packs/gps-spells/LOG
@@ -1,8 +1,8 @@
-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)
+2024/02/28-13:53:02.769 6fc8 Recovering log #1185
+2024/02/28-13:53:02.776 6fc8 Delete type=0 #1185
+2024/02/28-13:53:02.776 6fc8 Delete type=3 #1183
+2024/02/28-14:14:50.317 920 Level-0 table #1190: started
+2024/02/28-14:14:50.317 920 Level-0 table #1190: 0 bytes OK
+2024/02/28-14:14:50.320 920 Delete type=0 #1188
+2024/02/28-14:14:50.326 920 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/02/28-14:14:50.326 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 8c135a17..7131e33b 100644
--- a/packs/gps-spells/LOG.old
+++ b/packs/gps-spells/LOG.old
@@ -1,8 +1,8 @@
-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)
+2024/02/28-12:48:30.319 5984 Recovering log #1181
+2024/02/28-12:48:30.329 5984 Delete type=0 #1181
+2024/02/28-12:48:30.329 5984 Delete type=3 #1179
+2024/02/28-13:52:34.623 920 Level-0 table #1186: started
+2024/02/28-13:52:34.623 920 Level-0 table #1186: 0 bytes OK
+2024/02/28-13:52:34.626 920 Delete type=0 #1184
+2024/02/28-13:52:34.629 920 Manual compaction at level-0 from '!items!0gEfNrgZuAxvnL5H' @ 72057594037927935 : 1 .. '!items.effects!vxrggTopkxhq3MAn.T70VAw9NbZZUV7tZ' @ 0 : 0; will stop at (end)
+2024/02/28-13:52:34.629 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-001175 b/packs/gps-spells/MANIFEST-001187
similarity index 63%
rename from packs/gps-spells/MANIFEST-001175
rename to packs/gps-spells/MANIFEST-001187
index 8f3f00b8..41b7bb75 100644
Binary files a/packs/gps-spells/MANIFEST-001175 and b/packs/gps-spells/MANIFEST-001187 differ
diff --git a/scripts/macroFunctions.js b/scripts/macroFunctions.js
index 965ec145..471f9431 100644
--- a/scripts/macroFunctions.js
+++ b/scripts/macroFunctions.js
@@ -1,7 +1,6 @@
 async function enableOpportunityAttack(combat, combatEvent) {
     if(!game.user.isGM) return;
     if (game.settings.get('gambits-premades', 'Enable Opportunity Attack') === false) return console.log("Opportunity Attack setting not enabled");
-    const targetSetting = game.settings.get('gambits-premades', 'Opportunity Attack Targets');
     
     const itemName = 'Opportunity Attack';
     let compendium = game.packs.get("gambits-premades.gps-generic-features");
@@ -12,120 +11,75 @@ async function enableOpportunityAttack(combat, combatEvent) {
     let newItem = await compendium.getDocument(itemEntry._id);
     if (!newItem) return console.error("Failed to retrieve item from compendium");
 
-    const { npcs, pcs } = await categorizeCombatants(combat);
-    
-    // Process based on settings
-    switch (targetSetting) {
-        case 0: // Friendlies
-            await processCombatants(pcs);
-            break;
-        case 1: // Enemies
-            await processCombatants(npcs);
-            break;
-        case 2: // Both
-            await processCombatants([...npcs, ...pcs]);
-            break;
-        default:
-            // No action for "None" or undefined setting
-            break;
-    }
+    await categorizeCombatants(combat);
 
-    async function processCombatants(combatants) {
-        for (let combatant of combatants) {
+    async function categorizeCombatants(combat) {
+        async function processCombatant(combatant) {
+            if (combatant.actor.type === 'npc' || combatant.actor.type === 'character') {
+                const itemsToDelete = combatant.actor.items.filter(item => item.name === itemName);
+                const itemIdsToDelete = itemsToDelete.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);
+                }
+    
+                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");
+    
                 await combatant.actor.createEmbeddedDocuments("Item", [newItem.toObject()]);
                 await combatant.actor.items.getName("Opportunity Attack").use();
+            }
         }
-    }
-
-    async function categorizeCombatants(combat) {
-        let npcs = [];
-        let pcs = [];
-        
+    
         if(combatEvent === "startCombat") {
             for (let combatant of combat.combatants.values()) {
-                if (combatant.actor.type === 'npc' || combatant.actor.type === 'character') {
-                    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) {
-                        npcs.push(combatant);
-                    } else if (combatant.token.disposition === 1) {
-                        pcs.push(combatant);
-                    }
-                }
+                await processCombatant(combatant);
             }
         }
-
+    
         if(combatEvent === "enterCombat") {
             let combatant = combat;
-                if (combatant.actor.type === 'npc' || combatant.actor.type === 'character') {
-                    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) {
-                        npcs.push(combatant);
-                    } else if (combatant.token.disposition === 1) {
-                        pcs.push(combatant);
-                    }
-                }
+            await processCombatant(combatant);
         }
-
-        return { npcs, pcs };
     }
 };
 
 async function disableOpportunityAttack(combat, combatEvent) {
-    if(!game.user.isGM) return;
+    if (!game.user.isGM) return;
     if (game.settings.get('gambits-premades', 'Enable Opportunity Attack') === false) return;
     const itemName = 'Opportunity Attack';
 
-    if(combatEvent === "endCombat") {    
-        for (let combatant of combat.combatants.values()) {
-            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");
-        }
-    }
-
-    if(combatEvent === "exitCombat") {       
-        let combatant = combat;
+    async function processCombatant(combatant) {
         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");
+        let templateData = templateFlag ? await fromUuid(templateFlag) : null;
 
         if (itemIdsToDelete.length > 0) {
             await combatant.actor.deleteEmbeddedDocuments("Item", itemIdsToDelete);
         }
 
-        let templateData = await fromUuid(templateFlag);
-        templateData.delete();
-
+        if (templateData) await 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 (checkRiposteFlag) await combatant.actor.unsetFlag("midi-qol", "checkRiposteDecision");
+        if (checkBraceFlag) await combatant.actor.unsetFlag("midi-qol", "checkBraceDecision");
+    }
+
+    if (combatEvent === "endCombat") {
+        for (let combatant of combat.combatants.values()) {
+            await processCombatant(combatant);
+        }
+    }
+
+    if (combatEvent === "exitCombat") {
+        let combatant = combat;
+        await processCombatant(combatant);
     }
 };
 
diff --git a/scripts/settings.js b/scripts/settings.js
index fc6fed78..ee099912 100644
--- a/scripts/settings.js
+++ b/scripts/settings.js
@@ -1,11 +1,4 @@
 function registerSettings() {
-    // Sub-settings for target selection
-    const targetOptions = {
-        0: "Friendlies",
-        1: "Enemies",
-        2: "Both"
-    };
-
     game.settings.register('gambits-premades', 'Enable Opportunity Attack', {
         name: "Enable Opportunity Attack",
         hint: "If enabled, automatically adds 'Opportunity Attack' item to appropriate combatants on combat start and removes 'Opportunity Attack' item on combat end.",
@@ -15,15 +8,6 @@ function registerSettings() {
         default: false
     });
 
-    game.settings.register('gambits-premades', 'Opportunity Attack Targets', {
-        name: "Opportunity Attack Targets",
-        scope: 'world',
-        config: true,
-        type: Number,
-        choices: targetOptions,
-        default: 2 // Default to "Both"
-    });
-
     game.settings.register('gambits-premades', 'Opportunity Attack Timeout', {
         name: "Opportunity Attack Timeout",
         hint: "Enter custom number (in seconds). Default timeout value is 15 seconds.",