diff --git a/src-models/assets/minecraft/textures/block/rail/albedo.png b/src-models/assets/minecraft/textures/block/rail/albedo.png
deleted file mode 100644
index 5d06aea0..00000000
Binary files a/src-models/assets/minecraft/textures/block/rail/albedo.png and /dev/null differ
diff --git a/src-models/assets/minecraft/textures/block/rail/color.png b/src-models/assets/minecraft/textures/block/rail/color.png
new file mode 100644
index 00000000..c747883a
Binary files /dev/null and b/src-models/assets/minecraft/textures/block/rail/color.png differ
diff --git a/src/LabPbr-16x.pack.yml b/src/LabPbr-16x.pack.yml
index f2ec10ab..2f924f00 100644
--- a/src/LabPbr-16x.pack.yml
+++ b/src/LabPbr-16x.pack.yml
@@ -30,6 +30,6 @@ encoding:
 block-texture-size: 16
 item-texture-size: 16
 texture-scale: 0.5
-auto-generate-occlusion: true
+auto-generate-occlusion: false
 occlusion-quality: 0.1
 occlusion-power: 1
diff --git a/src/LabPbr-32x.pack.yml b/src/LabPbr-32x.pack.yml
index 93bada62..11794991 100644
--- a/src/LabPbr-32x.pack.yml
+++ b/src/LabPbr-32x.pack.yml
@@ -29,4 +29,4 @@ item-texture-size: 32
 texture-scale: 1
 auto-generate-occlusion: false
 occlusion-quality: 0.2
-occlusion-power: 1
+occlusion-power: 0.2
diff --git a/src/assets/minecraft/optifine/ctm/bricks/.ignore/color.png b/src/assets/minecraft/optifine/ctm/bricks/.ignore/color.png
new file mode 100644
index 00000000..d3a2555b
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/.ignore/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/f0.png b/src/assets/minecraft/optifine/ctm/bricks/.ignore/f0.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/bricks/f0.png
rename to src/assets/minecraft/optifine/ctm/bricks/.ignore/f0.png
diff --git a/src/assets/minecraft/optifine/ctm/bricks/.ignore/height.png b/src/assets/minecraft/optifine/ctm/bricks/.ignore/height.png
new file mode 100644
index 00000000..f03e5e65
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/bricks/.ignore/mat.yml
new file mode 100644
index 00000000..468977a9
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/bricks/.ignore/mat.yml
@@ -0,0 +1,23 @@
+publish-item: true
+wrap-x: true
+wrap-y: true
+color:
+  bake-occlusion: false
+height:
+  shift: -0.1
+  scale: 0.4
+normal:
+  noise: 6
+  method: sobel-low
+  strength: 0.5
+occlusion:
+  step-distance: 0.2
+  z-bias: 0.2
+  z-scale: 3
+smooth:
+  scale: 1.5
+ctm:
+  method: of-repeat
+  width: 8
+  height: 8
+  match-tiles: bricks
diff --git a/src/assets/minecraft/optifine/ctm/bricks/.ignore/normal.png b/src/assets/minecraft/optifine/ctm/bricks/.ignore/normal.png
new file mode 100644
index 00000000..d8ce2d70
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/.ignore/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/bricks/.ignore/occlusion.png
new file mode 100644
index 00000000..81b6155a
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/.ignore/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/.ignore/porosity.png b/src/assets/minecraft/optifine/ctm/bricks/.ignore/porosity.png
new file mode 100644
index 00000000..49c763f0
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/.ignore/porosity.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/bricks/.ignore/smooth.png
new file mode 100644
index 00000000..1b1d65d7
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/.ignore/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/bump.png b/src/assets/minecraft/optifine/ctm/bricks/bump.png
new file mode 100644
index 00000000..99ddb99d
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/bump.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/color.png b/src/assets/minecraft/optifine/ctm/bricks/color.png
index d3a2555b..81897386 100644
Binary files a/src/assets/minecraft/optifine/ctm/bricks/color.png and b/src/assets/minecraft/optifine/ctm/bricks/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/height.png b/src/assets/minecraft/optifine/ctm/bricks/height.png
index f03e5e65..04c5c3d0 100644
Binary files a/src/assets/minecraft/optifine/ctm/bricks/height.png and b/src/assets/minecraft/optifine/ctm/bricks/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/mat.yml b/src/assets/minecraft/optifine/ctm/bricks/mat.yml
index 468977a9..f100613f 100644
--- a/src/assets/minecraft/optifine/ctm/bricks/mat.yml
+++ b/src/assets/minecraft/optifine/ctm/bricks/mat.yml
@@ -4,20 +4,22 @@ wrap-y: true
 color:
   bake-occlusion: false
 height:
-  shift: -0.1
-  scale: 0.4
+  scale: 0.25
+  edge-fade-x: 1
+  edge-fade-y: 1
 normal:
-  noise: 6
+  noise: 2
   method: sobel-low
   strength: 0.5
 occlusion:
   step-distance: 0.2
   z-bias: 0.2
   z-scale: 3
-smooth:
-  scale: 1.5
+f0:
+  value: 0.077
 ctm:
   method: of-repeat
-  width: 8
-  height: 8
+  width: 4
+  height: 4
   match-tiles: bricks
+  placeholder: true
diff --git a/src/assets/minecraft/optifine/ctm/bricks/normal.png b/src/assets/minecraft/optifine/ctm/bricks/normal.png
index d8ce2d70..2bf821e2 100644
Binary files a/src/assets/minecraft/optifine/ctm/bricks/normal.png and b/src/assets/minecraft/optifine/ctm/bricks/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/occlusion.png b/src/assets/minecraft/optifine/ctm/bricks/occlusion.png
index 81b6155a..d23c2c75 100644
Binary files a/src/assets/minecraft/optifine/ctm/bricks/occlusion.png and b/src/assets/minecraft/optifine/ctm/bricks/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/porosity.png b/src/assets/minecraft/optifine/ctm/bricks/porosity.png
index 49c763f0..dcf220bf 100644
Binary files a/src/assets/minecraft/optifine/ctm/bricks/porosity.png and b/src/assets/minecraft/optifine/ctm/bricks/porosity.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/rough-x.png b/src/assets/minecraft/optifine/ctm/bricks/rough-x.png
new file mode 100644
index 00000000..f3b9380f
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/rough-x.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/smooth.png b/src/assets/minecraft/optifine/ctm/bricks/smooth.png
index 1b1d65d7..27a6bdfb 100644
Binary files a/src/assets/minecraft/optifine/ctm/bricks/smooth.png and b/src/assets/minecraft/optifine/ctm/bricks/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/bump.png b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/bump.png
new file mode 100644
index 00000000..62dde0ca
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/bump.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/color.png b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/color.png
new file mode 100644
index 00000000..237ae817
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/height.png b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/height.png
new file mode 100644
index 00000000..dda3493d
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/mat.yml
new file mode 100644
index 00000000..97be566c
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/mat.yml
@@ -0,0 +1,24 @@
+publish-item: true
+wrap-x: true
+wrap-y: true
+color:
+  bake-occlusion: false
+height:
+  scale: 0.3
+normal:
+  noise: 2
+  method: sobel-low
+  strength: 0.5
+occlusion:
+  step-distance: 0.2
+  z-bias: 0.2
+  z-scale: 3
+smooth:
+  scale: 0.8
+f0:
+  value: 0.077
+ctm:
+  method: of-repeat
+  width: 3
+  height: 3
+  match-tiles: bricks
diff --git a/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/normal.png b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/normal.png
new file mode 100644
index 00000000..85110150
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/occlusion.png
new file mode 100644
index 00000000..997f9f99
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/porosity.png b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/porosity.png
new file mode 100644
index 00000000..f5373f07
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/porosity.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/smooth.png
new file mode 100644
index 00000000..76a24899
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks/v2.ignore/smooth.png differ
diff --git a/src/assets/minecraft/textures/block/bricks_top/albedo.png b/src/assets/minecraft/optifine/ctm/bricks_top/.ignore/albedo.png
similarity index 100%
rename from src/assets/minecraft/textures/block/bricks_top/albedo.png
rename to src/assets/minecraft/optifine/ctm/bricks_top/.ignore/albedo.png
diff --git a/src/assets/minecraft/textures/block/bricks_top/f0.png b/src/assets/minecraft/optifine/ctm/bricks_top/.ignore/f0.png
similarity index 100%
rename from src/assets/minecraft/textures/block/bricks_top/f0.png
rename to src/assets/minecraft/optifine/ctm/bricks_top/.ignore/f0.png
diff --git a/src/assets/minecraft/textures/block/bricks_top/height.png b/src/assets/minecraft/optifine/ctm/bricks_top/.ignore/height.png
similarity index 100%
rename from src/assets/minecraft/textures/block/bricks_top/height.png
rename to src/assets/minecraft/optifine/ctm/bricks_top/.ignore/height.png
diff --git a/src/assets/minecraft/textures/block/bricks_top/mat.yml b/src/assets/minecraft/optifine/ctm/bricks_top/.ignore/mat.yml
similarity index 100%
rename from src/assets/minecraft/textures/block/bricks_top/mat.yml
rename to src/assets/minecraft/optifine/ctm/bricks_top/.ignore/mat.yml
diff --git a/src/assets/minecraft/textures/block/bricks_top/occlusion-x.png b/src/assets/minecraft/optifine/ctm/bricks_top/.ignore/occlusion-x.png
similarity index 100%
rename from src/assets/minecraft/textures/block/bricks_top/occlusion-x.png
rename to src/assets/minecraft/optifine/ctm/bricks_top/.ignore/occlusion-x.png
diff --git a/src/assets/minecraft/textures/block/bricks_top/occlusion.png b/src/assets/minecraft/optifine/ctm/bricks_top/.ignore/occlusion.png
similarity index 100%
rename from src/assets/minecraft/textures/block/bricks_top/occlusion.png
rename to src/assets/minecraft/optifine/ctm/bricks_top/.ignore/occlusion.png
diff --git a/src/assets/minecraft/textures/block/bricks_top/porosity.png b/src/assets/minecraft/optifine/ctm/bricks_top/.ignore/porosity.png
similarity index 100%
rename from src/assets/minecraft/textures/block/bricks_top/porosity.png
rename to src/assets/minecraft/optifine/ctm/bricks_top/.ignore/porosity.png
diff --git a/src/assets/minecraft/textures/block/bricks_top/smooth.png b/src/assets/minecraft/optifine/ctm/bricks_top/.ignore/smooth.png
similarity index 100%
rename from src/assets/minecraft/textures/block/bricks_top/smooth.png
rename to src/assets/minecraft/optifine/ctm/bricks_top/.ignore/smooth.png
diff --git a/src/assets/minecraft/optifine/ctm/bricks_top/bump.png b/src/assets/minecraft/optifine/ctm/bricks_top/bump.png
new file mode 100644
index 00000000..fe7f784e
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks_top/bump.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks_top/color.png b/src/assets/minecraft/optifine/ctm/bricks_top/color.png
new file mode 100644
index 00000000..a3c4d038
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks_top/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks_top/height.png b/src/assets/minecraft/optifine/ctm/bricks_top/height.png
new file mode 100644
index 00000000..308ddf2d
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks_top/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks_top/mat.yml b/src/assets/minecraft/optifine/ctm/bricks_top/mat.yml
new file mode 100644
index 00000000..72d8007b
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/bricks_top/mat.yml
@@ -0,0 +1,16 @@
+publish-item: true
+height:
+  scale: 0.2
+  edge-fade-x: 1
+  edge-fade-y: 1
+  edge-fade-strength: 0.7
+smooth:
+  scale: 0.7
+f0:
+  value: 0.077
+ctm:
+  method: of-repeat
+  width: 5
+  height: 5
+  match-tiles: bricks_top
+  placeholder: true
diff --git a/src/assets/minecraft/optifine/ctm/bricks_top/normal.png b/src/assets/minecraft/optifine/ctm/bricks_top/normal.png
new file mode 100644
index 00000000..20be14da
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks_top/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks_top/occlusion.png b/src/assets/minecraft/optifine/ctm/bricks_top/occlusion.png
new file mode 100644
index 00000000..ebe94c24
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks_top/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks_top/rough-x.png b/src/assets/minecraft/optifine/ctm/bricks_top/rough-x.png
new file mode 100644
index 00000000..d01384de
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks_top/rough-x.png differ
diff --git a/src/assets/minecraft/optifine/ctm/bricks_top/smooth.png b/src/assets/minecraft/optifine/ctm/bricks_top/smooth.png
new file mode 100644
index 00000000..d50c68e2
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/bricks_top/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/copper_block/bump.png b/src/assets/minecraft/optifine/ctm/copper_block/bump.png
new file mode 100644
index 00000000..e14a3a1d
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/copper_block/bump.png differ
diff --git a/src/assets/minecraft/optifine/ctm/copper_block/height.png b/src/assets/minecraft/optifine/ctm/copper_block/height.png
index b9357a1e..6a349b33 100644
Binary files a/src/assets/minecraft/optifine/ctm/copper_block/height.png and b/src/assets/minecraft/optifine/ctm/copper_block/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/copper_block/mat.yml b/src/assets/minecraft/optifine/ctm/copper_block/mat.yml
index 9f81d896..eb41ede5 100644
--- a/src/assets/minecraft/optifine/ctm/copper_block/mat.yml
+++ b/src/assets/minecraft/optifine/ctm/copper_block/mat.yml
@@ -1,23 +1,24 @@
 publish-item: true
 color:
