diff --git a/README.md b/README.md
index be7202ac..37ae8979 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## What is Dimensional Expansion?
 
-Dimensional Expansion is a Minecraft mod avaliable on NeoForge who adds new tools and weapons for your gears, blocks and for builders, items with special poperities and the main feature that is currenly in progress is a new dimension with dungeons, villages and other structures.
+Dimensional Expansion is a Minecraft mod available on NeoForge who adds new tools and weapons for your gears, blocks and for builders, items with special properties and the main feature that is currenly in progress is a new dimension with dungeons, villages and other structures.
 
 The mod got currently an OST made my me(of course) that also working in progress but you can see some preview [here](https://soundcloud.com/killarexe).
 
@@ -18,15 +18,9 @@ The mod got currently an OST made my me(of course) that also working in progress
 [![Curseforge](http://cf.way2muchnoise.eu/full_453574_downloads.svg)](https://www.curseforge.com/minecraft/mc-mods/dimensional-expansion)
 [![ModRinth](https://img.shields.io/modrinth/dt/FSZZfnxw?logo=modrinth)](https://modrinth.com/mod/dimensional-expansion)
 
-Also You can find a Trello bord [here](https://trello.com/b/kfmjAh6g/dimensional-expansion)
-
 ## Wiki:
 
-You can chek the wiki [here](https://github.com/Killarexe/Dimensional-Expansion/wiki).
-
-## How to add as a library
-
-On the wiki you can find a **_simple_** tutorial how to add Dimensional Expansion as a dependency just [here](https://github.com/Killarexe/Dimensional-Expansion/wiki/Setup-as-a-dependency).
+You can check the wiki [here](https://github.com/Killarexe/Dimensional-Expansion/wiki).
 
 ## My Projects:
 
diff --git a/src/main/java/net/killarexe/dimensional_expansion/common/entity/Juger.java b/src/main/java/net/killarexe/dimensional_expansion/common/entity/Juger.java
index 494d407e..260d7bd2 100644
--- a/src/main/java/net/killarexe/dimensional_expansion/common/entity/Juger.java
+++ b/src/main/java/net/killarexe/dimensional_expansion/common/entity/Juger.java
@@ -64,9 +64,9 @@ public void aiStep() {
 	
 	@Override
 	protected void defineSynchedData(SynchedEntityData.Builder builder) {
+		builder.define(IS_ATTACKING, false);
+		builder.define(ATTACK_COOLDOWN, tickCount);
 		super.defineSynchedData(builder);
-		entityData.set(IS_ATTACKING, false);
-		entityData.set(ATTACK_COOLDOWN, tickCount);
 	}
 	
 	@Override
diff --git a/src/main/java/net/killarexe/dimensional_expansion/common/entity/Mouvet.java b/src/main/java/net/killarexe/dimensional_expansion/common/entity/Mouvet.java
index 706b1a59..b11439e9 100644
--- a/src/main/java/net/killarexe/dimensional_expansion/common/entity/Mouvet.java
+++ b/src/main/java/net/killarexe/dimensional_expansion/common/entity/Mouvet.java
@@ -53,7 +53,7 @@ protected void registerGoals() {
 	
 	@Override
 	protected void defineSynchedData(SynchedEntityData.Builder builder) {
-		entityData.set(CURRENT_ITEM, ItemStack.EMPTY);
+		builder.define(CURRENT_ITEM, ItemStack.EMPTY);
 		super.defineSynchedData(builder);
 	}
 	
diff --git a/src/main/resources/data/dimensional_expansion/dimension_type/origin.json b/src/main/resources/data/dimensional_expansion/dimension_type/origin.json
index 482f0760..1f0fab19 100644
--- a/src/main/resources/data/dimensional_expansion/dimension_type/origin.json
+++ b/src/main/resources/data/dimensional_expansion/dimension_type/origin.json
@@ -16,10 +16,8 @@
 	"height": 384,
 	"monster_spawn_light_level": {
 		"type": "minecraft:uniform",
-		"value": {
-			"min_inclusive": 0,
-			"max_inclusive": 7
-		}
+		"min_inclusive": 0,
+		"max_inclusive": 7
 	},
 	"monster_spawn_block_light_limit": 0
 }
\ No newline at end of file
diff --git a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_bassmite_ore.json b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_bassmite_ore.json
similarity index 78%
rename from src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_bassmite_ore.json
rename to src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_bassmite_ore.json
index 7ae850c5..9410f365 100644
--- a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_bassmite_ore.json
+++ b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_bassmite_ore.json
@@ -1,5 +1,5 @@
 {
-  "type": "forge:add_features",
+  "type": "neoforge:add_features",
   "biomes": "#minecraft:is_overworld",
   "features": "dimensional_expansion:bassmite_ore_placed",
   "step": "underground_ores"
diff --git a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_emertyst_ore.json b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_emertyst_ore.json
similarity index 79%
rename from src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_emertyst_ore.json
rename to src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_emertyst_ore.json
index 2336b7f5..cd1fad79 100644
--- a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_emertyst_ore.json
+++ b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_emertyst_ore.json
@@ -1,5 +1,5 @@
 {
-  "type": "forge:add_features",
+  "type": "neoforge:add_features",
   "biomes": "#dimensional_expansion:is_origin",
   "features": "dimensional_expansion:emertyst_ore_placed",
   "step": "underground_ores"
diff --git a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_palon_ore.json b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_palon_ore.json
similarity index 77%
rename from src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_palon_ore.json
rename to src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_palon_ore.json
index 12703c23..385db252 100644
--- a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_palon_ore.json
+++ b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_palon_ore.json
@@ -1,5 +1,5 @@
 {
-  "type": "forge:add_features",
+  "type": "neoforge:add_features",
   "biomes": "#minecraft:is_end",
   "features": "dimensional_expansion:palon_ore_placed",
   "step": "underground_ores"
diff --git a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_purple_berry_bush.json b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_purple_berry_bush.json
similarity index 80%
rename from src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_purple_berry_bush.json
rename to src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_purple_berry_bush.json
index 96f62336..9bb21c0f 100644
--- a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_purple_berry_bush.json
+++ b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_purple_berry_bush.json
@@ -1,5 +1,5 @@
 {
-  "type": "forge:add_features",
+  "type": "neoforge:add_features",
   "biomes": "dimensional_expansion:purpleheart_forest",
   "features": "dimensional_expansion:purple_berry_bush",
   "step": "vegetal_decoration"
diff --git a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_simix_ore.json b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_simix_ore.json
similarity index 77%
rename from src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_simix_ore.json
rename to src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_simix_ore.json
index 1042779d..d4166cfb 100644
--- a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/add_simix_ore.json
+++ b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/add_simix_ore.json
@@ -1,5 +1,5 @@
 {
-  "type": "forge:add_features",
+  "type": "neoforge:add_features",
   "biomes": "#minecraft:is_nether",
   "features": "dimensional_expansion:simix_ore_placed",
   "step": "underground_ores"
diff --git a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/spawn_headed_skeleton.json b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/spawn_headed_skeleton.json
similarity index 83%
rename from src/main/resources/data/dimensional_expansion/forge/biome_modifier/spawn_headed_skeleton.json
rename to src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/spawn_headed_skeleton.json
index 1e427571..3b558784 100644
--- a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/spawn_headed_skeleton.json
+++ b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/spawn_headed_skeleton.json
@@ -1,5 +1,5 @@
 {
-	"type": "forge:add_spawns",
+	"type": "neoforge:add_spawns",
 	"biomes": "#dimensional_expansion:is_origin",
 	"spawners": {
 		"type": "dimensional_expansion:mouvet",
diff --git a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/spawn_juger.json b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/spawn_juger.json
similarity index 83%
rename from src/main/resources/data/dimensional_expansion/forge/biome_modifier/spawn_juger.json
rename to src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/spawn_juger.json
index 4f319011..eb4a4b57 100644
--- a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/spawn_juger.json
+++ b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/spawn_juger.json
@@ -1,5 +1,5 @@
 {
-	"type": "forge:add_spawns",
+	"type": "neoforge:add_spawns",
 	"biomes": "#dimensional_expansion:is_origin",
 	"spawners": {
 		"type": "dimensional_expansion:headed_skeleton",
diff --git a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/spawn_mouvet.json b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/spawn_mouvet.json
similarity index 83%
rename from src/main/resources/data/dimensional_expansion/forge/biome_modifier/spawn_mouvet.json
rename to src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/spawn_mouvet.json
index 5026bfbc..075fcb9f 100644
--- a/src/main/resources/data/dimensional_expansion/forge/biome_modifier/spawn_mouvet.json
+++ b/src/main/resources/data/dimensional_expansion/neoforge/biome_modifier/spawn_mouvet.json
@@ -1,5 +1,5 @@
 {
-	"type": "forge:add_spawns",
+	"type": "neoforge:add_spawns",
 	"biomes": "#dimensional_expansion:is_origin",
 	"spawners": {
 		"type": "dimensional_expansion:juger",
diff --git a/src/main/resources/data/dimensional_expansion/worldgen/biome/blue_sand_desert.json b/src/main/resources/data/dimensional_expansion/worldgen/biome/blue_sand_desert.json
index 4b56ec78..0a144240 100644
--- a/src/main/resources/data/dimensional_expansion/worldgen/biome/blue_sand_desert.json
+++ b/src/main/resources/data/dimensional_expansion/worldgen/biome/blue_sand_desert.json
@@ -8,7 +8,7 @@
     "water_color": 4159204,
     "water_fog_color": 329011,
     "music": {
-      "sound": "dimensional_expansion:the_origin",
+      "sound": "dimensional_expansion:music.origin",
       "min_delay": 12000,
       "max_delay": 24000,
       "replace_current_music": true
diff --git a/src/main/resources/data/dimensional_expansion/worldgen/biome/origin_deadland.json b/src/main/resources/data/dimensional_expansion/worldgen/biome/origin_deadland.json
index f043bfab..d1a4ca91 100644
--- a/src/main/resources/data/dimensional_expansion/worldgen/biome/origin_deadland.json
+++ b/src/main/resources/data/dimensional_expansion/worldgen/biome/origin_deadland.json
@@ -8,7 +8,7 @@
     "water_color": 4159204,
     "water_fog_color": 329011,
     "music": {
-      "sound": "dimensional_expansion:the_origin",
+      "sound": "dimensional_expansion:music.origin",
       "min_delay": 12000,
       "max_delay": 24000,
       "replace_current_music": true
diff --git a/src/main/resources/data/dimensional_expansion/worldgen/biome/origin_plains.json b/src/main/resources/data/dimensional_expansion/worldgen/biome/origin_plains.json
index d2093e84..26b62768 100644
--- a/src/main/resources/data/dimensional_expansion/worldgen/biome/origin_plains.json
+++ b/src/main/resources/data/dimensional_expansion/worldgen/biome/origin_plains.json
@@ -14,7 +14,7 @@
       "offset": 2
     },
     "music": {
-      "sound": "dimensional_expansion:the_origin",
+      "sound": "dimensional_expansion:music.origin",
       "min_delay": 12000,
       "max_delay": 24000,
       "replace_current_music": true
diff --git a/src/main/resources/data/dimensional_expansion/worldgen/biome/purpleheart_forest.json b/src/main/resources/data/dimensional_expansion/worldgen/biome/purpleheart_forest.json
index 12f580dd..6dd883e8 100644
--- a/src/main/resources/data/dimensional_expansion/worldgen/biome/purpleheart_forest.json
+++ b/src/main/resources/data/dimensional_expansion/worldgen/biome/purpleheart_forest.json
@@ -14,7 +14,7 @@
       "offset": 2
     },
     "music": {
-      "sound": "dimensional_expansion:the_origin",
+      "sound": "dimensional_expansion:music.origin",
       "min_delay": 12000,
       "max_delay": 24000,
       "replace_current_music": true
diff --git a/src/main/resources/data/dimensional_expansion/worldgen/configured_feature/purpleish_cactus_configured.json b/src/main/resources/data/dimensional_expansion/worldgen/configured_feature/purpleish_cactus_configured.json
index 73bc2bf7..aeb33080 100644
--- a/src/main/resources/data/dimensional_expansion/worldgen/configured_feature/purpleish_cactus_configured.json
+++ b/src/main/resources/data/dimensional_expansion/worldgen/configured_feature/purpleish_cactus_configured.json
@@ -18,10 +18,8 @@
 						{
 							"height": {
 								"type": "minecraft:biased_to_bottom",
-								"value": {
-									"min_inclusive": 1,
-									"max_inclusive": 3
-								}
+								"min_inclusive": 1,
+								"max_inclusive": 3
 							},
 							"provider": {
 								"type": "minecraft:simple_state_provider",