diff --git a/gradle.properties b/gradle.properties
index b456c87..5fb8683 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ fabric_api_version=0.102.0+1.21.1
 # Mod
 maven_group=net
 archives_base_name=wizards
-mod_version=2.2.5
+mod_version=2.3.0
 minecraft_compat_version=1.21
 
 # Dependencies
@@ -22,8 +22,8 @@ tiny_config_version=2.3.2
 runes_version=1.0.3+1.21.1
 structure_pool_api_version=1.1.3+1.21.1
 
-spell_engine_version=1.1.1+1.21.1
-spell_power_version=1.0.5+1.21.1
+spell_engine_version=1.4.0+1.21.1
+spell_power_version=1.1.2+1.21.1
 cloth_config_version=15.0.130
 player_anim_version=2.0.0-alpha1+1.21
 trinkets_version=3.10.0
\ No newline at end of file
diff --git a/src/main/java/net/wizards/client/effect/FrozenParticles.java b/src/main/java/net/wizards/client/effect/FrozenParticles.java
index db7f687..1350246 100644
--- a/src/main/java/net/wizards/client/effect/FrozenParticles.java
+++ b/src/main/java/net/wizards/client/effect/FrozenParticles.java
@@ -2,7 +2,7 @@
 
 import net.minecraft.entity.LivingEntity;
 import net.spell_engine.api.effect.CustomParticleStatusEffect;