-  value-red: 240
-  value-green: 147
-  value-blue: 98
+  value-red: 186
+  value-green: 112
+  value-blue: 85
 height:
-  scale: 0.5
-  edge-fade-x: 0.8
-  edge-fade-y: 0.8
-normal:
-  method: sobel-high
-  strength: 2
+  scale: 0.16
+  edge-fade-x: 3
+  edge-fade-y: 3
 occlusion:
-  z-scale: 4
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 24
+smooth:
+  value: 0.8
 metal:
   value: 234
 ctm:
   method: of-repeat
-  width: 4
-  height: 4
+  width: 8
+  height: 8
   match-tiles: copper_block
   placeholder: true
 filters:
diff --git a/src/assets/minecraft/optifine/ctm/copper_block/normal.png b/src/assets/minecraft/optifine/ctm/copper_block/normal.png
index c7b33477..a33bba2a 100644
Binary files a/src/assets/minecraft/optifine/ctm/copper_block/normal.png and b/src/assets/minecraft/optifine/ctm/copper_block/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/copper_block/occlusion-x.png b/src/assets/minecraft/optifine/ctm/copper_block/occlusion-x.png
new file mode 100644
index 00000000..4118119a
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/copper_block/occlusion-x.png differ
diff --git a/src/assets/minecraft/optifine/ctm/copper_block/occlusion.png b/src/assets/minecraft/optifine/ctm/copper_block/occlusion.png
index a05867e4..40805ebc 100644
Binary files a/src/assets/minecraft/optifine/ctm/copper_block/occlusion.png and b/src/assets/minecraft/optifine/ctm/copper_block/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/height.png b/src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/height.png
new file mode 100644
index 00000000..b9357a1e
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/mat.yml
new file mode 100644
index 00000000..9f81d896
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/mat.yml
@@ -0,0 +1,29 @@
+publish-item: true
+color:
+  value-red: 240
+  value-green: 147
+  value-blue: 98
+height:
+  scale: 0.5
+  edge-fade-x: 0.8
+  edge-fade-y: 0.8
+normal:
+  method: sobel-high
+  strength: 2
+occlusion:
+  z-scale: 4
+metal:
+  value: 234
+ctm:
+  method: of-repeat
+  width: 4
+  height: 4
+  match-tiles: copper_block
+  placeholder: true
+filters:
+- name: default
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.15
+  normal-radius-y: 0.15
diff --git a/src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/normal.png b/src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/normal.png
new file mode 100644
index 00000000..c7b33477
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/occlusion.png
new file mode 100644
index 00000000..a05867e4
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/copper_block/smooth.png b/src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/smooth.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/copper_block/smooth.png
rename to src/assets/minecraft/optifine/ctm/copper_block/v1.ignore/smooth.png
diff --git a/src/assets/minecraft/optifine/ctm/cut_copper/mat.yml b/src/assets/minecraft/optifine/ctm/cut_copper/mat.yml
index ab355341..299c1a9e 100644
--- a/src/assets/minecraft/optifine/ctm/cut_copper/mat.yml
+++ b/src/assets/minecraft/optifine/ctm/cut_copper/mat.yml
@@ -1,13 +1,10 @@
 publish-item: true
 color:
-  value-red: 240
-  value-green: 147
-  value-blue: 98
+  value-red: 186
+  value-green: 112
+  value-blue: 85
 height:
   scale: 0.3
-normal:
-  method: sobel-high
-  strength: 2
 occlusion:
   z-scale: 4
 metal:
diff --git a/src/assets/minecraft/optifine/ctm/cut_copper/smooth.png b/src/assets/minecraft/optifine/ctm/cut_copper/smooth.png
index b55d1796..0e4ddc84 100644
Binary files a/src/assets/minecraft/optifine/ctm/cut_copper/smooth.png and b/src/assets/minecraft/optifine/ctm/cut_copper/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/exposed_copper/bump.png b/src/assets/minecraft/optifine/ctm/exposed_copper/bump.png
new file mode 100644
index 00000000..e14a3a1d
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/exposed_copper/bump.png differ
diff --git a/src/assets/minecraft/optifine/ctm/exposed_copper/height.png b/src/assets/minecraft/optifine/ctm/exposed_copper/height.png
index b9357a1e..6a349b33 100644
Binary files a/src/assets/minecraft/optifine/ctm/exposed_copper/height.png and b/src/assets/minecraft/optifine/ctm/exposed_copper/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/exposed_copper/mat.yml b/src/assets/minecraft/optifine/ctm/exposed_copper/mat.yml
index abe67de5..1738e186 100644
--- a/src/assets/minecraft/optifine/ctm/exposed_copper/mat.yml
+++ b/src/assets/minecraft/optifine/ctm/exposed_copper/mat.yml
@@ -1,20 +1,26 @@
 publish-item: true
+color:
+  value-red: 183
+  value-green: 97
+  value-blue: 49
 height:
-  scale: 0.5
-  edge-fade-x: 0.8
-  edge-fade-y: 0.8
+  scale: 0.16
+  edge-fade-x: 3
+  edge-fade-y: 3
 normal:
   noise: 1
-  method: sobel-high
-  strength: 2
 occlusion:
-  z-scale: 4
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 24
+smooth:
+  value: 0.6
 metal:
   value: 234
 ctm:
   method: of-repeat
-  width: 4
-  height: 4
+  width: 8
+  height: 8
   match-tiles: exposed_copper
   placeholder: true
 filters:
