diff --git a/build.gradle b/build.gradle
index d0c2fdb..d33f718 100644
--- a/build.gradle
+++ b/build.gradle
@@ -127,9 +127,16 @@ repositories {
         }
     }
     maven {
-        url "https://jitpack.io"
+        url "https://maven.latvian.dev/releases"
         content {
-            includeGroup "com.github.llamalad7.mixinextras"
+            includeGroup "dev.latvian.mods"
+            includeGroup "dev.latvian.apps"
+        }
+    }
+    maven {
+        url 'https://jitpack.io'
+        content {
+            includeGroup "com.github.rtyley"
         }
     }
 
@@ -155,7 +162,7 @@ repositories {
 dependencies {
     implementation 'org.jetbrains:annotations:22.0.0'
 
-    jarJar(implementation("com.oierbravo.mechanicals:Mechanicals:${mechanicals}"))
+    jarJar(implementation("com.oierbravo.mechanicals:Mechanicals:${minecraft_version}-${mechanicals}"))
 
     implementation("com.simibubi.create:create-${minecraft_version}:${create_version}:slim") { transitive = false }
     implementation("net.createmod.ponder:ponder-neoforge:${ponder_version}+mc${minecraft_version}")
@@ -179,7 +186,6 @@ dependencies {
     if (kubejs_enabled.toBoolean()) {
         api("dev.latvian.mods:kubejs-neoforge:$kubejs_version")
         interfaceInjectionData("dev.latvian.mods:kubejs-neoforge:$kubejs_version") // optional
-        compileOnly("dev.architectury:architectury-neoforge:$architectury_version")
     }
 
 }
diff --git a/gradle.properties.jinja b/gradle.properties.jinja
index 03df4f6..69634e4 100644
--- a/gradle.properties.jinja
+++ b/gradle.properties.jinja
@@ -41,10 +41,7 @@ cc_tweaked_minecraft_version = 1.21.1
 cc_tweaked_version = 1.114.2
 
 kubejs_enabled=true
-kubejs_version=2101.7.2-build.295
-rhino_version=2101.2.7-build.81
-architectury_version=13.0.2
-architectury_version=13.0.2
+kubejs_version=2101.7.2-build.348
 mixin_extras_version = 0.4.1
 
 
diff --git a/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/ModLang.java.jinja b/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/ModLang.java.jinja
index e5e74dd..255a09e 100644
--- a/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/ModLang.java.jinja
+++ b/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/ModLang.java.jinja
@@ -1,4 +1,4 @@
-package com.oierbravo.{{MECHANICAL_ID}}.foundation.utility;
+package com.oierbravo.{{MECHANICAL_ID}};
 
 import com.oierbravo.{{MECHANICAL_ID}}.ModConstants;
 import net.createmod.catnip.lang.Lang;
diff --git a/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/infrastructure/data/ModDataGen.java.jinja b/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/infrastructure/data/ModDataGen.java.jinja
index e1d0c2a..cc0e5f6 100644
--- a/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/infrastructure/data/ModDataGen.java.jinja
+++ b/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/infrastructure/data/ModDataGen.java.jinja
@@ -13,11 +13,11 @@ public class ModDataGen {
 
         DataGenerator generator = event.getGenerator();
         PackOutput output = generator.getPackOutput();
+        CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();
 
         if (event.includeServer()) {
-            //generator.addProvider(true, new ExamplenRecipeGen(output, event.getLookupProvider()));
+            //generator.addProvider(true, new ExamplenRecipeGen(output, lookupProvider));
 
         }
-        event.getGenerator().addProvider(true, {{MECHANICAL_MAIN_CLASS}}.registrate().setDataProvider(new RegistrateDataProvider({{MECHANICAL_MAIN_CLASS}}.registrate(), ModConstants.MODID, event)));
     }
 }
diff --git a/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/registrate/ModBlocks.java.jinja b/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/registrate/ModBlocks.java.jinja
index 4532705..79e2ed3 100644
--- a/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/registrate/ModBlocks.java.jinja
+++ b/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/registrate/ModBlocks.java.jinja
@@ -1,7 +1,7 @@
 package com.oierbravo.{{MECHANICAL_ID}}.registrate;
 
 import com.oierbravo.{{MECHANICAL_ID}}.ModConstants;
-import com.oierbravo.{{MECHANICAL_ID}}.infrastucture.config.ModStress;
+import com.oierbravo.{{MECHANICAL_ID}}.infrastructure.config.ModStress;
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.AllTags;
 import com.simibubi.create.foundation.data.AssetLookup;
diff --git a/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/registrate/ModItems.java.jinja b/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/registrate/ModItems.java.jinja
index c46763b..05e9f25 100644
--- a/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/registrate/ModItems.java.jinja
+++ b/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/registrate/ModItems.java.jinja
@@ -4,7 +4,7 @@ import com.oierbravo.{{MECHANICAL_ID}}.ModConstants;
 import com.simibubi.create.AllItems;
 import com.simibubi.create.AllTags;
 import com.simibubi.create.foundation.data.AssetLookup;
-import com.simibubi.create.foundation.data.recipe.CompatMetals;
+import com.simibubi.create.foundation.data.recipe.CommonMetal;
 import com.simibubi.create.foundation.item.TagDependentIngredientItem;
 import com.tterrag.registrate.providers.RegistrateRecipeProvider;
 import com.tterrag.registrate.util.entry.ItemEntry;
diff --git a/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/{{MECHANICAL_MAIN_CLASS}}.java.jinja b/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/{{MECHANICAL_MAIN_CLASS}}.java.jinja
index 7a7efc8..d967c75 100644
--- a/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/{{MECHANICAL_MAIN_CLASS}}.java.jinja
+++ b/src/main/java/com/oierbravo/{{MECHANICAL_ID}}/{{MECHANICAL_MAIN_CLASS}}.java.jinja
@@ -2,7 +2,7 @@ package com.oierbravo.{{MECHANICAL_ID}};
 
 import com.mojang.logging.LogUtils;
 import com.oierbravo.{{MECHANICAL_ID}}.infrastructure.data.ModDataGen;
-import com.oierbravo.{{MECHANICAL_ID}}.infrastucture.config.MConfigs;
+import com.oierbravo.{{MECHANICAL_ID}}.infrastructure.config.MConfigs;
 import com.oierbravo.{{MECHANICAL_ID}}.ponders.ModPonderPlugin;
 import com.oierbravo.{{MECHANICAL_ID}}.registrate.*;
 import com.oierbravo.mechanicals.utility.RegistrateLangBuilder;