-import net.spell_engine.api.spell.ParticleBatch;
+import net.spell_engine.api.spell.fx.ParticleBatch;
 import net.spell_engine.particle.ParticleHelper;
 
 public class FrozenParticles implements CustomParticleStatusEffect.Spawner {
diff --git a/src/main/java/net/wizards/client/effect/FrozenRenderer.java b/src/main/java/net/wizards/client/effect/FrozenRenderer.java
index 6974d68..4be7e40 100644
--- a/src/main/java/net/wizards/client/effect/FrozenRenderer.java
+++ b/src/main/java/net/wizards/client/effect/FrozenRenderer.java
@@ -3,17 +3,13 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.Identifier;
 import net.spell_engine.api.effect.CustomModelStatusEffect;
-import net.spell_engine.api.effect.CustomParticleStatusEffect;
 import net.spell_engine.api.render.CustomLayers;
 import net.spell_engine.api.render.CustomModels;
 import net.spell_engine.api.render.LightEmission;
-import net.spell_engine.api.spell.ParticleBatch;
-import net.spell_engine.particle.ParticleHelper;
 import net.wizards.WizardsMod;
 
 public class FrozenRenderer implements CustomModelStatusEffect.Renderer {
diff --git a/src/main/resources/data/spell_engine/tags/spell/treasure.json b/src/main/resources/data/spell_engine/tags/spell/treasure.json
new file mode 100644
index 0000000..9d6de5c
--- /dev/null
+++ b/src/main/resources/data/spell_engine/tags/spell/treasure.json
@@ -0,0 +1,7 @@
+{
+  "values": [
+    "#wizards:arcane",
+    "#wizards:fire",
+    "#wizards:frost"
+  ]
+}
\ No newline at end of file
diff --git a/src/main/resources/data/wizards/spells/arcane_beam.json b/src/main/resources/data/wizards/spell/arcane_beam.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/arcane_beam.json
rename to src/main/resources/data/wizards/spell/arcane_beam.json
diff --git a/src/main/resources/data/wizards/spells/arcane_blast.json b/src/main/resources/data/wizards/spell/arcane_blast.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/arcane_blast.json
rename to src/main/resources/data/wizards/spell/arcane_blast.json
diff --git a/src/main/resources/data/wizards/spells/arcane_blink.json b/src/main/resources/data/wizards/spell/arcane_blink.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/arcane_blink.json
rename to src/main/resources/data/wizards/spell/arcane_blink.json
diff --git a/src/main/resources/data/wizards/spells/arcane_bolt.json b/src/main/resources/data/wizards/spell/arcane_bolt.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/arcane_bolt.json
rename to src/main/resources/data/wizards/spell/arcane_bolt.json
diff --git a/src/main/resources/data/wizards/spells/arcane_missile.json b/src/main/resources/data/wizards/spell/arcane_missile.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/arcane_missile.json
rename to src/main/resources/data/wizards/spell/arcane_missile.json
diff --git a/src/main/resources/data/wizards/spells/fire_blast.json b/src/main/resources/data/wizards/spell/fire_blast.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/fire_blast.json
rename to src/main/resources/data/wizards/spell/fire_blast.json
diff --git a/src/main/resources/data/wizards/spells/fire_breath.json b/src/main/resources/data/wizards/spell/fire_breath.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/fire_breath.json
rename to src/main/resources/data/wizards/spell/fire_breath.json
diff --git a/src/main/resources/data/wizards/spells/fire_meteor.json b/src/main/resources/data/wizards/spell/fire_meteor.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/fire_meteor.json
rename to src/main/resources/data/wizards/spell/fire_meteor.json
diff --git a/src/main/resources/data/wizards/spells/fire_scorch.json b/src/main/resources/data/wizards/spell/fire_scorch.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/fire_scorch.json
rename to src/main/resources/data/wizards/spell/fire_scorch.json
diff --git a/src/main/resources/data/wizards/spells/fire_wall.json b/src/main/resources/data/wizards/spell/fire_wall.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/fire_wall.json
rename to src/main/resources/data/wizards/spell/fire_wall.json
diff --git a/src/main/resources/data/wizards/spells/fireball.json b/src/main/resources/data/wizards/spell/fireball.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/fireball.json
rename to src/main/resources/data/wizards/spell/fireball.json
diff --git a/src/main/resources/data/wizards/spells/frost_blizzard.json b/src/main/resources/data/wizards/spell/frost_blizzard.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/frost_blizzard.json
rename to src/main/resources/data/wizards/spell/frost_blizzard.json
diff --git a/src/main/resources/data/wizards/spells/frost_nova.json b/src/main/resources/data/wizards/spell/frost_nova.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/frost_nova.json
rename to src/main/resources/data/wizards/spell/frost_nova.json
diff --git a/src/main/resources/data/wizards/spells/frost_shard.json b/src/main/resources/data/wizards/spell/frost_shard.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/frost_shard.json
rename to src/main/resources/data/wizards/spell/frost_shard.json
diff --git a/src/main/resources/data/wizards/spells/frost_shield.json b/src/main/resources/data/wizards/spell/frost_shield.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/frost_shield.json
rename to src/main/resources/data/wizards/spell/frost_shield.json
diff --git a/src/main/resources/data/wizards/spells/frostbolt.json b/src/main/resources/data/wizards/spell/frostbolt.json
similarity index 100%
rename from src/main/resources/data/wizards/spells/frostbolt.json
rename to src/main/resources/data/wizards/spell/frostbolt.json
diff --git a/src/main/resources/data/wizards/spell_pools/arcane.json b/src/main/resources/data/wizards/tags/spell/arcane.json
similarity index 87%
rename from src/main/resources/data/wizards/spell_pools/arcane.json
rename to src/main/resources/data/wizards/tags/spell/arcane.json
index ae3c326..4f76358 100644
--- a/src/main/resources/data/wizards/spell_pools/arcane.json
+++ b/src/main/resources/data/wizards/tags/spell/arcane.json
@@ -1,5 +1,5 @@
 {
-  "spell_ids": [
+  "values": [
     "wizards:arcane_missile",
     "wizards:arcane_blast",
     "wizards:arcane_beam",
diff --git a/src/main/resources/data/wizards/spell_pools/fire.json b/src/main/resources/data/wizards/tags/spell/fire.json
similarity index 86%
rename from src/main/resources/data/wizards/spell_pools/fire.json
rename to src/main/resources/data/wizards/tags/spell/fire.json
index 075ae70..6312493 100644
--- a/src/main/resources/data/wizards/spell_pools/fire.json
+++ b/src/main/resources/data/wizards/tags/spell/fire.json
@@ -1,5 +1,5 @@
 {
-  "spell_ids": [
+  "values": [
     "wizards:fire_blast",
     "wizards:fire_breath",
     "wizards:fire_meteor",
diff --git a/src/main/resources/data/wizards/spell_pools/frost.json b/src/main/resources/data/wizards/tags/spell/frost.json
similarity index 87%
rename from src/main/resources/data/wizards/spell_pools/frost.json
rename to src/main/resources/data/wizards/tags/spell/frost.json
index 861ab45..ffc1b77 100644
--- a/src/main/resources/data/wizards/spell_pools/frost.json
+++ b/src/main/resources/data/wizards/tags/spell/frost.json
@@ -1,5 +1,5 @@
 {
-  "spell_ids": [
+  "values": [
     "wizards:frostbolt",
     "wizards:frost_nova",
     "wizards:frost_shield",