diff --git a/src/assets/minecraft/optifine/ctm/exposed_copper/normal.png b/src/assets/minecraft/optifine/ctm/exposed_copper/normal.png
index c7b33477..a33bba2a 100644
Binary files a/src/assets/minecraft/optifine/ctm/exposed_copper/normal.png and b/src/assets/minecraft/optifine/ctm/exposed_copper/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/exposed_copper/occlusion-x.png b/src/assets/minecraft/optifine/ctm/exposed_copper/occlusion-x.png
new file mode 100644
index 00000000..4118119a
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/exposed_copper/occlusion-x.png differ
diff --git a/src/assets/minecraft/optifine/ctm/exposed_copper/occlusion.png b/src/assets/minecraft/optifine/ctm/exposed_copper/occlusion.png
index a05867e4..40805ebc 100644
Binary files a/src/assets/minecraft/optifine/ctm/exposed_copper/occlusion.png and b/src/assets/minecraft/optifine/ctm/exposed_copper/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/exposed_copper/color.png b/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/color.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/exposed_copper/color.png
rename to src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/color.png
diff --git a/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/height.png b/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/height.png
new file mode 100644
index 00000000..b9357a1e
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/mat.yml
new file mode 100644
index 00000000..abe67de5
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/mat.yml
@@ -0,0 +1,26 @@
+publish-item: true
+height:
+  scale: 0.5
+  edge-fade-x: 0.8
+  edge-fade-y: 0.8
+normal:
+  noise: 1
+  method: sobel-high
+  strength: 2
+occlusion:
+  z-scale: 4
+metal:
+  value: 234
+ctm:
+  method: of-repeat
+  width: 4
+  height: 4
+  match-tiles: exposed_copper
+  placeholder: true
+filters:
+- name: default
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.15
+  normal-radius-y: 0.15
diff --git a/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/normal.png b/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/normal.png
new file mode 100644
index 00000000..c7b33477
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/occlusion.png
new file mode 100644
index 00000000..a05867e4
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/exposed_copper/smooth.png b/src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/smooth.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/exposed_copper/smooth.png
rename to src/assets/minecraft/optifine/ctm/exposed_copper/v1.ignore/smooth.png
diff --git a/src/assets/minecraft/optifine/ctm/exposed_cut_copper/mat.yml b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/mat.yml
index 9f388ee9..e47e59c5 100644
--- a/src/assets/minecraft/optifine/ctm/exposed_cut_copper/mat.yml
+++ b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/mat.yml
@@ -1,10 +1,12 @@
 publish-item: true
+color:
+  value-red: 183
+  value-green: 97
+  value-blue: 49
 height:
   scale: 0.3
 normal:
   noise: 1
-  method: sobel-high
-  strength: 2
 occlusion:
   z-scale: 4
 metal:
diff --git a/src/assets/minecraft/optifine/ctm/exposed_cut_copper/smooth.png b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/smooth.png
index 168de5f0..e37d8b5b 100644
Binary files a/src/assets/minecraft/optifine/ctm/exposed_cut_copper/smooth.png and b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/exposed_cut_copper/color.png b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/color.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/exposed_cut_copper/color.png
rename to src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/color.png
diff --git a/src/assets/minecraft/optifine/ctm/exposed_cut_copper/color.xcf b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/color.xcf
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/exposed_cut_copper/color.xcf
rename to src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/color.xcf
diff --git a/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/height.png b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/height.png
new file mode 100644
index 00000000..394eb589
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/mat.yml
new file mode 100644
index 00000000..9f388ee9
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/mat.yml
@@ -0,0 +1,58 @@
+publish-item: true
+height:
+  scale: 0.3
+normal:
+  noise: 1
+  method: sobel-high
+  strength: 2
+occlusion:
+  z-scale: 4
+metal:
+  value: 234
+ctm:
+  method: of-repeat
+  width: 4
+  height: 4
+  match-tiles: exposed_cut_copper
+  placeholder: true
+filters:
+- name: top-left
+  left: 0
+  top: 0
+  width: 0.5
+  height: 0.5
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.3
+  normal-radius-y: 0.3
+- name: top-right
+  left: 0.5
+  top: 0
+  width: 0.5
+  height: 0.5
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.3
+  normal-radius-y: 0.3
+- name: bottom-left
+  left: 0
+  top: 0.5
+  width: 0.5
+  height: 0.5
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.3
+  normal-radius-y: 0.3
+- name: bottom-right
+  left: 0.5
+  top: 0.5
+  width: 0.5
+  height: 0.5
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.3
+  normal-radius-y: 0.3
diff --git a/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/normal.png b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/normal.png
new file mode 100644
index 00000000..3a491fbc
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/occlusion.png
new file mode 100644
index 00000000..69410ba3
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/smooth.png
new file mode 100644
index 00000000..168de5f0
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/exposed_cut_copper/v1.ignore/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/.ignore/color.png b/src/assets/minecraft/optifine/ctm/gold_block/.ignore/color.png
new file mode 100644
index 00000000..45e71298
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/.ignore/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/.ignore/height.png b/src/assets/minecraft/optifine/ctm/gold_block/.ignore/height.png
new file mode 100644
index 00000000..84ed54dd
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/gold_block/.ignore/mat.yml
new file mode 100644
index 00000000..fb140b4a
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/gold_block/.ignore/mat.yml
@@ -0,0 +1,29 @@
+publish-item: true
+height:
+  scale: 0.5
+  edge-fade-x: 0.8
+  edge-fade-y: 0.8
+normal:
+  noise: 0.3
+  method: sobel-high
+  strength: 1.5
+occlusion:
+  z-bias: 2
+  z-scale: 1
+metal:
+  value: 231
+porosity:
+  value: 0
+ctm:
+  method: of-repeat
+  width: 8
+  height: 8
+  match-tiles: gold_block
+  placeholder: true
+filters:
+- name: block
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.15
+  normal-radius-y: 0.15
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/gold_block/.ignore/occlusion.png
new file mode 100644
index 00000000..53a4c2ad
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/.ignore/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/gold_block/.ignore/smooth.png
new file mode 100644
index 00000000..a3c54fda
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/.ignore/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/albedo.png b/src/assets/minecraft/optifine/ctm/gold_block/albedo.png
deleted file mode 100644
index 89607030..00000000
Binary files a/src/assets/minecraft/optifine/ctm/gold_block/albedo.png and /dev/null differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/bump.png b/src/assets/minecraft/optifine/ctm/gold_block/bump.png
new file mode 100644
index 00000000..9723518b
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/bump.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/height.png b/src/assets/minecraft/optifine/ctm/gold_block/height.png
index 84ed54dd..d35d26cf 100644
Binary files a/src/assets/minecraft/optifine/ctm/gold_block/height.png and b/src/assets/minecraft/optifine/ctm/gold_block/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/mat.yml b/src/assets/minecraft/optifine/ctm/gold_block/mat.yml
index 033f9036..00cb9997 100644
--- a/src/assets/minecraft/optifine/ctm/gold_block/mat.yml
+++ b/src/assets/minecraft/optifine/ctm/gold_block/mat.yml
@@ -1,21 +1,20 @@
 publish-item: true
+color:
+  value-red: 195
+  value-green: 154
+  value-blue: 72
 height:
-  scale: 0.5
-  edge-fade-x: 0.8
-  edge-fade-y: 0.8
+  scale: 0.04
 normal:
-  method: sobel-low
-  strength: 1.5
+  noise: 0.5
+  method: sobel-high
+  strength: 3
 occlusion:
+  step-distance: 0.2
   z-bias: 2
-  z-scale: 1
-smooth:
-  shift: 2.6
-  scale: 0.2
+  z-scale: 8
 metal:
   value: 231
-porosity:
-  value: 0
 ctm:
   method: of-repeat
   width: 8
@@ -23,9 +22,17 @@ ctm:
   match-tiles: gold_block
   placeholder: true
 filters:
-- name: block
+- name: outer
   tile: true
   normal-curve-x: 90
   normal-curve-y: 90
