diff --git a/.gitignore b/.gitignore
index e624c32e4..c5ba037f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ local/*
 
 XaeroWaypoints*
 XaeroWorldMap/*
+CustomSkinLoader/*
 
 options.txt
 patchouli_data.json
diff --git a/kubejs/client_scripts/gregtech/rei.js b/kubejs/client_scripts/gregtech/rei.js
index 8d7e38d18..012211bad 100644
--- a/kubejs/client_scripts/gregtech/rei.js
+++ b/kubejs/client_scripts/gregtech/rei.js
@@ -14,14 +14,11 @@ const hideGTStuff = (event) => {
 }
 
 const groupGTStuff = (event) => {
-    /*
-    event.groupItemsByTag('tfg:rei_groups/dusts/tiny', 'Tiny Dusts', 'forge:dusts/tiny')
-    event.groupItemsByTag('tfg:rei_groups/dusts/small', 'Small Dusts', 'forge:dusts/small')
-    event.groupItemsByTag('tfg:rei_groups/dusts', 'Dusts', 'forge:dusts')
     event.groupItemsByTag('tfg:rei_groups/dusts/pure', 'Pure Dusts', 'forge:dusts/pure')
     event.groupItemsByTag('tfg:rei_groups/dusts/impure', 'Impure Dusts', 'forge:dusts/impure')
-
-    event.groupItemsByTag('tfg:rei_groups/nuggets', 'Nuggets', 'forge:nuggets')
+    event.groupItemsByTag('tfg:rei_groups/dusts', 'Dusts', 'forge:dusts')
+    event.groupItemsByTag('tfg:rei_groups/dusts/small', 'Small Dusts', 'forge:dusts/small')
+    event.groupItemsByTag('tfg:rei_groups/dusts/tiny', 'Tiny Dusts', 'forge:dusts/tiny')
     
     event.groupItemsByTag('tfg:rei_groups/ores', 'Ores', 'forge:ores')
     event.groupItemsByTag('tfg:rei_groups/crushed_ores', 'Crushed Ores', 'forge:crushed_ores')
@@ -50,8 +47,9 @@ const groupGTStuff = (event) => {
     event.groupItemsByTag('tfg:rei_groups/gems/flawed', 'Flawed Gems', 'forge:gems/flawed')
     event.groupItemsByTag('tfg:rei_groups/gems/chipped', 'Chipped Gems', 'forge:gems/chipped')
     
-    event.groupItemsByTag('tfg:rei_groups/material_blocks', 'Material Blocks', 'forge:material_blocks')
-    event.groupItemsByTag('tfg:rei_groups/raw_material_blocks', 'Raw Material Blocks', 'forge:raw_material_blocks')
+    event.groupItemsByTag('tfg:rei_groups/material_blocks/raw', 'Raw Material Blocks', 'forge:material_blocks/raw')
+    event.groupItemsByTag('tfg:rei_groups/material_blocks/block', 'Material Blocks', 'forge:material_blocks/block')
+    event.groupItemsByTag('tfg:rei_groups/material_blocks/frame', 'Frames', 'forge:material_blocks/frame')
 
     event.groupItemsByTag('tfg:rei_groups/sword_heads', 'Sword Heads', 'forge:sword_heads')
     event.groupItemsByTag('tfg:rei_groups/butchery_knife_heads', 'Butchery Knife Heads', 'forge:butchery_knife_heads')
@@ -66,10 +64,21 @@ const groupGTStuff = (event) => {
     event.groupItemsByTag('tfg:rei_groups/scythe_heads', 'Scythe Heads', 'forge:scythe_heads')
     event.groupItemsByTag('tfg:rei_groups/file_heads', 'File Heads', 'forge:file_heads')
 
+    event.groupItemsByTag('tfg:rei_groups/drill_heads', 'Drill Heads', 'forge:drill_heads')
+    event.groupItemsByTag('tfg:rei_groups/chainsaw_heads', 'Chainsaw Heads', 'forge:chainsaw_heads')
+    event.groupItemsByTag('tfg:rei_groups/buzzsaw_heads', 'Buzz Saw Blades', 'forge:buzzsaw_heads')
+
+    event.groupItemsByTag('tfg:rei_groups/turbine_blades', 'Turbine Blades', 'forge:turbine_blades')
+    event.groupItemsByTag('tfg:rei_groups/wrench_tips', 'Wrench Tips', 'forge:wrench_tips')
+    event.groupItemsByTag('tfg:rei_groups/screwdriver_tips', 'Screwdriver Tips', 'forge:screwdriver_tips')
+
     event.groupItemsByTag('tfg:rei_groups/poor_raw_ores', 'Poor Raw Ores', 'forge:poor_raw_materials')
     event.groupItemsByTag('tfg:rei_groups/normal_raw_ores', 'Normal Raw Ores', 'forge:raw_materials')
     event.groupItemsByTag('tfg:rei_groups/rich_raw_ores', 'Rich Raw Ores', 'forge:rich_raw_materials')
 
+    event.groupItemsByTag('tfg:rei_groups/lenses', 'Lenses', 'forge:lenses')
+    event.groupItemsByTag('tfg:rei_groups/rounds', 'Rounds', 'forge:rounds')
+    event.groupItemsByTag('tfg:rei_groups/nuggets', 'Nuggets', 'forge:nuggets')
     event.groupItemsByTag('tfg:rei_groups/rings', 'Rings', 'forge:rings')
     event.groupItemsByTag('tfg:rei_groups/bolts', 'Bolts', 'forge:bolts')
     event.groupItemsByTag('tfg:rei_groups/screws', 'Screws', 'forge:screws')
@@ -77,45 +86,35 @@ const groupGTStuff = (event) => {
     event.groupItemsByTag('tfg:rei_groups/rotors', 'Rotors', 'forge:rotors')
     event.groupItemsByTag('tfg:rei_groups/wires/fine', 'Fine Wires', 'forge:wires/fine')
 
-    event.groupItems('tfg:rei_groups/drill_heads', 'Drill Heads', [/gtceu:.*_drill_head/])
-    event.groupItems('tfg:rei_groups/chainsaw_heads', 'Chainsaw Heads', [/gtceu:.*_chainsaw_head/])
-    event.groupItems('tfg:rei_groups/buzzsaw_blades', 'Buzz Saw Blades', [/gtceu:.*_buzz_saw_blade/])
+    event.groupItemsByTag('tfg:rei_groups/wires/single', 'Single Wires', 'forge:wires/single')
+    event.groupItemsByTag('tfg:rei_groups/wires/double', 'Double Wires','forge:wires/double')
+    event.groupItemsByTag('tfg:rei_groups/wires/quadruple', 'Quadruple Wires', 'forge:wires/quadruple')
+    event.groupItemsByTag('tfg:rei_groups/wires/octal', 'Octal Wires', 'forge:wires/octal')
+    event.groupItemsByTag('tfg:rei_groups/wires/hex', 'Hex Wires', 'forge:wires/hex')
+
+    event.groupItemsByTag('tfg:rei_groups/cables/single', 'Single Cables', 'forge:cables/single')
+    event.groupItemsByTag('tfg:rei_groups/cables/double', 'Double Cables', 'forge:cables/double')
+    event.groupItemsByTag('tfg:rei_groups/cables/quadruple', 'Quadruple Cables', 'forge:cables/quadruple')
+    event.groupItemsByTag('tfg:rei_groups/cables/octal', 'Octal Cables', 'forge:cables/octal')
+    event.groupItemsByTag('tfg:rei_groups/cables/hex', 'Hex Cables', 'forge:cables/hex')
+
+    event.groupItemsByTag('tfg:rei_groups/fluid_pipes/tiny', 'Tiny Fluid Pipes', 'forge:fluid_pipes/tiny')
+    event.groupItemsByTag('tfg:rei_groups/fluid_pipes/small', 'Small Fluid Pipes', 'forge:fluid_pipes/small')
+    event.groupItemsByTag('tfg:rei_groups/fluid_pipes/normal', 'Normal Fluid Pipes', 'forge:fluid_pipes/normal')
+    event.groupItemsByTag('tfg:rei_groups/fluid_pipes/large', 'Large Fluid Pipes', 'forge:fluid_pipes/large')
+    event.groupItemsByTag('tfg:rei_groups/fluid_pipes/huge', 'Huge Fluid Pipes', 'forge:fluid_pipes/huge')
+    event.groupItemsByTag('tfg:rei_groups/fluid_pipes/quadruple', 'Quadruple Fluid Pipes', 'forge:fluid_pipes/quadruple')
+    event.groupItemsByTag('tfg:rei_groups/fluid_pipes/nonuple', 'Nonuple Fluid Pipes', 'forge:fluid_pipes/nonuple')
+
+    event.groupItemsByTag('tfg:rei_groups/item_pipes/small', 'Small Item Pipes', 'forge:item_pipes/small')
+    event.groupItemsByTag('tfg:rei_groups/item_pipes/normal', 'Normal Item Pipes', 'forge:item_pipes/normal')
+    event.groupItemsByTag('tfg:rei_groups/item_pipes/large', 'Large Item Pipes', 'forge:item_pipes/large')
+    event.groupItemsByTag('tfg:rei_groups/item_pipes/huge', 'Huge Item Pipes', 'forge:item_pipes/huge')
+
+    event.groupItemsByTag('tfg:rei_groups/restrictive_pipes/small', 'Small Restrictive Pipes', 'forge:restrictive_pipes/small')
+    event.groupItemsByTag('tfg:rei_groups/restrictive_pipes/normal', 'Normal Resctrictive Pipes', 'forge:restrictive_pipes/normal')
+    event.groupItemsByTag('tfg:rei_groups/restrictive_pipes/large', 'Large Resctrictive Pipes', 'forge:restrictive_pipes/large')
+    event.groupItemsByTag('tfg:rei_groups/restrictive_pipes/huge', 'Huge Resctrictive Pipes', 'forge:restrictive_pipes/huge')
 
-    event.groupItems('tfg:rei_groups/turbine_blades', 'Turbine Blades', [/gtceu:.*_turbine_blade/])
-    event.groupItems('tfg:rei_groups/wrench_tips', 'Wrench Tips', [/gtceu:.*_wrench_tip/])
-    event.groupItems('tfg:rei_groups/screwdriver_tips', 'Screwdriver Tips', [/gtceu:.*_screwdriver_tip/])
-    
     event.groupItems('tfg:rei_groups/buckets', 'Buckets', [/gtceu:.*_bucket/])
-    event.groupItems('tfg:rei_groups/frame', 'Frames', [/gtceu:.*_frame/])
-
-    event.groupItems('tfg:rei_groups/single_wires', 'Single Wires', [/gtceu:.*_single_wire/])
-    event.groupItems('tfg:rei_groups/double_wires', 'Double Wires', [/gtceu:.*_double_wire/])
-    event.groupItems('tfg:rei_groups/quadruple_wires', 'Quadruple Wires', [/gtceu:.*_quadruple_wire/])
-    event.groupItems('tfg:rei_groups/octal_wires', 'Octal Wires', [/gtceu:.*_octal_wire/])
-    event.groupItems('tfg:rei_groups/hex_wires', 'Hex Wires', [/gtceu:.*_hex_wire/])
-
-    event.groupItems('tfg:rei_groups/single_cables', 'Single Cables', [/gtceu:.*_single_cable/])
-    event.groupItems('tfg:rei_groups/double_cables', 'Double Cables', [/gtceu:.*_double_cable/])
-    event.groupItems('tfg:rei_groups/quadruple_cables', 'Quadruple Cables', [/gtceu:.*_quadruple_cable/])
-    event.groupItems('tfg:rei_groups/octal_cables', 'Octal Cables', [/gtceu:.*_octal_cable/])
-    event.groupItems('tfg:rei_groups/hex_cables', 'Hex Cables', [/gtceu:.*_hex_cable/])
-
-    event.groupItems('tfg:rei_groups/tiny_fluid_pipes', 'Tiny Fluid Pipes', [/gtceu:.*_tiny_fluid_pipe/])
-    event.groupItems('tfg:rei_groups/small_fluid_pipes', 'Small Fluid Pipes', [/gtceu:.*_small_fluid_pipe/])
-    event.groupItems('tfg:rei_groups/normal_fluid_pipes', 'Normal Fluid Pipes', [/gtceu:.*_normal_fluid_pipe/])
-    event.groupItems('tfg:rei_groups/large_fluid_pipes', 'Large Fluid Pipes', [/gtceu:.*_large_fluid_pipe/])
-    event.groupItems('tfg:rei_groups/huge_fluid_pipes', 'Huge Fluid Pipes', [/gtceu:.*_huge_fluid_pipe/])
-    event.groupItems('tfg:rei_groups/quadruple_fluid_pipes', 'Quadruple Fluid Pipes', [/gtceu:.*_quadruple_fluid_pipe/])
-    event.groupItems('tfg:rei_groups/nonuple_fluid_pipes', 'Nonuple Fluid Pipes', [/gtceu:.*_nonuple_fluid_pipe/])
-
-    event.groupItems('tfg:rei_groups/tiny_item_pipes', 'Tiny Item Pipes', [/gtceu:.*_tiny_item_pipe/])
-    event.groupItems('tfg:rei_groups/small_item_pipes', 'Small Item Pipes', [/gtceu:.*_small_item_pipe/])
-    event.groupItems('tfg:rei_groups/normal_item_pipes', 'Normal Item Pipes', [/gtceu:.*_normal_item_pipe/])
-    event.groupItems('tfg:rei_groups/large_item_pipes', 'Large Item Pipes', [/gtceu:.*_large_item_pipe/])
-    event.groupItems('tfg:rei_groups/huge_item_pipes', 'Huge Item Pipes', [/gtceu:.*_huge_item_pipe/])
-
-    event.groupItems('tfg:rei_groups/small_restrictive_item_pipes', 'Small Resctrictive Item Pipes', [/gtceu:.*_small_restrictive_item_pipe/])
-    event.groupItems('tfg:rei_groups/normal_restrictive_item_pipes', 'Normal Resctrictive Item Pipes', [/gtceu:.*_normal_restrictive_item_pipe/])
-    event.groupItems('tfg:rei_groups/large_restrictive_item_pipes', 'Large Resctrictive Item Pipes', [/gtceu:.*_large_restrictive_item_pipe/])
-    event.groupItems('tfg:rei_groups/huge_restrictive_item_pipes', 'Huge Resctrictive Item Pipes', [/gtceu:.*_huge_restrictive_item_pipe/])*/
 }
\ No newline at end of file
diff --git a/mods/terrafirmagreg-0.0.1.jar b/mods/terrafirmagreg-0.0.1.jar
index 0d63d5546..807e9d416 100644
Binary files a/mods/terrafirmagreg-0.0.1.jar and b/mods/terrafirmagreg-0.0.1.jar differ