diff --git a/kubejs/assets/gtceu/lang/ja_jp.json b/kubejs/assets/gtceu/lang/ja_jp.json
index 7478623bd..aac612f83 100644
--- a/kubejs/assets/gtceu/lang/ja_jp.json
+++ b/kubejs/assets/gtceu/lang/ja_jp.json
@@ -1437,5 +1437,5 @@
     "material.gtceu.einsteinium_253": "アインシュタニウム 253",
     "material.gtceu.fermium": "フェルミウム 257",
 
-    "block.gtceu.theta2Removals.tooltip": "§4§l非推奨。Theta 2で削除される予定である。",
+    "block.gtceu.theta2Removals.tooltip": "§4§l非推奨。Theta 2で削除される予定である。"
 }
\ No newline at end of file
diff --git a/kubejs/assets/gtceu/ui/recipe_type/advanced_machine_facility.rtui b/kubejs/assets/gtceu/ui/recipe_type/advanced_machine_facility.rtui
new file mode 100644
index 000000000..3b53381b1
Binary files /dev/null and b/kubejs/assets/gtceu/ui/recipe_type/advanced_machine_facility.rtui differ
diff --git a/kubejs/assets/gtceu/ui/recipe_type/circuit_facility.rtui b/kubejs/assets/gtceu/ui/recipe_type/circuit_facility.rtui
new file mode 100644
index 000000000..1021338b9
Binary files /dev/null and b/kubejs/assets/gtceu/ui/recipe_type/circuit_facility.rtui differ
diff --git a/kubejs/assets/gtceu/ui/recipe_type/component_chamber.rtui b/kubejs/assets/gtceu/ui/recipe_type/component_chamber.rtui
new file mode 100644
index 000000000..4dc68dd78
Binary files /dev/null and b/kubejs/assets/gtceu/ui/recipe_type/component_chamber.rtui differ
diff --git a/kubejs/assets/gtceu/ui/recipe_type/simple_machine_facility.rtui b/kubejs/assets/gtceu/ui/recipe_type/simple_machine_facility.rtui
new file mode 100644
index 000000000..549f2df75
Binary files /dev/null and b/kubejs/assets/gtceu/ui/recipe_type/simple_machine_facility.rtui differ
diff --git a/kubejs/server_scripts/hardmode/Resource_Gen/blast_furnaces.js b/kubejs/server_scripts/hardmode/Resource_Gen/blast_furnaces.js
index bbc8c170c..9041cb374 100644
--- a/kubejs/server_scripts/hardmode/Resource_Gen/blast_furnaces.js
+++ b/kubejs/server_scripts/hardmode/Resource_Gen/blast_furnaces.js
@@ -31,7 +31,7 @@ ServerEvents.recipes(event => {
 			.blasting(`gtceu:${dust}_ingot`, `gtceu:${dust}_dust`)
 			.id(`start:blasting/${dust}_dust_manual_only`);
         // event.recipes.gtceu
-		// 	.gt_blasting(id(`${dust}_from_dust`))
+		// 	.electric_vanilla_blast_furnace(id(`${dust}_from_dust`))
         //     .itemInputs(`gtceu:${dust}_dust`)
         //     .itemOutputs(`gtceu:${dust}_ingot`)
         //     .duration(100)
@@ -43,7 +43,7 @@ ServerEvents.recipes(event => {
     //         let InItem = ParseBlast.inputs.item[0].content;
     //         let OutItem = ParseBlast.outputs.item[0].content;
 
-    //     event.recipes.gtceu.gt_blasting(id(`smelt_${OutItem.value.item}_from_${InItem.value.item}`))
+    //     event.recipes.gtceu.electric_vanilla_blast_furnace(id(`smelt_${OutItem.value.item}_from_${InItem.value.item}`))
     //         .itemInputs(InItem.ingredient.item)
     //         .itemOutputs(OutItem.ingredient.item)
     //         .duration(100)
@@ -84,7 +84,7 @@ ServerEvents.recipes(event => {
 
     event.recipes.gtceu.assembler(id('solid_blast_furnace'))
         .itemInputs('gtceu:rugged_alloyer', '2x gtceu:double_steel_plate', '2x gtceu:steel_gear', 
-            '2x #gtceu:circuits/ulv' ,'kubejs:ulv_conveyor_module', 'kubejs:ulv_robot_arm')
+            '2x #gtceu:circuits/ulv' ,'gtceu:ulv_conveyor_module', 'gtceu:ulv_robot_arm')
         .inputFluids('gtceu:tin_alloy 432')
         .itemOutputs('gtceu:solid_blast_furnace')
         .duration(300)
@@ -92,7 +92,7 @@ ServerEvents.recipes(event => {
 
     event.recipes.gtceu.assembler(id('bessemer_forgery'))
         .itemInputs('gtceu:lv_machine_hull','4x gtceu:long_steel_rod','4x #gtceu:circuits/lv','create:basin','2x gtceu:potin_gear',
-            '4x gtceu:small_steel_gear','4x kubejs:ulv_robot_arm','3x kubejs:ulv_electric_pump')
+            '4x gtceu:small_steel_gear','4x gtceu:ulv_robot_arm','3x gtceu:ulv_electric_pump')
         .inputFluids('gtceu:tin_alloy 1152')
         .itemOutputs('gtceu:bessemer_forgery')
         .duration(400)
diff --git a/kubejs/server_scripts/hardmode/Resource_Gen/pre-lv.js b/kubejs/server_scripts/hardmode/Resource_Gen/pre-lv.js
index bde9bb1fe..7064a5f1d 100644
--- a/kubejs/server_scripts/hardmode/Resource_Gen/pre-lv.js
+++ b/kubejs/server_scripts/hardmode/Resource_Gen/pre-lv.js
@@ -290,16 +290,15 @@ ServerEvents.recipes(event => {
 	});
 
 	[0,1,2,3,4].forEach(tier => {
-		let PumpMod = (tier == 0) ? 'kubejs' : 'gtceu' ;
 		let PumpTier = (tier == 0) ? 'ulv' : (tier == 1) ? 'lv' : (tier == 2) ? 'mv' : (tier == 3) ? 'hv' : 'ev' ;
 	event.recipes.gtceu.industrial_pump(id(`water_${tier}`))
-		.notConsumable(`${PumpMod}:${PumpTier}_electric_pump`)
+		.notConsumable(`gtceu:${PumpTier}_electric_pump`)
 		.outputFluids(`minecraft:water ${3000 * ( 2 ** tier )}`)
 		.duration(20);
 	});
 
 	event.recipes.gtceu.assembler(id('industrial_pump'))
-		.itemInputs('1x gtceu:primitive_pump','6x gtceu:double_steel_plate','2x kubejs:ulv_electric_pump',
+		.itemInputs('1x gtceu:primitive_pump','6x gtceu:double_steel_plate','2x gtceu:ulv_electric_pump',
 			'2x #gtceu:circuits/ulv','4x gtceu:rubber_ring')
 		.circuit(3)
 		.inputFluids('gtceu:rubber 288')
diff --git a/kubejs/server_scripts/hardmode/progression/general_progression/casings.js b/kubejs/server_scripts/hardmode/progression/general_progression/casings.js
index 806a2ab76..885fcffa9 100644
--- a/kubejs/server_scripts/hardmode/progression/general_progression/casings.js
+++ b/kubejs/server_scripts/hardmode/progression/general_progression/casings.js
@@ -12,7 +12,7 @@ ServerEvents.recipes(event => {
     const SpecialCasing = (material,tier,f,p,g,e) => {
     let type = (material == 'tungsten_steel') ? 'tungstensteel' : material ;
     if (f == true) {
-        let mod = (type == 'enriched_naquadah') ? 'start_core' : 'gtceu' ;
+        let mod = (type == 'enriched_naquadah') ? 'kubejs' : 'gtceu' ;
     event.recipes.gtceu.assembler(id(`${type}_firebox_casing_hm`))
         .itemInputs(`6x gtceu:${material}_plate`, `6x gtceu:${material}_rod`, `gtceu:${material}_frame`)
         .circuit(2)
@@ -41,7 +41,7 @@ ServerEvents.recipes(event => {
     }
     if (e == true) {
         let casingType = (type == 'titanium') ? 'gtceu:stable' : (type == 'tungstensteel') ? 'gtceu:robust' : `kubejs:${type}` ;
-        let engineType = (type == 'titanium') ? 'gtceu:' : `start_core:${type}_` ;
+        let engineType = (type == 'titanium') ? 'gtceu:' : `kubejs:${type}_` ;
     event.recipes.gtceu.assembler(id(`${engineType.split(':')[1]}engine_intake_casing_hm`))
         .itemInputs(`4x gtceu:${material}_rotor`, `6x gtceu:${material}_normal_fluid_pipe`, `${casingType}_machine_casing`)
         .circuit(7)
@@ -153,7 +153,7 @@ ServerEvents.recipes(event => {
     Hulls('iv','tungsten_steel','platinum','polytetrafluoroethylene',5);
     Hulls('luv','rhodium_plated_palladium','niobium_titanium','polybenzimidazole',6);
     Hulls('zpm','naquadah_alloy','vanadium_gallium','polybenzimidazole',7);
-    Hulls('uv','darmstadium','yttrium_barium_cuprate','polyether_ether_ketone',8);
+    Hulls('uv','darmstadtium','yttrium_barium_cuprate','polyether_ether_ketone',8);
     // Hulls('uhv','neutronium','europium','polyether_ether_ketone',9);
     // Hulls('uev','mythrolic_alloy','cerium_tritelluride','poly_34_ethylenedioxythiophene_polystyrene_sulfate',10);
     // Hulls('uiv','chaotixic_alloy','polonium_bismide','poly_34_ethylenedioxythiophene_polystyrene_sulfate',11);
@@ -171,10 +171,10 @@ ServerEvents.recipes(event => {
     HermeticCasings('hv','stainless_steel','polytetrafluoroethylene',3);
     HermeticCasings('ev','titanium','titanium',4);
     HermeticCasings('iv','tungsten_steel','niobium_titanium',5);
-    HermeticCasings('luv','rhodium_plated_palladium','iridium',6);
-    HermeticCasings('zpm','naquadah_alloy','europium',7);
-    HermeticCasings('uv','darmstadtium','enriched_naquadah',8);
-    HermeticCasings('uhv','neutronium','neutronium',9);
+    // HermeticCasings('luv','rhodium_plated_palladium','iridium',6);
+    // HermeticCasings('zpm','naquadah_alloy','europium',7);
+    // HermeticCasings('uv','darmstadtium','enriched_naquadah',8);
+    // HermeticCasings('uhv','neutronium','neutronium',9);
 
     // Standard Casings
 
diff --git a/kubejs/server_scripts/hardmode/progression/general_progression/circuits.js b/kubejs/server_scripts/hardmode/progression/general_progression/circuits.js
index 0cb8b019d..65b8a01bc 100644
--- a/kubejs/server_scripts/hardmode/progression/general_progression/circuits.js
+++ b/kubejs/server_scripts/hardmode/progression/general_progression/circuits.js
@@ -29,8 +29,8 @@ ServerEvents.recipes(event => { // to be revamped post-theta
 
     // Manufacturing Facility Controller
     event.recipes.gtceu.assembler(id('circuit_manufacturing_facility'))
-        .itemInputs('1x gtceu:lv_machine_hull', '6x #gtceu:circuits/ulv', '6x kubejs:ulv_robot_arm', '3x kubejs:ulv_conveyor_module',
-            '4x gtceu:steel_gear', '2x kubejs:ulv_electric_motor','2x kubejs:ulv_emitter', '4x gtceu:tin_single_cable')
+        .itemInputs('1x gtceu:lv_machine_hull', '6x #gtceu:circuits/ulv', '6x gtceu:ulv_robot_arm', '3x gtceu:ulv_conveyor_module',
+            '4x gtceu:steel_gear', '2x gtceu:ulv_electric_motor','2x kubejs:ulv_emitter', '4x gtceu:tin_single_cable')
         .inputFluids('gtceu:tin 576')
         .itemOutputs('gtceu:circuit_manufacturing_facility')
         .duration(2400)
diff --git a/kubejs/server_scripts/hardmode/progression/general_progression/machines.js b/kubejs/server_scripts/hardmode/progression/general_progression/machines.js
index c3f8ffb9f..66a33e138 100644
--- a/kubejs/server_scripts/hardmode/progression/general_progression/machines.js
+++ b/kubejs/server_scripts/hardmode/progression/general_progression/machines.js
@@ -85,8 +85,8 @@ ServerEvents.recipes(event => {
     // ME Pattern Buffer blanket diabled and ME I/O is in AE-Machinery as a Packmode determinate
 
     event.recipes.gtceu.assembler(id(`machine_facility`))
-        .itemInputs('gtceu:ulv_assembler','6x kubejs:ulv_robot_arm','4x #gtceu:circuits/lv',
-            '2x kubejs:ulv_conveyor_module','2x kubejs:ulv_emitter','2x kubejs:ulv_electric_pump',
+        .itemInputs('gtceu:ulv_assembler','6x gtceu:ulv_robot_arm','4x #gtceu:circuits/lv',
+            '2x gtceu:ulv_conveyor_module','2x kubejs:ulv_emitter','2x gtceu:ulv_electric_pump',
             '2x gtceu:steel_gear','2x gtceu:small_damascus_steel_gear')
         .inputFluids('gtceu:tin 864')
         .itemOutputs(`gtceu:machine_facility`)
diff --git a/kubejs/server_scripts/hardmode/progression/misc.js b/kubejs/server_scripts/hardmode/progression/misc.js
index 69e5d824a..f9b5f463d 100644
--- a/kubejs/server_scripts/hardmode/progression/misc.js
+++ b/kubejs/server_scripts/hardmode/progression/misc.js
@@ -166,7 +166,7 @@ ServerEvents.recipes(event => {
     mold('pill',false,25);
     mold('nugget',false,26);
     mold('anvil',false,27);
-    mold('credit',false,28);
+    // mold('credit',false,28);
     mold('name',false,29);
 
     event.recipes.gtceu.mixer(id('cast_iron_dust'))
diff --git a/kubejs/server_scripts/hardmode/progression/pre_lv/create.js b/kubejs/server_scripts/hardmode/progression/pre_lv/create.js
index bd8c8f725..c7172f05a 100644
--- a/kubejs/server_scripts/hardmode/progression/pre_lv/create.js
+++ b/kubejs/server_scripts/hardmode/progression/pre_lv/create.js
@@ -801,7 +801,7 @@ ServerEvents.recipes(event => {
 		N: 'create_new_age:overcharged_iron_sheet',
 		R: 'gtceu:cast_iron_rod',
 		S: 'create:shaft',
-		M: 'kubejs:ulv_electric_motor',
+		M: 'gtceu:ulv_electric_motor',
 		P: 'gtceu:cast_iron_plate'
 	}).id('start:mechanical_crafter/basic_motor');
 
@@ -970,9 +970,9 @@ ServerEvents.recipes(event => {
 		], {
 			N: 'gtceu:pig_iron_ring',
 			L: 'create:andesite_funnel',
-			A: 'kubejs:ulv_robot_arm',
+			A: 'gtceu:ulv_robot_arm',
 			F: 'gtceu:pig_iron_frame',
-			C: 'kubejs:ulv_conveyor_module',
+			C: 'gtceu:ulv_conveyor_module',
 			R: 'xycraft_world:xychorium_gem_red',
 			B: 'create:bound_cardboard_block',
 			P: 'minecraft:stone_pressure_plate'
@@ -985,9 +985,9 @@ ServerEvents.recipes(event => {
 		], {
 			N: 'gtceu:pig_iron_ring',
 			L: 'create:andesite_funnel',
-			A: 'kubejs:ulv_robot_arm',
+			A: 'gtceu:ulv_robot_arm',
 			F: 'gtceu:pig_iron_frame',
-			C: 'kubejs:ulv_conveyor_module',
+			C: 'gtceu:ulv_conveyor_module',
 			R: 'xycraft_world:xychorium_gem_red',
 			B: 'create:bound_cardboard_block',
 			P: '#minecraft:wooden_pressure_plates'
diff --git a/kubejs/server_scripts/hardmode/progression/pre_lv/misc.js b/kubejs/server_scripts/hardmode/progression/pre_lv/misc.js
index 20e2261b3..1128e3c1c 100644
--- a/kubejs/server_scripts/hardmode/progression/pre_lv/misc.js
+++ b/kubejs/server_scripts/hardmode/progression/pre_lv/misc.js
@@ -211,7 +211,7 @@ ServerEvents.recipes(event => {
 	], {
 		S: 'minecraft:stone',
 		U: '#gtceu:circuits/ulv',
-		P: 'kubejs:ulv_electric_pump',
+		P: 'gtceu:ulv_electric_pump',
 		T: 'gtceu:steel_small_fluid_pipe',
 		B: 'gtceu:ulv_stone_barrel'
 	}).id('start:mechanical_crafting/large_stone_barrel');
@@ -225,7 +225,7 @@ ServerEvents.recipes(event => {
 	], {
 		S: 'gtceu:treated_wood_planks',
 		U: '#gtceu:circuits/ulv',
-		P: 'kubejs:ulv_electric_pump',
+		P: 'gtceu:ulv_electric_pump',
 		T: 'gtceu:lead_small_fluid_pipe',
 		B: 'gtceu:ulv_barrel'
 	}).id('start:mechanical_crafting/large_barrel');
@@ -239,7 +239,7 @@ ServerEvents.recipes(event => {
 	], {
 		S: 'gtceu:treated_wood_planks',
 		U: '#gtceu:circuits/ulv',
-		P: 'kubejs:ulv_conveyor_module',
+		P: 'gtceu:ulv_conveyor_module',
 		T: 'thermal:compost',
 		B: 'thermal:device_composter'
 	}).id('start:mechanical_crafting/large_farm');
diff --git a/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js b/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js
index 783fa0cf8..23c1af80b 100644
--- a/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js
+++ b/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js
@@ -94,10 +94,10 @@ ServerEvents.recipes(event => {
           A: inputs[0],B: inputs[1],C: inputs[2],D: inputs[3],E: inputs[4],F: inputs[5],G: inputs[6],H: inputs[7],I: inputs[8]
       }).id(`start:mechanical_crafting/ulv_${output}`);
     } 
-    UlvMachine('assembler',['kubejs:ulv_robot_arm','#gtceu:circuits/ulv','kubejs:ulv_robot_arm','kubejs:ulv_conveyor_module','gtceu:ulv_machine_hull','kubejs:ulv_conveyor_module','gtceu:red_alloy_single_cable','#gtceu:circuits/ulv','gtceu:red_alloy_single_cable']);
-    UlvMachine('centrifuge',['#gtceu:circuits/ulv','kubejs:ulv_electric_motor','#gtceu:circuits/ulv','gtceu:red_alloy_single_cable','gtceu:ulv_machine_hull','gtceu:red_alloy_single_cable','#gtceu:circuits/ulv','kubejs:ulv_electric_motor','#gtceu:circuits/ulv']);
-    UlvMachine('mixer',['#forge:glass','gtceu:cast_iron_rotor','#forge:glass','#forge:glass','kubejs:ulv_electric_motor','#forge:glass','#gtceu:circuits/ulv','gtceu:ulv_machine_hull','#gtceu:circuits/ulv']);
-    UlvMachine('stirling_generator',['gtceu:tin_alloy_normal_fluid_pipe','#gtceu:circuits/ulv','gtceu:tin_alloy_normal_fluid_pipe','gtceu:cast_iron_rotor','gtceu:ulv_machine_hull','gtceu:cast_iron_rotor','kubejs:ulv_electric_motor','gtceu:red_alloy_single_cable','kubejs:ulv_electric_motor']);
+    UlvMachine('assembler',['gtceu:ulv_robot_arm','#gtceu:circuits/ulv','gtceu:ulv_robot_arm','gtceu:ulv_conveyor_module','gtceu:ulv_machine_hull','gtceu:ulv_conveyor_module','gtceu:red_alloy_single_cable','#gtceu:circuits/ulv','gtceu:red_alloy_single_cable']);
+    UlvMachine('centrifuge',['#gtceu:circuits/ulv','gtceu:ulv_electric_motor','#gtceu:circuits/ulv','gtceu:red_alloy_single_cable','gtceu:ulv_machine_hull','gtceu:red_alloy_single_cable','#gtceu:circuits/ulv','gtceu:ulv_electric_motor','#gtceu:circuits/ulv']);
+    UlvMachine('mixer',['#forge:glass','gtceu:cast_iron_rotor','#forge:glass','#forge:glass','gtceu:ulv_electric_motor','#forge:glass','#gtceu:circuits/ulv','gtceu:ulv_machine_hull','#gtceu:circuits/ulv']);
+    UlvMachine('stirling_generator',['gtceu:tin_alloy_normal_fluid_pipe','#gtceu:circuits/ulv','gtceu:tin_alloy_normal_fluid_pipe','gtceu:cast_iron_rotor','gtceu:ulv_machine_hull','gtceu:cast_iron_rotor','gtceu:ulv_electric_motor','gtceu:red_alloy_single_cable','gtceu:ulv_electric_motor']);
     UlvMachine('charger_4x',['gtceu:lead_quadruple_wire','minecraft:chest','gtceu:lead_quadruple_wire','gtceu:lead_quadruple_wire','gtceu:ulv_machine_hull','gtceu:lead_quadruple_wire','gtceu:red_alloy_single_cable','#gtceu:circuits/ulv','gtceu:red_alloy_single_cable']);
     UlvMachine('battery_buffer_4x',['gtceu:lead_quadruple_wire','minecraft:chest','gtceu:lead_quadruple_wire','gtceu:lead_quadruple_wire','gtceu:ulv_machine_hull','gtceu:lead_quadruple_wire','','','']);
     UlvMachine('battery_buffer_8x',['gtceu:lead_octal_wire','minecraft:chest','gtceu:lead_octal_wire','gtceu:lead_octal_wire','gtceu:ulv_machine_hull','gtceu:lead_octal_wire','','','']);
@@ -119,7 +119,7 @@ ServerEvents.recipes(event => {
 
     let motor = 'gtceu:magnetic_iron_rod'
     event.recipes.create.sequenced_assembly([
-        Item.of(`kubejs:ulv_electric_motor`),
+        Item.of(`gtceu:ulv_electric_motor`),
     ], motor, [
         event.recipes.createDeploying(motor, [motor, 'gtceu:iron_rod']),
         event.recipes.createDeploying(motor, [motor, `gtceu:lead_single_wire`]),
@@ -130,29 +130,29 @@ ServerEvents.recipes(event => {
 
     let conv = 'gtceu:red_alloy_single_cable'
     event.recipes.create.sequenced_assembly([
-        Item.of(`kubejs:ulv_conveyor_module`),
+        Item.of(`gtceu:ulv_conveyor_module`),
     ], conv, [
         event.recipes.createDeploying(conv, [conv, 'create:belt_connector']),
-        event.recipes.createDeploying(conv, [conv, `kubejs:ulv_electric_motor`]),
+        event.recipes.createDeploying(conv, [conv, `gtceu:ulv_electric_motor`]),
         event.recipes.createDeploying(conv, [conv, `create:belt_connector`]),
         event.recipes.createDeploying(conv, [conv, 'gtceu:potin_rod']),
         event.recipes.createDeploying(conv, [conv, `create:belt_connector`])
     ]).transitionalItem(conv).loops(2).id('start:sequenced_assembly/ulv_conveyor_module');
 
-    let arm = 'kubejs:ulv_electric_piston'
+    let arm = 'gtceu:ulv_electric_piston'
     event.recipes.create.sequenced_assembly([
-        Item.of(`kubejs:ulv_robot_arm`),
+        Item.of(`gtceu:ulv_robot_arm`),
     ], arm, [
       event.recipes.createDeploying(arm, [arm, 'gtceu:potin_rod']),
-      event.recipes.createDeploying(arm, [arm, `kubejs:ulv_electric_motor`]),
+      event.recipes.createDeploying(arm, [arm, `gtceu:ulv_electric_motor`]),
       event.recipes.createDeploying(arm, [arm, `gtceu:red_alloy_single_cable`]),
       event.recipes.createDeploying(arm, [arm, `#gtceu:circuits/ulv`]),
       event.recipes.createDeploying(arm, [arm, `gtceu:red_alloy_single_cable`])
     ]).transitionalItem(arm).loops(2).id('start:sequenced_assembly/ulv_robot_arm');
 
-    let pist = 'kubejs:ulv_electric_motor'
+    let pist = 'gtceu:ulv_electric_motor'
     event.recipes.create.sequenced_assembly([
-        Item.of(`kubejs:ulv_electric_piston`),
+        Item.of(`gtceu:ulv_electric_piston`),
     ], pist, [
         event.recipes.createDeploying(pist, [pist, 'gtceu:potin_rod']),
         event.recipes.createDeploying(pist, [pist, 'gtceu:small_potin_gear']),
@@ -167,36 +167,37 @@ ServerEvents.recipes(event => {
     // removing recylcing recipes
     event.remove({id: /gtceu:(arc_furnace\/arc_|macerator\/macerate_)ulv_(electric_(piston|pump)|conveyor_module|robot_arm)/}); // ulv electric motor does not have recycling recipes
     const UlvComponent = (output,inputs,fluid) => {
+      const mod = (output == 'emitter') ? 'kubejs' : 'gtceu';
       if(output == 'electric_motor')
       event.recipes.gtceu.assembler(id(`ulv_${output}`))
         .itemInputs(inputs[0],inputs[1],inputs[2],inputs[3])
-        .itemOutputs(`gtceu:ulv_${output}`)
+        .itemOutputs(`${mod}:ulv_${output}`)
         .duration(100)
         .EUt(6);
     if(output == 'electric_piston')
       event.recipes.gtceu.assembler(id(`ulv_${output}`))
         .itemInputs(inputs[0],inputs[1],inputs[2],inputs[3],inputs[4])
-        .itemOutputs(`gtceu:ulv_${output}`)
+        .itemOutputs(`${mod}:ulv_${output}`)
         .duration(100)
         .circuit(1)
         .EUt(6);
     if(output == 'robot_arm')
       event.recipes.gtceu.assembler(id(`ulv_${output}`))
         .itemInputs(inputs[0],inputs[1],inputs[2],inputs[3],inputs[4])
-        .itemOutputs(`gtceu:ulv_${output}`)
+        .itemOutputs(`${mod}:ulv_${output}`)
         .duration(100)
         .circuit(1)
         .EUt(6);
     if(output == 'electric_pump')
       event.recipes.gtceu.assembler(id(`ulv_${output}`))
         .itemInputs(inputs[0],inputs[1],inputs[2],inputs[3],inputs[4],inputs[5])
-        .itemOutputs(`gtceu:ulv_${output}`)
+        .itemOutputs(`${mod}:ulv_${output}`)
         .duration(100)
         .EUt(6);
     if(output == 'emitter')
       event.recipes.gtceu.assembler(id(`ulv_${output}`))
         .itemInputs(inputs[0],inputs[1],inputs[2],inputs[3],inputs[4])
-        .itemOutputs(`kubejs:ulv_${output}`)
+        .itemOutputs(`${mod}:ulv_${output}`)
         .duration(100)
         .circuit(1)
         .EUt(6);
@@ -204,17 +205,17 @@ ServerEvents.recipes(event => {
       event.recipes.gtceu.assembler(id(`${output}_ulv`))
         .itemInputs(inputs[0],inputs[1])
         .inputFluids(fluid)
-        .itemOutputs(`gtceu:ulv_${output}`)
+        .itemOutputs(`${mod}:ulv_${output}`)
         .duration(100)
         .circuit(1)
         .EUt(6);
     }
     UlvComponent('electric_motor',['2x gtceu:red_alloy_single_cable','2x gtceu:iron_rod','1x gtceu:magnetic_iron_rod','4x gtceu:lead_single_wire'],'');
-    UlvComponent('conveyor_module',['1x gtceu:red_alloy_single_cable','2x kubejs:ulv_electric_motor'],'gtceu:rubber 864');
-    UlvComponent('electric_piston',['2x gtceu:potin_rod','2x gtceu:red_alloy_single_cable','3x gtceu:potin_plate','1x gtceu:small_potin_gear','1x kubejs:ulv_electric_motor'],'');
-    UlvComponent('robot_arm',['3x gtceu:red_alloy_single_cable','2x gtceu:potin_rod','2x kubejs:ulv_electric_motor','1x kubejs:ulv_electric_piston','1x #gtceu:circuits/ulv'],'');
-    UlvComponent('electric_pump',['1x gtceu:red_alloy_single_cable','1x gtceu:tin_alloy_normal_fluid_pipe','1x gtceu:cast_iron_screw','1x gtceu:cast_iron_rotor','2x gtceu:rubber_ring','1x kubejs:ulv_electric_motor'],'');
-    UlvComponent('emitter',['1x kubejs:ulv_electric_motor','4x gtceu:zinc_rod','2x gtceu:red_alloy_single_cable','2x #gtceu:circuits/ulv','1x minecraft:prismarine_crystals'],'');
+    UlvComponent('conveyor_module',['1x gtceu:red_alloy_single_cable','2x gtceu:ulv_electric_motor'],'gtceu:rubber 864');
+    UlvComponent('electric_piston',['2x gtceu:potin_rod','2x gtceu:red_alloy_single_cable','3x gtceu:potin_plate','1x gtceu:small_potin_gear','1x gtceu:ulv_electric_motor'],'');
+    UlvComponent('robot_arm',['3x gtceu:red_alloy_single_cable','2x gtceu:potin_rod','2x gtceu:ulv_electric_motor','1x gtceu:ulv_electric_piston','1x #gtceu:circuits/ulv'],'');
+    UlvComponent('electric_pump',['1x gtceu:red_alloy_single_cable','1x gtceu:tin_alloy_normal_fluid_pipe','1x gtceu:cast_iron_screw','1x gtceu:cast_iron_rotor','2x gtceu:rubber_ring','1x gtceu:ulv_electric_motor'],'');
+    UlvComponent('emitter',['1x gtceu:ulv_electric_motor','4x gtceu:zinc_rod','2x gtceu:red_alloy_single_cable','2x #gtceu:circuits/ulv','1x minecraft:prismarine_crystals'],'');
 
     event.recipes.gtceu.assembler(id('ulv_battery'))
       .itemInputs('4x gtceu:copper_foil', '4x minecraft:paper', '2x gtceu:iron_single_wire')
@@ -281,6 +282,14 @@ ServerEvents.recipes(event => {
         .duration(60)
         .EUt(-8);
 
+    // Old ULV to new ULV component recipes
+    ['electric_motor', 'electric_pump', 'conveyor_module', 'robot_arm', 'electric_piston'].forEach(component => {
+        event.shapeless(
+          Item.of(`kubejs:ulv_${component}`),
+          [`gtceu:ulv_${component}`]
+        ).id(id(`old_to_new_HM_ulv_${component}`));
+    });
+
     //ulv removals
     ['charger_4x','battery_buffer_4x','battery_buffer_8x','battery_buffer_16x','transformer_1a','transformer_2a',
       'transformer_4a','transformer_16a','machine_casing','machine_hull'].forEach(UlvRemove=>{
diff --git a/kubejs/startup_scripts/hardmode/machines/multiblocks/Resource_Gen.js/High_Pressure_Steam_Sifter.js b/kubejs/startup_scripts/hardmode/machines/multiblocks/Resource_Gen.js/High_Pressure_Steam_Sifter.js
index f0d639501..1f4eb6a06 100644
--- a/kubejs/startup_scripts/hardmode/machines/multiblocks/Resource_Gen.js/High_Pressure_Steam_Sifter.js
+++ b/kubejs/startup_scripts/hardmode/machines/multiblocks/Resource_Gen.js/High_Pressure_Steam_Sifter.js
@@ -34,6 +34,6 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
             .where('D', Predicates.blocks('kubejs:meshblock'))
             .where('@', Predicates.controller(Predicates.blocks(definition.get())))
 			.build())
-		.workableCasingModel('kubejs:block/hm/high_steam_machine_casing', 'gtceu:block/machines/sifter')
+		.workableCasingModel('kubejs:block/casings/basic/high_steam_machine_casing', 'gtceu:block/machines/sifter')
 	
 });
\ No newline at end of file
diff --git a/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/Rugged_Alloyer.js b/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/Rugged_Alloyer.js
index 72462cc1a..05a1ad5e8 100644
--- a/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/Rugged_Alloyer.js
+++ b/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/Rugged_Alloyer.js
@@ -21,7 +21,7 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
 			.where('#', Predicates.blocks('minecraft:air'))
 			.where('B', Predicates.controller(Predicates.blocks(definition.get())))
 			.build())
-		.workableCasingModel('kubejs:block/hm/reinforced_stone_bricks', 'gtceu:block/machines/electric_furnace')
+		.workableCasingModel('kubejs:block/hardmode/reinforced_stone_bricks', 'gtceu:block/machines/electric_furnace')
 		.editableUI(
 			global.ui_builder({
 				group: 'primitive',
diff --git a/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/steam_forge.js b/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/steam_forge.js
index 035622a42..86e54cfa8 100644
--- a/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/steam_forge.js
+++ b/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/steam_forge.js
@@ -1,18 +1,18 @@
 // packmode: hard
 
-GTCEuStartupEvents.registry('gtceu:recipe_type', event => {
-	event.create('gt_blasting')
-		.category('primitive')
-		.setMaxIOSize(1, 1, 0, 0)
-		.setSound(GTSoundEntries.FURNACE)
-});
+// GTCEuStartupEvents.registry('gtceu:recipe_type', event => {
+// 	event.create('gt_blasting')
+// 		.category('primitive')
+// 		.setMaxIOSize(1, 1, 0, 0)
+// 		.setSound(GTSoundEntries.FURNACE)
+// });
 
 GTCEuStartupEvents.registry('gtceu:machine', event => {
 	event.create('steam_forge', 'multiblock')
 		.rotationState(RotationState.NON_Y_AXIS)
-		.recipeType('gt_blasting')
-		.machine((holder) => new $StartSteamMulti(holder))
-        .recipeModifier($StarTRecipeModifiers.START_STEAM_PARALLEL)
+		.recipeType('electric_vanilla_blast_furnace')
+		.machine((holder) => new $SteamMulti(holder, 4))
+        .recipeModifier((machine, recipe) => $SteamMulti.recipeModifier(machine, recipe), true)
         .appearanceBlock(() => Block.getBlock('kubejs:high_steam_machine_casing'))
 		.pattern(definition => FactoryBlockPattern.start()
             .aisle('BBB','CCC','CCC','#C#')
@@ -28,6 +28,6 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
 			.where('#', Predicates.any())
             .where('@', Predicates.controller(Predicates.blocks(definition.get())))
 			.build())
-		.workableCasingModel('kubejs:block/hm/high_steam_machine_casing', 'gtceu:block/machines/blasting')
+		.workableCasingModel('kubejs:block/casings/basic/high_steam_machine_casing', 'gtceu:block/machines/blasting')
 		
 });
\ No newline at end of file
diff --git a/kubejs/startup_scripts/hardmode/machines/single block/steam_machines.js b/kubejs/startup_scripts/hardmode/machines/single block/steam_machines.js
index adfa706d5..5367371c7 100644
--- a/kubejs/startup_scripts/hardmode/machines/single block/steam_machines.js	
+++ b/kubejs/startup_scripts/hardmode/machines/single block/steam_machines.js	
@@ -4,7 +4,7 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
     event.create('steam_blaster', 'steam')
     .definition((tier, builder) =>{
     builder
-        .recipeType('gt_blasting')
+        .recipeType('electric_vanilla_blast_furnace')
         .workableCasingModel('gtceu:block/casings/steam/bricked_steel/side', 'gtceu:block/machines/blasting_single');
     });
 
diff --git a/kubejs/startup_scripts/hardmode/machines/single block/stirling_generator.js b/kubejs/startup_scripts/hardmode/machines/single block/stirling_generator.js
index 80571e36c..4e910417b 100644
--- a/kubejs/startup_scripts/hardmode/machines/single block/stirling_generator.js	
+++ b/kubejs/startup_scripts/hardmode/machines/single block/stirling_generator.js	
@@ -18,6 +18,6 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
     builder
         .recipeType('stirling_generator')
         .regressWhenWaiting(false)
-        .simpleGeneratorMachineRenderer('gtceu:block/generators/steam_turbine')
+        .simpleGeneratorModel('gtceu:block/generators/steam_turbine')
     });
 });
\ No newline at end of file
diff --git a/kubejs/startup_scripts/hardmode/machines/single block/ulv_gt_machines.js b/kubejs/startup_scripts/hardmode/machines/single block/ulv_gt_machines.js
index fe7887750..9aa9b7277 100644
--- a/kubejs/startup_scripts/hardmode/machines/single block/ulv_gt_machines.js	
+++ b/kubejs/startup_scripts/hardmode/machines/single block/ulv_gt_machines.js	
@@ -4,7 +4,9 @@ GTCEuStartupEvents.registry('gtceu:machine', event => {
 	const ulv_machine = (machine) => {
 		event.create(machine, 'simple')
 			.tiers(GTValues.ULV)
-			.definition((tier, builder) => builder.recipeType(machine));
+			.definition((tier, builder) => builder
+				.recipeType(machine)
+				.workableTieredHullModel(`gtceu:block/machines/${machine}`));
 	}
 
 	ulv_machine('mixer');
diff --git a/kubejs/startup_scripts/hardmode/objects/blocks.js b/kubejs/startup_scripts/hardmode/objects/blocks.js
index a2dc8efd2..b35fa7f24 100644
--- a/kubejs/startup_scripts/hardmode/objects/blocks.js
+++ b/kubejs/startup_scripts/hardmode/objects/blocks.js
@@ -26,7 +26,7 @@ StartupEvents.registry('block', event => {
 		.soundType('sand')
 		.requiresTool(false)
 		.tagBlock("mineable/shovel")
-		.textureAll('kubejs:block/hm/refined_sand');
+		.textureAll('kubejs:block/hardmode/refined_sand');
 
 	event.create('refined_dust', 'falling')
 		.hardness(1)
@@ -34,7 +34,7 @@ StartupEvents.registry('block', event => {
 		.soundType('sand')
 		.requiresTool(false)
 		.tagBlock("mineable/shovel")
-		.textureAll('kubejs:block/hm/refined_dust');
+		.textureAll('kubejs:block/hardmode/refined_dust');
 
 	// === Casings ===
 	event.create('reinforced_stone_bricks')
@@ -44,5 +44,5 @@ StartupEvents.registry('block', event => {
 		.requiresTool(true)
 		.tagBlock("mineable/pickaxe")
 		.tagBlock('minecraft:needs_stone_tool')
-		.textureAll('kubejs:block/hm/reinforced_stone_bricks');	
+		.textureAll('kubejs:block/hardmode/reinforced_stone_bricks');	
 });
\ No newline at end of file