-  normal-radius-x: 0.2
-  normal-radius-y: 0.2
+  normal-radius-x: 0.15
+  normal-radius-y: 0.15
+- name: inner
+  left: 0.05
+  top: 0.05
+  width: 0.9
+  height: 0.9
+  tile: true
+  normal-curve-x: -8
+  normal-curve-y: -8
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/normal.png b/src/assets/minecraft/optifine/ctm/gold_block/normal.png
new file mode 100644
index 00000000..740c2a72
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/occlusion.png b/src/assets/minecraft/optifine/ctm/gold_block/occlusion.png
index 53a4c2ad..1248e814 100644
Binary files a/src/assets/minecraft/optifine/ctm/gold_block/occlusion.png and b/src/assets/minecraft/optifine/ctm/gold_block/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/rough.png b/src/assets/minecraft/optifine/ctm/gold_block/rough.png
new file mode 100644
index 00000000..4be85ada
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/rough.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/smooth.png b/src/assets/minecraft/optifine/ctm/gold_block/smooth.png
index 6a257ffe..2e13d634 100644
Binary files a/src/assets/minecraft/optifine/ctm/gold_block/smooth.png and b/src/assets/minecraft/optifine/ctm/gold_block/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/color.png b/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/color.png
new file mode 100644
index 00000000..f59ba207
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/height.png b/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/height.png
new file mode 100644
index 00000000..4155b2bc
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/mat.yml
new file mode 100644
index 00000000..b0b7f92a
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/mat.yml
@@ -0,0 +1,20 @@
+publish-item: true
+height:
+  scale: 0.16
+  edge-fade-y: 0.4
+normal:
+  strength: 1
+occlusion:
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 24
+smooth:
+  scale: 0.85
+metal:
+  value: 231
+ctm:
+  method: of-repeat
+  width: 8
+  height: 8
+  match-tiles: gold_block
+  placeholder: true
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/normal.png b/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/normal.png
new file mode 100644
index 00000000..ecd406a7
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/occlusion.png
new file mode 100644
index 00000000..69ed5413
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/smooth.png
new file mode 100644
index 00000000..907be842
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v2.ignore/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/bump.jpg b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/bump.jpg
new file mode 100644
index 00000000..4cc55137
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/bump.jpg differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/height.png b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/height.png
new file mode 100644
index 00000000..6a349b33
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/mat.yml
new file mode 100644
index 00000000..47afb338
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/mat.yml
@@ -0,0 +1,32 @@
+publish-item: true
+color:
+  value-red: 195
+  value-green: 154
+  value-blue: 72
+height:
+  scale: 0.16
+  edge-fade-x: 1
+  edge-fade-y: 1
+normal:
+  strength: 1
+occlusion:
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 24
+smooth:
+  value: 0.75
+metal:
+  value: 231
+ctm:
+  method: of-repeat
+  width: 4
+  height: 4
+  match-tiles: gold_block
+  placeholder: true
+filters:
+- name: default
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.15
+  normal-radius-y: 0.15
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/metal-x.jpg b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/metal-x.jpg
new file mode 100644
index 00000000..71b49d40
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/metal-x.jpg differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/normal.jpg b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/normal.jpg
new file mode 100644
index 00000000..07f00d02
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/normal.jpg differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/occlusion.jpg b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/occlusion.jpg
new file mode 100644
index 00000000..e6137c73
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/occlusion.jpg differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/rough-x.jpg b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/rough-x.jpg
new file mode 100644
index 00000000..6406c020
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v3.ignore/rough-x.jpg differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/bump.png b/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/bump.png
new file mode 100644
index 00000000..0a978d90
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/bump.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/height.png b/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/height.png
new file mode 100644
index 00000000..1045fc52
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/mat.yml
new file mode 100644
index 00000000..210e3243
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/mat.yml
@@ -0,0 +1,25 @@
+publish-item: true
+color:
+  value-red: 195
+  value-green: 154
+  value-blue: 72
+height:
+  scale: 0.4
+normal:
+  noise: 0.5
+  method: sobel-high
+occlusion:
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 8
+smooth:
+  shift: -0.15
+metal:
+  value: 231
+ctm:
+  method: of-repeat
+  width: 4
+  height: 4
+  match-tiles: gold_block
+  placeholder: true
+filters: []
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/normal.png b/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/normal.png
new file mode 100644
index 00000000..45f72e38
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/occlusion.png
new file mode 100644
index 00000000..afdb68c5
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/smooth.png
new file mode 100644
index 00000000..57bc4037
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/gold_block/v4.ignore/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/color.png b/src/assets/minecraft/optifine/ctm/iron_block/color.png
new file mode 100644
index 00000000..56a66811
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/iron_block/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/height.png b/src/assets/minecraft/optifine/ctm/iron_block/height.png
index 84ed54dd..c6f30ca5 100644
Binary files a/src/assets/minecraft/optifine/ctm/iron_block/height.png and b/src/assets/minecraft/optifine/ctm/iron_block/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/mat.yml b/src/assets/minecraft/optifine/ctm/iron_block/mat.yml
index 8a4e0991..aa1a375f 100644
--- a/src/assets/minecraft/optifine/ctm/iron_block/mat.yml
+++ b/src/assets/minecraft/optifine/ctm/iron_block/mat.yml
@@ -1,20 +1,20 @@
 publish-item: true
 height:
-  scale: 0.5
-  edge-fade-x: 0.8
-  edge-fade-y: 0.8
+  shift: -0.06
+  scale: 0.1
+  edge-fade-x: 2
+  edge-fade-y: 2
 normal:
   method: sobel-low
   strength: 1.5
 occlusion:
-  z-scale: 0.2
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 2
 smooth:
-  shift: 4
-  scale: 0.2
+  scale: 1.2
 metal:
   value: 230
-porosity:
-  value: 0
 ctm:
   method: of-repeat
   width: 8
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/metal-x.png b/src/assets/minecraft/optifine/ctm/iron_block/metal-x.png
new file mode 100644
index 00000000..3fd5dc2d
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/iron_block/metal-x.png differ
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/normal.png b/src/assets/minecraft/optifine/ctm/iron_block/normal.png
new file mode 100644
index 00000000..7f75ac60
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/iron_block/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/occlusion.png b/src/assets/minecraft/optifine/ctm/iron_block/occlusion.png
index 97858a46..5702e525 100644
Binary files a/src/assets/minecraft/optifine/ctm/iron_block/occlusion.png and b/src/assets/minecraft/optifine/ctm/iron_block/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/porosity.png b/src/assets/minecraft/optifine/ctm/iron_block/porosity.png
new file mode 100644
index 00000000..db68a545
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/iron_block/porosity.png differ
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/rough-x.png b/src/assets/minecraft/optifine/ctm/iron_block/rough-x.png
new file mode 100644
index 00000000..b3a4a9a9
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/iron_block/rough-x.png differ
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/smooth.png b/src/assets/minecraft/optifine/ctm/iron_block/smooth.png
index 6a257ffe..a225bc98 100644
Binary files a/src/assets/minecraft/optifine/ctm/iron_block/smooth.png and b/src/assets/minecraft/optifine/ctm/iron_block/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/albedo.png b/src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/albedo.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/iron_block/albedo.png
rename to src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/albedo.png
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/height.png b/src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/height.png
new file mode 100644
index 00000000..84ed54dd
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/mat.yml
new file mode 100644
index 00000000..8a4e0991
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/mat.yml
@@ -0,0 +1,30 @@
+publish-item: true
+height:
+  scale: 0.5
+  edge-fade-x: 0.8
+  edge-fade-y: 0.8
+normal:
+  method: sobel-low
+  strength: 1.5
+occlusion:
+  z-scale: 0.2
+smooth:
+  shift: 4
+  scale: 0.2
+metal:
+  value: 230
+porosity:
+  value: 0
+ctm:
+  method: of-repeat
+  width: 8
+  height: 8
+  match-tiles: iron_block
+  placeholder: true
+filters:
+- name: block
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.2
+  normal-radius-y: 0.2
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/occlusion.png
new file mode 100644
index 00000000..97858a46
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/smooth.png
new file mode 100644
index 00000000..6a257ffe
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/iron_block/v1.ignore/smooth.png differ
diff --git a/src/assets/minecraft/textures/block/magma/color.png b/src/assets/minecraft/optifine/ctm/magma/.ignore/color.png
similarity index 100%
rename from src/assets/minecraft/textures/block/magma/color.png
rename to src/assets/minecraft/optifine/ctm/magma/.ignore/color.png
diff --git a/src/assets/minecraft/textures/block/magma/emissive.png b/src/assets/minecraft/optifine/ctm/magma/.ignore/emissive.png
similarity index 100%
rename from src/assets/minecraft/textures/block/magma/emissive.png
rename to src/assets/minecraft/optifine/ctm/magma/.ignore/emissive.png
diff --git a/src/assets/minecraft/textures/block/magma/height.png b/src/assets/minecraft/optifine/ctm/magma/.ignore/height.png
similarity index 100%
rename from src/assets/minecraft/textures/block/magma/height.png
rename to src/assets/minecraft/optifine/ctm/magma/.ignore/height.png
diff --git a/src/assets/minecraft/textures/block/magma/height.xcf b/src/assets/minecraft/optifine/ctm/magma/.ignore/height.xcf
similarity index 100%
rename from src/assets/minecraft/textures/block/magma/height.xcf
rename to src/assets/minecraft/optifine/ctm/magma/.ignore/height.xcf
diff --git a/src/assets/minecraft/textures/block/magma/mat.yml b/src/assets/minecraft/optifine/ctm/magma/.ignore/mat.yml
similarity index 100%
rename from src/assets/minecraft/textures/block/magma/mat.yml
rename to src/assets/minecraft/optifine/ctm/magma/.ignore/mat.yml
diff --git a/src/assets/minecraft/textures/block/magma/normal.png b/src/assets/minecraft/optifine/ctm/magma/.ignore/normal.png
similarity index 100%
rename from src/assets/minecraft/textures/block/magma/normal.png
rename to src/assets/minecraft/optifine/ctm/magma/.ignore/normal.png
diff --git a/src/assets/minecraft/textures/block/magma/occlusion.png b/src/assets/minecraft/optifine/ctm/magma/.ignore/occlusion.png
similarity index 100%
rename from src/assets/minecraft/textures/block/magma/occlusion.png
rename to src/assets/minecraft/optifine/ctm/magma/.ignore/occlusion.png
diff --git a/src/assets/minecraft/textures/block/magma/smooth.png b/src/assets/minecraft/optifine/ctm/magma/.ignore/smooth.png
similarity index 100%
rename from src/assets/minecraft/textures/block/magma/smooth.png
rename to src/assets/minecraft/optifine/ctm/magma/.ignore/smooth.png
diff --git a/src/assets/minecraft/optifine/ctm/magma/bump.png b/src/assets/minecraft/optifine/ctm/magma/bump.png
new file mode 100644
index 00000000..a68ea221
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/magma/bump.png differ
diff --git a/src/assets/minecraft/optifine/ctm/magma/color.png b/src/assets/minecraft/optifine/ctm/magma/color.png
new file mode 100644
index 00000000..34997549
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/magma/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/magma/emissive.png b/src/assets/minecraft/optifine/ctm/magma/emissive.png
new file mode 100644
index 00000000..f86f5d25
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/magma/emissive.png differ
diff --git a/src/assets/minecraft/optifine/ctm/magma/height.png b/src/assets/minecraft/optifine/ctm/magma/height.png
new file mode 100644
index 00000000..e46e5e37
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/magma/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/magma/mat.yml b/src/assets/minecraft/optifine/ctm/magma/mat.yml
new file mode 100644
index 00000000..71dd36b5
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/magma/mat.yml
@@ -0,0 +1,22 @@
+publish-item: true
+height:
+  scale: 0.5
+  edge-fade-x: 1.5
+  edge-fade-y: 1.5
+  edge-fade-strength: 0.8
+occlusion:
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 8
+smooth:
+  scale: 0.4
+f0:
+  value: 0.07
+emissive:
+  scale: 1.5
+ctm:
+  method: of-repeat
+  width: 8
+  height: 8
+  match-tiles: magma
+  placeholder: true
diff --git a/src/assets/minecraft/optifine/ctm/magma/normal.png b/src/assets/minecraft/optifine/ctm/magma/normal.png
new file mode 100644
index 00000000..9e6f085f
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/magma/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/magma/occlusion.png b/src/assets/minecraft/optifine/ctm/magma/occlusion.png
new file mode 100644
index 00000000..1ddb22cb
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/magma/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/magma/rough-x.png b/src/assets/minecraft/optifine/ctm/magma/rough-x.png
new file mode 100644
index 00000000..f26f6e09
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/magma/rough-x.png differ
diff --git a/src/assets/minecraft/optifine/ctm/magma/smooth.png b/src/assets/minecraft/optifine/ctm/magma/smooth.png
new file mode 100644
index 00000000..79b04d78
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/magma/smooth.png differ
diff --git a/src/assets/minecraft/textures/block/nether_wart_block/albedo.png b/src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/albedo.png
similarity index 100%
rename from src/assets/minecraft/textures/block/nether_wart_block/albedo.png
rename to src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/albedo.png
diff --git a/src/assets/minecraft/textures/block/nether_wart_block/emissive.png b/src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/emissive.png
similarity index 100%
rename from src/assets/minecraft/textures/block/nether_wart_block/emissive.png
rename to src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/emissive.png
diff --git a/src/assets/minecraft/textures/block/nether_wart_block/height.png b/src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/height.png
similarity index 100%
rename from src/assets/minecraft/textures/block/nether_wart_block/height.png
rename to src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/height.png
diff --git a/src/assets/minecraft/textures/block/nether_wart_block/mat.yml b/src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/mat.yml
similarity index 100%
rename from src/assets/minecraft/textures/block/nether_wart_block/mat.yml
rename to src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/mat.yml
diff --git a/src/assets/minecraft/textures/block/nether_wart_block/occlusion.png b/src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/occlusion.png
similarity index 100%
rename from src/assets/minecraft/textures/block/nether_wart_block/occlusion.png
rename to src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/occlusion.png
diff --git a/src/assets/minecraft/textures/block/nether_wart_block/smooth.png b/src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/smooth.png
similarity index 100%
rename from src/assets/minecraft/textures/block/nether_wart_block/smooth.png
rename to src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/smooth.png
diff --git a/src/assets/minecraft/textures/block/nether_wart_block/sss.png b/src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/sss.png
similarity index 100%
rename from src/assets/minecraft/textures/block/nether_wart_block/sss.png
rename to src/assets/minecraft/optifine/ctm/nether_wart_block/.ignore/sss.png
diff --git a/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_COLOR.jpg b/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_COLOR.jpg
new file mode 100644
index 00000000..19a06105
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_COLOR.jpg differ
diff --git a/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_DISP.png b/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_DISP.png
new file mode 100644
index 00000000..6cba157b
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_DISP.png differ
diff --git a/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_NORM.jpg b/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_NORM.jpg
new file mode 100644
index 00000000..ac98bd36
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_NORM.jpg differ
diff --git a/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_OCC.jpg b/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_OCC.jpg
new file mode 100644
index 00000000..94a9c09e
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_OCC.jpg differ
diff --git a/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_ROUGH.jpg b/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_ROUGH.jpg
new file mode 100644
index 00000000..c5203b8a
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_wart_block/Abstract_Organic_002_ROUGH.jpg differ
diff --git a/src/assets/minecraft/optifine/ctm/nether_wart_block/bump.png b/src/assets/minecraft/optifine/ctm/nether_wart_block/bump.png
new file mode 100644
index 00000000..d595251b
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_wart_block/bump.png differ
diff --git a/src/assets/minecraft/optifine/ctm/nether_wart_block/color.png b/src/assets/minecraft/optifine/ctm/nether_wart_block/color.png
new file mode 100644
index 00000000..151841b4
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_wart_block/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/nether_wart_block/height.png b/src/assets/minecraft/optifine/ctm/nether_wart_block/height.png
new file mode 100644
index 00000000..162dd90a
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_wart_block/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/nether_wart_block/mat.yml b/src/assets/minecraft/optifine/ctm/nether_wart_block/mat.yml
new file mode 100644
index 00000000..4ce05eaa
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/nether_wart_block/mat.yml
@@ -0,0 +1,25 @@
+publish-item: true
+height:
+  edge-fade-x: 1
+  edge-fade-y: 1
+occlusion:
+  step-distance: 0.1
+  z-bias: 2
+  z-scale: 8
+f0:
+  value: 0.017
+sss:
+  value: 0.6
+ctm:
+  method: of-repeat
+  width: 4
+  height: 4
+  match-tiles: nether_wart_block
+  placeholder: true
+filters:
+- name: default
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.5
+  normal-radius-y: 0.5
diff --git a/src/assets/minecraft/optifine/ctm/nether_wart_block/normal.png b/src/assets/minecraft/optifine/ctm/nether_wart_block/normal.png
new file mode 100644
index 00000000..1e284607
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_wart_block/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/nether_wart_block/occlusion.png b/src/assets/minecraft/optifine/ctm/nether_wart_block/occlusion.png
new file mode 100644
index 00000000..eab2ad58
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_wart_block/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/nether_wart_block/smooth.png b/src/assets/minecraft/optifine/ctm/nether_wart_block/smooth.png
new file mode 100644
index 00000000..54e20f0b
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/nether_wart_block/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/bump.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/bump.png
new file mode 100644
index 00000000..e14a3a1d
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_copper/bump.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/color-1.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/color-1.png
new file mode 100644
index 00000000..13014ea1
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_copper/color-1.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/color-2.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/color-2.png
new file mode 100644
index 00000000..bd618104
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_copper/color-2.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/color.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/color.png
index 32bb8ab7..b641768d 100644
Binary files a/src/assets/minecraft/optifine/ctm/oxidized_copper/color.png and b/src/assets/minecraft/optifine/ctm/oxidized_copper/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/height.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/height.png
index b9357a1e..6a349b33 100644
Binary files a/src/assets/minecraft/optifine/ctm/oxidized_copper/height.png and b/src/assets/minecraft/optifine/ctm/oxidized_copper/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/mat.yml b/src/assets/minecraft/optifine/ctm/oxidized_copper/mat.yml
index 3b3fb245..c238dbb6 100644
--- a/src/assets/minecraft/optifine/ctm/oxidized_copper/mat.yml
+++ b/src/assets/minecraft/optifine/ctm/oxidized_copper/mat.yml
@@ -1,26 +1,23 @@
 publish-item: true
-color:
-  scale-red: 0.8
-  scale-green: 0.8
-  scale-blue: 0.8
 height:
-  scale: 0.5
-  edge-fade-x: 0.8
-  edge-fade-y: 0.8
+  scale: 0.16
+  edge-fade-x: 3
+  edge-fade-y: 3
 normal:
   noise: 6
-  method: sobel-high
-  strength: 2
+  strength: 1
 occlusion:
-  z-scale: 4
+  step-distance: 0.2
+  z-bias: 2
+  z-scale: 6
 smooth:
-  scale: 0.6
-porosity:
-  value: 0.8
+  shift: 0.08
+metal:
+  value: 234
 ctm:
   method: of-repeat
-  width: 4
-  height: 4
+  width: 8
+  height: 8
   match-tiles: oxidized_copper
   placeholder: true
 filters:
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/normal.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/normal.png
index c7b33477..c6deed12 100644
Binary files a/src/assets/minecraft/optifine/ctm/oxidized_copper/normal.png and b/src/assets/minecraft/optifine/ctm/oxidized_copper/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/occlusion-x.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/occlusion-x.png
new file mode 100644
index 00000000..4118119a
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_copper/occlusion-x.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/occlusion.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/occlusion.png
index a05867e4..40805ebc 100644
Binary files a/src/assets/minecraft/optifine/ctm/oxidized_copper/occlusion.png and b/src/assets/minecraft/optifine/ctm/oxidized_copper/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/smooth.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/smooth.png
index 5a4ef030..7d65d959 100644
Binary files a/src/assets/minecraft/optifine/ctm/oxidized_copper/smooth.png and b/src/assets/minecraft/optifine/ctm/oxidized_copper/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/color.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/color.png
new file mode 100644
index 00000000..32bb8ab7
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/f0.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/f0.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/oxidized_copper/f0.png
rename to src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/f0.png
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/height.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/height.png
new file mode 100644
index 00000000..b9357a1e
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/mat.yml
new file mode 100644
index 00000000..3b3fb245
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/mat.yml
@@ -0,0 +1,32 @@
+publish-item: true
+color:
+  scale-red: 0.8
+  scale-green: 0.8
+  scale-blue: 0.8
+height:
+  scale: 0.5
+  edge-fade-x: 0.8
+  edge-fade-y: 0.8
+normal:
+  noise: 6
+  method: sobel-high
+  strength: 2
+occlusion:
+  z-scale: 4
+smooth:
+  scale: 0.6
+porosity:
+  value: 0.8
+ctm:
+  method: of-repeat
+  width: 4
+  height: 4
+  match-tiles: oxidized_copper
+  placeholder: true
+filters:
+- name: default
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.15
+  normal-radius-y: 0.15
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/normal.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/normal.png
new file mode 100644
index 00000000..c7b33477
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/occlusion.png
new file mode 100644
index 00000000..a05867e4
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/smooth.png
new file mode 100644
index 00000000..5a4ef030
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_copper/v1.ignore/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/color.png b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/color.png
index 32bb8ab7..b641768d 100644
Binary files a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/color.png and b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/mat.yml b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/mat.yml
index 101cd6bb..bfaeff32 100644
--- a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/mat.yml
+++ b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/mat.yml
@@ -7,14 +7,12 @@ height:
   scale: 0.3
 normal:
   noise: 6
-  method: sobel-high
-  strength: 2
 occlusion:
   z-scale: 4
 smooth:
-  scale: 0.6
-porosity:
-  value: 0.8
+  shift: 0.08
+metal:
+  value: 234
 ctm:
   method: of-repeat
   width: 4
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/smooth.png b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/smooth.png
index f3806171..7d65d959 100644
Binary files a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/smooth.png and b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/.ignore/color.png b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v1.ignore/color.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/oxidized_cut_copper/.ignore/color.png
rename to src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v1.ignore/color.png
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/.ignore/metal.png b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v1.ignore/metal.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/oxidized_cut_copper/.ignore/metal.png
rename to src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v1.ignore/metal.png
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v1.ignore/smooth.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/oxidized_cut_copper/.ignore/smooth.png
rename to src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v1.ignore/smooth.png
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/color.png b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/color.png
new file mode 100644
index 00000000..32bb8ab7
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/color.xcf b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/color.xcf
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/oxidized_cut_copper/color.xcf
rename to src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/color.xcf
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/f0.png b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/f0.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/oxidized_cut_copper/f0.png
rename to src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/f0.png
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/height.png b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/height.png
new file mode 100644
index 00000000..394eb589
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/mat.yml
new file mode 100644
index 00000000..101cd6bb
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/mat.yml
@@ -0,0 +1,64 @@
+publish-item: true
+color:
+  scale-red: 0.8
+  scale-green: 0.8
+  scale-blue: 0.8
+height:
+  scale: 0.3
+normal:
+  noise: 6
+  method: sobel-high
+  strength: 2
+occlusion:
+  z-scale: 4
+smooth:
+  scale: 0.6
+porosity:
+  value: 0.8
+ctm:
+  method: of-repeat
+  width: 4
+  height: 4
+  match-tiles: oxidized_cut_copper
+  placeholder: true
+filters:
+- name: top-left
+  left: 0
+  top: 0
+  width: 0.5
+  height: 0.5
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.3
+  normal-radius-y: 0.3
+- name: top-right
+  left: 0.5
+  top: 0
+  width: 0.5
+  height: 0.5
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.3
+  normal-radius-y: 0.3
+- name: bottom-left
+  left: 0
+  top: 0.5
+  width: 0.5
+  height: 0.5
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.3
+  normal-radius-y: 0.3
+- name: bottom-right
+  left: 0.5
+  top: 0.5
+  width: 0.5
+  height: 0.5
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.3
+  normal-radius-y: 0.3
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/normal.png b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/normal.png
new file mode 100644
index 00000000..3a491fbc
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/occlusion.png
new file mode 100644
index 00000000..69410ba3
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/smooth.png
new file mode 100644
index 00000000..f3806171
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/oxidized_cut_copper/v2.ignore/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/bump.png b/src/assets/minecraft/optifine/ctm/weathered_copper/bump.png
new file mode 100644
index 00000000..e14a3a1d
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/weathered_copper/bump.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/color.png b/src/assets/minecraft/optifine/ctm/weathered_copper/color.png
index cd3ebd31..ddd62cbd 100644
Binary files a/src/assets/minecraft/optifine/ctm/weathered_copper/color.png and b/src/assets/minecraft/optifine/ctm/weathered_copper/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/height.png b/src/assets/minecraft/optifine/ctm/weathered_copper/height.png
index b9357a1e..6a349b33 100644
Binary files a/src/assets/minecraft/optifine/ctm/weathered_copper/height.png and b/src/assets/minecraft/optifine/ctm/weathered_copper/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/mat.yml b/src/assets/minecraft/optifine/ctm/weathered_copper/mat.yml
index 9cd10a1a..5d90730a 100644
--- a/src/assets/minecraft/optifine/ctm/weathered_copper/mat.yml
+++ b/src/assets/minecraft/optifine/ctm/weathered_copper/mat.yml
@@ -1,24 +1,23 @@
 publish-item: true
 height:
-  scale: 0.5
-  edge-fade-x: 0.8
-  edge-fade-y: 0.8
+  scale: 0.16
+  edge-fade-x: 3
+  edge-fade-y: 3
 normal:
   noise: 3
-  method: sobel-high
-  strength: 2
+  strength: 1
 occlusion:
-  z-scale: 4
+  step-distance: 0.2
+  z-bias: 2
+  z-scale: 6
 smooth:
-  shift: -0.08
+  scale: 0.8
 metal:
   value: 234
-porosity:
-  value: 0.4
 ctm:
   method: of-repeat
-  width: 4
-  height: 4
+  width: 8
+  height: 8
   match-tiles: weathered_copper
   placeholder: true
 filters:
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/normal.png b/src/assets/minecraft/optifine/ctm/weathered_copper/normal.png
index c7b33477..c6deed12 100644
Binary files a/src/assets/minecraft/optifine/ctm/weathered_copper/normal.png and b/src/assets/minecraft/optifine/ctm/weathered_copper/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/occlusion-x.png b/src/assets/minecraft/optifine/ctm/weathered_copper/occlusion-x.png
new file mode 100644
index 00000000..4118119a
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/weathered_copper/occlusion-x.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/occlusion.png b/src/assets/minecraft/optifine/ctm/weathered_copper/occlusion.png
index a05867e4..40805ebc 100644
Binary files a/src/assets/minecraft/optifine/ctm/weathered_copper/occlusion.png and b/src/assets/minecraft/optifine/ctm/weathered_copper/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/smooth.png b/src/assets/minecraft/optifine/ctm/weathered_copper/smooth.png
index 5a4ef030..a2ed6c7f 100644
Binary files a/src/assets/minecraft/optifine/ctm/weathered_copper/smooth.png and b/src/assets/minecraft/optifine/ctm/weathered_copper/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/color.png b/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/color.png
new file mode 100644
index 00000000..cd3ebd31
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/height.png b/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/height.png
new file mode 100644
index 00000000..b9357a1e
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/mat.yml
new file mode 100644
index 00000000..9cd10a1a
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/mat.yml
@@ -0,0 +1,30 @@
+publish-item: true
+height:
+  scale: 0.5
+  edge-fade-x: 0.8
+  edge-fade-y: 0.8
+normal:
+  noise: 3
+  method: sobel-high
+  strength: 2
+occlusion:
+  z-scale: 4
+smooth:
+  shift: -0.08
+metal:
+  value: 234
+porosity:
+  value: 0.4
+ctm:
+  method: of-repeat
+  width: 4
+  height: 4
+  match-tiles: weathered_copper
+  placeholder: true
+filters:
+- name: default
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.15
+  normal-radius-y: 0.15
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/normal.png b/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/normal.png
new file mode 100644
index 00000000..c7b33477
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/occlusion.png
new file mode 100644
index 00000000..a05867e4
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/smooth.png
new file mode 100644
index 00000000..5a4ef030
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/weathered_copper/v1.ignore/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/color.png b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/color.png
index cd3ebd31..ddd62cbd 100644
Binary files a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/color.png and b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/mat.yml b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/mat.yml
index 30ff56f9..8da8d47c 100644
--- a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/mat.yml
+++ b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/mat.yml
@@ -3,16 +3,12 @@ height:
   scale: 0.3
 normal:
   noise: 3
-  method: sobel-high
-  strength: 2
 occlusion:
   z-scale: 4
 smooth:
-  shift: -0.08
+  scale: 0.8
 metal:
   value: 234
-porosity:
-  value: 0.4
 ctm:
   method: of-repeat
   width: 4
diff --git a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/smooth.png b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/smooth.png
index f3806171..a2ed6c7f 100644
Binary files a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/smooth.png and b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/smooth.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/.ignore/color.png b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v1.ignore/color.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/weathered_cut_copper/.ignore/color.png
rename to src/assets/minecraft/optifine/ctm/weathered_cut_copper/v1.ignore/color.png
diff --git a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/.ignore/metal.png b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v1.ignore/metal.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/weathered_cut_copper/.ignore/metal.png
rename to src/assets/minecraft/optifine/ctm/weathered_cut_copper/v1.ignore/metal.png
diff --git a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v1.ignore/smooth.png
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/weathered_cut_copper/.ignore/smooth.png
rename to src/assets/minecraft/optifine/ctm/weathered_cut_copper/v1.ignore/smooth.png
diff --git a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/color.png b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/color.png
new file mode 100644
index 00000000..cd3ebd31
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/color.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/color.xcf b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/color.xcf
similarity index 100%
rename from src/assets/minecraft/optifine/ctm/weathered_cut_copper/color.xcf
rename to src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/color.xcf
diff --git a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/height.png b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/height.png
new file mode 100644
index 00000000..394eb589
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/height.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/mat.yml b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/mat.yml
new file mode 100644
index 00000000..30ff56f9
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/mat.yml
@@ -0,0 +1,62 @@
+publish-item: true
+height:
+  scale: 0.3
+normal:
+  noise: 3
+  method: sobel-high
+  strength: 2
+occlusion:
+  z-scale: 4
+smooth:
+  shift: -0.08
+metal:
+  value: 234
+porosity:
+  value: 0.4
+ctm:
+  method: of-repeat
+  width: 4
+  height: 4
+  match-tiles: weathered_cut_copper
+  placeholder: true
+filters:
+- name: top-left
+  left: 0
+  top: 0
+  width: 0.5
+  height: 0.5
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.3
+  normal-radius-y: 0.3
+- name: top-right
+  left: 0.5
+  top: 0
+  width: 0.5
+  height: 0.5
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.3
+  normal-radius-y: 0.3
+- name: bottom-left
+  left: 0
+  top: 0.5
+  width: 0.5
+  height: 0.5
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.3
+  normal-radius-y: 0.3
+- name: bottom-right
+  left: 0.5
+  top: 0.5
+  width: 0.5
+  height: 0.5
+  tile: true
+  normal-curve-x: 90
+  normal-curve-y: 90
+  normal-radius-x: 0.3
+  normal-radius-y: 0.3
diff --git a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/normal.png b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/normal.png
new file mode 100644
index 00000000..3a491fbc
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/normal.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/occlusion.png b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/occlusion.png
new file mode 100644
index 00000000..69410ba3
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/occlusion.png differ
diff --git a/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/smooth.png b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/smooth.png
new file mode 100644
index 00000000..f3806171
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/weathered_cut_copper/v2.ignore/smooth.png differ
diff --git a/src/assets/minecraft/textures/block/crimson_hyphae/normal.png b/src/assets/minecraft/textures/block/crimson_hyphae/normal.png
new file mode 100644
index 00000000..afa4ff45
Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_hyphae/normal.png differ
diff --git a/src/assets/minecraft/textures/block/crimson_hyphae/occlusion.png b/src/assets/minecraft/textures/block/crimson_hyphae/occlusion.png
index 60b2caab..da1f734e 100644
Binary files a/src/assets/minecraft/textures/block/crimson_hyphae/occlusion.png and b/src/assets/minecraft/textures/block/crimson_hyphae/occlusion.png differ
diff --git a/src/assets/minecraft/textures/block/crimson_hyphae/smooth.png b/src/assets/minecraft/textures/block/crimson_hyphae/smooth.png
new file mode 100644
index 00000000..fbe83f5d
Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_hyphae/smooth.png differ
diff --git a/src/assets/minecraft/textures/block/crimson_stem/mat.yml b/src/assets/minecraft/textures/block/crimson_stem/mat.yml
index 6916a3f3..064cd78c 100644
--- a/src/assets/minecraft/textures/block/crimson_stem/mat.yml
+++ b/src/assets/minecraft/textures/block/crimson_stem/mat.yml
@@ -7,13 +7,12 @@ height:
 normal:
   noise: 6
   curve-x: 90
-  method: sobel3
+  method: sobel-low
+  strength: 4
 occlusion:
-  step-distance: 0.2
-  z-bias: 0
-  z-scale: 20
-smooth:
-  value: 0.22
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 8
 f0:
   value: 0.07
 sss:
diff --git a/src/assets/minecraft/textures/block/crimson_stem/normal.png b/src/assets/minecraft/textures/block/crimson_stem/normal.png
new file mode 100644
index 00000000..afa4ff45
Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_stem/normal.png differ
diff --git a/src/assets/minecraft/textures/block/crimson_stem/occlusion.png b/src/assets/minecraft/textures/block/crimson_stem/occlusion.png
index 60b2caab..da1f734e 100644
Binary files a/src/assets/minecraft/textures/block/crimson_stem/occlusion.png and b/src/assets/minecraft/textures/block/crimson_stem/occlusion.png differ
diff --git a/src/assets/minecraft/textures/block/crimson_stem/smooth.png b/src/assets/minecraft/textures/block/crimson_stem/smooth.png
new file mode 100644
index 00000000..fbe83f5d
Binary files /dev/null and b/src/assets/minecraft/textures/block/crimson_stem/smooth.png differ
diff --git a/src/assets/minecraft/textures/block/grass_block_side_overlay/mat.yml b/src/assets/minecraft/textures/block/grass_block_side_overlay/mat.yml
index 56d4852c..6b140e12 100644
--- a/src/assets/minecraft/textures/block/grass_block_side_overlay/mat.yml
+++ b/src/assets/minecraft/textures/block/grass_block_side_overlay/mat.yml
@@ -1,7 +1,6 @@
 publish-item: true
 wrap-x: true
 wrap-y: false
-model: grass_block_overlay
 tint-color: '#79C05A'
 color:
   _-preview-tint: '#79C05A'
@@ -11,7 +10,7 @@ color:
 height:
   texture: opacity.png
   scale: 0.1
-  edge-fade-y: 0.1
+  edge-fade-y: 0.01
 normal:
   noise: 8
   curve-y: 90
diff --git a/src/assets/minecraft/textures/block/lightning_rod/mat.yml b/src/assets/minecraft/textures/block/lightning_rod/mat.yml
index 3929f5e5..784c76ad 100644
--- a/src/assets/minecraft/textures/block/lightning_rod/mat.yml
+++ b/src/assets/minecraft/textures/block/lightning_rod/mat.yml
@@ -9,12 +9,15 @@ smooth:
   value: 0.8
 metal:
   value: 234
+ctm: {}
 filters:
-- width: 0.25
+- name: end
+  width: 0.25
   height: 0.25
   normal-curve-x: 90
   normal-curve-y: 90
-- top: 0.25
+- name: rod
+  top: 0.25
   width: 0.125
   height: 0.75
   normal-curve-x: 90
diff --git a/src/assets/minecraft/textures/block/nether_wart_block/.ignore/height.png b/src/assets/minecraft/textures/block/nether_wart_block/.ignore/height.png
deleted file mode 100644
index 6cfef7a5..00000000
Binary files a/src/assets/minecraft/textures/block/nether_wart_block/.ignore/height.png and /dev/null differ
diff --git a/src/assets/minecraft/textures/block/nether_wart_block/.ignore/mat.yml b/src/assets/minecraft/textures/block/nether_wart_block/.ignore/mat.yml
deleted file mode 100644
index 107f8830..00000000
--- a/src/assets/minecraft/textures/block/nether_wart_block/.ignore/mat.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-alpha:
-  value: 255
-albedo:
-  value-red: 117
-  value-green: 3
-  value-blue: 2
-height:
-  scale: 0.5
-normal:
-  noise: 3
-occlusion:
-  z-bias: 0
-  z-scale: 5
-  step-distance: 0.15
-smooth: {}
-f0:
-  value: 0.08
-sss:
-  value: 0.16
-create-inventory: true
diff --git a/src/assets/minecraft/textures/block/nether_wart_block/.ignore/occlusion.png b/src/assets/minecraft/textures/block/nether_wart_block/.ignore/occlusion.png
deleted file mode 100644
index b0e1c599..00000000
Binary files a/src/assets/minecraft/textures/block/nether_wart_block/.ignore/occlusion.png and /dev/null differ
diff --git a/src/assets/minecraft/textures/block/nether_wart_block/.ignore/smooth.png b/src/assets/minecraft/textures/block/nether_wart_block/.ignore/smooth.png
deleted file mode 100644
index 65092ecb..00000000
Binary files a/src/assets/minecraft/textures/block/nether_wart_block/.ignore/smooth.png and /dev/null differ
diff --git a/src/assets/minecraft/textures/block/rail/albedo.png b/src/assets/minecraft/textures/block/rail/albedo.png
deleted file mode 100644
index 52c19789..00000000
Binary files a/src/assets/minecraft/textures/block/rail/albedo.png and /dev/null differ
diff --git a/src/assets/minecraft/textures/block/rail/alpha.png b/src/assets/minecraft/textures/block/rail/alpha.png
deleted file mode 100644
index e2041046..00000000
Binary files a/src/assets/minecraft/textures/block/rail/alpha.png and /dev/null differ
diff --git a/src/assets/minecraft/textures/block/rail/color.png b/src/assets/minecraft/textures/block/rail/color.png
new file mode 100644
index 00000000..527ae8f5
Binary files /dev/null and b/src/assets/minecraft/textures/block/rail/color.png differ
diff --git a/src/assets/minecraft/textures/block/rail/f0.png b/src/assets/minecraft/textures/block/rail/f0.png
deleted file mode 100644
index 291b7f64..00000000
Binary files a/src/assets/minecraft/textures/block/rail/f0.png and /dev/null differ
diff --git a/src/assets/minecraft/textures/block/rail/height.png b/src/assets/minecraft/textures/block/rail/height.png
index 8595f77f..801a5b7c 100644
Binary files a/src/assets/minecraft/textures/block/rail/height.png and b/src/assets/minecraft/textures/block/rail/height.png differ
diff --git a/src/assets/minecraft/textures/block/rail/mat.yml b/src/assets/minecraft/textures/block/rail/mat.yml
index 204d4014..7a63acb4 100644
--- a/src/assets/minecraft/textures/block/rail/mat.yml
+++ b/src/assets/minecraft/textures/block/rail/mat.yml
@@ -1,12 +1,14 @@
 publish-item: true
 wrap-x: false
-model-file: rail
 height:
-  scale: 0.2
-  edge-fade-x: 0.1
+  scale: 0.25
+  edge-fade-x: 0.01
 normal:
   method: sobel-low
 occlusion:
-  step-distance: 0.15
-  z-bias: 0
-  z-scale: 4
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 8
+f0:
+  value: 0.04
+ctm: {}
diff --git a/src/assets/minecraft/textures/block/rail/metal.png b/src/assets/minecraft/textures/block/rail/metal.png
index b17e5f58..3209ff88 100644
Binary files a/src/assets/minecraft/textures/block/rail/metal.png and b/src/assets/minecraft/textures/block/rail/metal.png differ
diff --git a/src/assets/minecraft/textures/block/rail/normal.png b/src/assets/minecraft/textures/block/rail/normal.png
index 4b897165..0901dc41 100644
Binary files a/src/assets/minecraft/textures/block/rail/normal.png and b/src/assets/minecraft/textures/block/rail/normal.png differ
diff --git a/src/assets/minecraft/textures/block/rail/occlusion.png b/src/assets/minecraft/textures/block/rail/occlusion.png
index 08fde559..f8a20526 100644
Binary files a/src/assets/minecraft/textures/block/rail/occlusion.png and b/src/assets/minecraft/textures/block/rail/occlusion.png differ
diff --git a/src/assets/minecraft/textures/block/rail/opacity.png b/src/assets/minecraft/textures/block/rail/opacity.png
new file mode 100644
index 00000000..b9eddbc8
Binary files /dev/null and b/src/assets/minecraft/textures/block/rail/opacity.png differ
diff --git a/src/assets/minecraft/textures/block/rail/porosity.png b/src/assets/minecraft/textures/block/rail/porosity.png
new file mode 100644
index 00000000..80f29af0
Binary files /dev/null and b/src/assets/minecraft/textures/block/rail/porosity.png differ
diff --git a/src/assets/minecraft/textures/block/rail/smooth.png b/src/assets/minecraft/textures/block/rail/smooth.png
index 467895f8..d061024c 100644
Binary files a/src/assets/minecraft/textures/block/rail/smooth.png and b/src/assets/minecraft/textures/block/rail/smooth.png differ
diff --git a/src/assets/minecraft/textures/block/rail_corner/albedo.png b/src/assets/minecraft/textures/block/rail_corner/albedo.png
deleted file mode 100644
index 5c63d1f4..00000000
Binary files a/src/assets/minecraft/textures/block/rail_corner/albedo.png and /dev/null differ
diff --git a/src/assets/minecraft/textures/block/rail_corner/alpha.png b/src/assets/minecraft/textures/block/rail_corner/alpha.png
deleted file mode 100644
index abd40395..00000000
Binary files a/src/assets/minecraft/textures/block/rail_corner/alpha.png and /dev/null differ
diff --git a/src/assets/minecraft/textures/block/rail_corner/bump.png b/src/assets/minecraft/textures/block/rail_corner/bump.png
new file mode 100644
index 00000000..2d7c6e32
Binary files /dev/null and b/src/assets/minecraft/textures/block/rail_corner/bump.png differ
diff --git a/src/assets/minecraft/textures/block/rail_corner/color.png b/src/assets/minecraft/textures/block/rail_corner/color.png
new file mode 100644
index 00000000..e54c7d11
Binary files /dev/null and b/src/assets/minecraft/textures/block/rail_corner/color.png differ
diff --git a/src/assets/minecraft/textures/block/rail_corner/f0.png b/src/assets/minecraft/textures/block/rail_corner/f0.png
deleted file mode 100644
index 6c92d449..00000000
Binary files a/src/assets/minecraft/textures/block/rail_corner/f0.png and /dev/null differ
diff --git a/src/assets/minecraft/textures/block/rail_corner/height.png b/src/assets/minecraft/textures/block/rail_corner/height.png
index 8cdc258d..d6109112 100644
Binary files a/src/assets/minecraft/textures/block/rail_corner/height.png and b/src/assets/minecraft/textures/block/rail_corner/height.png differ
diff --git a/src/assets/minecraft/textures/block/rail_corner/mat.yml b/src/assets/minecraft/textures/block/rail_corner/mat.yml
index ab37c9c7..5593ce0f 100644
--- a/src/assets/minecraft/textures/block/rail_corner/mat.yml
+++ b/src/assets/minecraft/textures/block/rail_corner/mat.yml
@@ -1,14 +1,15 @@
 publish-item: true
 wrap-x: false
 wrap-y: false
-model-file: rail
 height:
-  scale: 0.2
-  edge-fade-x: 0.1
-  edge-fade-y: 0.1
+  scale: 0.25
 normal:
   method: sobel-low
+  strength: 2.5
 occlusion:
-  step-distance: 0.15
-  z-bias: 0
-  z-scale: 4
+  step-distance: 0.1
+  z-bias: 1
+  z-scale: 8
+f0:
+  value: 0.04
+ctm: {}
diff --git a/src/assets/minecraft/textures/block/rail_corner/metal.png b/src/assets/minecraft/textures/block/rail_corner/metal.png
index 7699d800..b382c851 100644
Binary files a/src/assets/minecraft/textures/block/rail_corner/metal.png and b/src/assets/minecraft/textures/block/rail_corner/metal.png differ
diff --git a/src/assets/minecraft/textures/block/rail_corner/normal.png b/src/assets/minecraft/textures/block/rail_corner/normal.png
new file mode 100644
index 00000000..20cfd431
Binary files /dev/null and b/src/assets/minecraft/textures/block/rail_corner/normal.png differ
diff --git a/src/assets/minecraft/textures/block/rail_corner/occlusion.png b/src/assets/minecraft/textures/block/rail_corner/occlusion.png
index 1dc38340..a9e2bbf5 100644
Binary files a/src/assets/minecraft/textures/block/rail_corner/occlusion.png and b/src/assets/minecraft/textures/block/rail_corner/occlusion.png differ
diff --git a/src/assets/minecraft/textures/block/rail_corner/opacity.png b/src/assets/minecraft/textures/block/rail_corner/opacity.png
new file mode 100644
index 00000000..d3616939
Binary files /dev/null and b/src/assets/minecraft/textures/block/rail_corner/opacity.png differ
diff --git a/src/assets/minecraft/textures/block/rail_corner/porosity.png b/src/assets/minecraft/textures/block/rail_corner/porosity.png
new file mode 100644
index 00000000..8d6e2f80
Binary files /dev/null and b/src/assets/minecraft/textures/block/rail_corner/porosity.png differ
diff --git a/src/assets/minecraft/textures/block/rail_corner/smooth.png b/src/assets/minecraft/textures/block/rail_corner/smooth.png
index 327c2721..3b0ce86f 100644
Binary files a/src/assets/minecraft/textures/block/rail_corner/smooth.png and b/src/assets/minecraft/textures/block/rail_corner/smooth.png differ
diff --git a/src/assets/minecraft/textures/block/warped_hyphae/normal.png b/src/assets/minecraft/textures/block/warped_hyphae/normal.png
new file mode 100644
index 00000000..afa4ff45
Binary files /dev/null and b/src/assets/minecraft/textures/block/warped_hyphae/normal.png differ
diff --git a/src/assets/minecraft/textures/block/warped_hyphae/occlusion.png b/src/assets/minecraft/textures/block/warped_hyphae/occlusion.png
index 60b2caab..da1f734e 100644
Binary files a/src/assets/minecraft/textures/block/warped_hyphae/occlusion.png and b/src/assets/minecraft/textures/block/warped_hyphae/occlusion.png differ
diff --git a/src/assets/minecraft/textures/block/warped_hyphae/smooth.png b/src/assets/minecraft/textures/block/warped_hyphae/smooth.png
new file mode 100644
index 00000000..fbe83f5d
Binary files /dev/null and b/src/assets/minecraft/textures/block/warped_hyphae/smooth.png differ
diff --git a/src/assets/minecraft/textures/block/warped_stem/normal.png b/src/assets/minecraft/textures/block/warped_stem/normal.png
new file mode 100644
index 00000000..afa4ff45
Binary files /dev/null and b/src/assets/minecraft/textures/block/warped_stem/normal.png differ
diff --git a/src/assets/minecraft/textures/block/warped_stem/occlusion.png b/src/assets/minecraft/textures/block/warped_stem/occlusion.png
index 60b2caab..da1f734e 100644
Binary files a/src/assets/minecraft/textures/block/warped_stem/occlusion.png and b/src/assets/minecraft/textures/block/warped_stem/occlusion.png differ
diff --git a/src/assets/minecraft/textures/block/warped_stem/smooth.png b/src/assets/minecraft/textures/block/warped_stem/smooth.png
new file mode 100644
index 00000000..fbe83f5d
Binary files /dev/null and b/src/assets/minecraft/textures/block/warped_stem/smooth.png differ