diff --git a/src/assets/minecraft/optifine/ctm/grass_block_top/grass_block_top.pbr.yml b/src/assets/minecraft/optifine/ctm/grass_block_top/grass_block_top.pbr.yml
new file mode 100644
index 00000000..fd917ba3
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/grass_block_top/grass_block_top.pbr.yml
@@ -0,0 +1,28 @@
+alpha:
+  value: 255
+albedo:
+  value-red: 128
+  value-green: 128
+  value-blue: 128
+height:
+  shift: -0.12
+  scale: 0.4
+  edge-fade-x: 3
+  edge-fade-y: 3
+normal:
+  strength: 0.8
+  noise: 4
+occlusion:
+  z-bias: 0
+  z-scale: 6
+  step-distance: 0.15
+smooth:
+  scale: 0.3
+f0:
+  value: 0.017
+porosity: {}
+sss:
+  value: 0.2
+ctm-count-x: 8
+ctm-count-y: 8
+ctm-type: repeat
diff --git a/src/assets/minecraft/optifine/ctm/grass_block_top/grass_block_top.properties b/src/assets/minecraft/optifine/ctm/grass_block_top/grass_block_top.properties
new file mode 100644
index 00000000..cecc0b7f
--- /dev/null
+++ b/src/assets/minecraft/optifine/ctm/grass_block_top/grass_block_top.properties
@@ -0,0 +1,5 @@
+matchTiles=grass_block_top
+method=repeat
+width=8
+height=8
+tiles=0-63
diff --git a/src/assets/minecraft/optifine/ctm/grass_block_top/grass_block_top_h.png b/src/assets/minecraft/optifine/ctm/grass_block_top/grass_block_top_h.png
new file mode 100644
index 00000000..6453ee13
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/grass_block_top/grass_block_top_h.png differ
diff --git a/src/assets/minecraft/optifine/ctm/grass_block_top/grass_block_top_smooth.png b/src/assets/minecraft/optifine/ctm/grass_block_top/grass_block_top_smooth.png
new file mode 100644
index 00000000..93f3d188
Binary files /dev/null and b/src/assets/minecraft/optifine/ctm/grass_block_top/grass_block_top_smooth.png differ
diff --git a/src/assets/minecraft/textures/block/activator_rail_flat/pbr.yml b/src/assets/minecraft/textures/block/activator_rail_flat/pbr.yml
index 39dfa18e..ffd07f27 100644
--- a/src/assets/minecraft/textures/block/activator_rail_flat/pbr.yml
+++ b/src/assets/minecraft/textures/block/activator_rail_flat/pbr.yml
@@ -1,3 +1,5 @@
+publish: false
+publish-inventory: true
 height:
   value: 0
 normal:
@@ -6,5 +8,4 @@ occlusion:
   z-bias: 0
   z-scale: 4
   step-distance: 0.15
-create-inventory: true
 wrap-x: false
diff --git a/src/assets/minecraft/textures/block/detector_rail_flat/pbr.yml b/src/assets/minecraft/textures/block/detector_rail_flat/pbr.yml
index a2b547e0..35b3321a 100644
--- a/src/assets/minecraft/textures/block/detector_rail_flat/pbr.yml
+++ b/src/assets/minecraft/textures/block/detector_rail_flat/pbr.yml
@@ -1,3 +1,5 @@
+publish: false
+publish-inventory: true
 height:
   value: 0
 normal:
@@ -6,4 +8,3 @@ occlusion:
   z-bias: 0
   z-scale: 4
   step-distance: 0.15
-create-inventory: true
diff --git a/src/assets/minecraft/textures/block/powered_rail_flat/pbr.yml b/src/assets/minecraft/textures/block/powered_rail_flat/pbr.yml
index a2b547e0..35b3321a 100644
--- a/src/assets/minecraft/textures/block/powered_rail_flat/pbr.yml
+++ b/src/assets/minecraft/textures/block/powered_rail_flat/pbr.yml
@@ -1,3 +1,5 @@
+publish: false
+publish-inventory: true
 height:
   value: 0
 normal:
@@ -6,4 +8,3 @@ occlusion:
   z-bias: 0
   z-scale: 4
   step-distance: 0.15
-create-inventory: true
diff --git a/src/assets/minecraft/textures/block/rail_flat/pbr.yml b/src/assets/minecraft/textures/block/rail_flat/pbr.yml
index 39dfa18e..ffd07f27 100644
--- a/src/assets/minecraft/textures/block/rail_flat/pbr.yml
+++ b/src/assets/minecraft/textures/block/rail_flat/pbr.yml
@@ -1,3 +1,5 @@
+publish: false
+publish-inventory: true
 height:
   value: 0
 normal:
@@ -6,5 +8,4 @@ occlusion:
   z-bias: 0
   z-scale: 4
   step-distance: 0.15
-create-inventory: true
 wrap-x: false
diff --git a/src/assets/minecraft/textures/block/redstone_lamp/metal.png b/src/assets/minecraft/textures/block/redstone_lamp/metal.png
index 7952c5a4..42d4706e 100644
Binary files a/src/assets/minecraft/textures/block/redstone_lamp/metal.png and b/src/assets/minecraft/textures/block/redstone_lamp/metal.png differ
diff --git a/src/assets/minecraft/textures/block/redstone_lamp/pbr.yml b/src/assets/minecraft/textures/block/redstone_lamp/pbr.yml
index c48374f2..e62a4dd5 100644
--- a/src/assets/minecraft/textures/block/redstone_lamp/pbr.yml
+++ b/src/assets/minecraft/textures/block/redstone_lamp/pbr.yml
@@ -1,9 +1,10 @@
+publish-inventory: true
 alpha:
   value: 255
 albedo: {}
 height: {}
 normal:
-  strength: 0.7
+  strength: 0.4
   filter: sobel-low
 occlusion:
   z-bias: 0
diff --git a/src/assets/minecraft/textures/block/redstone_lamp/smooth.png b/src/assets/minecraft/textures/block/redstone_lamp/smooth.png
index eccd7353..098c4c70 100644
Binary files a/src/assets/minecraft/textures/block/redstone_lamp/smooth.png and b/src/assets/minecraft/textures/block/redstone_lamp/smooth.png differ
diff --git a/src/assets/minecraft/textures/block/redstone_lamp_on/metal.png b/src/assets/minecraft/textures/block/redstone_lamp_on/metal.png
index 7952c5a4..42d4706e 100644
Binary files a/src/assets/minecraft/textures/block/redstone_lamp_on/metal.png and b/src/assets/minecraft/textures/block/redstone_lamp_on/metal.png differ
diff --git a/src/assets/minecraft/textures/block/redstone_lamp_on/pbr.yml b/src/assets/minecraft/textures/block/redstone_lamp_on/pbr.yml
index 329858d9..4f53a600 100644
--- a/src/assets/minecraft/textures/block/redstone_lamp_on/pbr.yml
+++ b/src/assets/minecraft/textures/block/redstone_lamp_on/pbr.yml
@@ -3,7 +3,7 @@ alpha:
 albedo: {}
 height: {}
 normal:
-  strength: 0.7
+  strength: 0.4
   filter: sobel-low
 occlusion:
   z-bias: 0
diff --git a/src/assets/minecraft/textures/block/redstone_lamp_on/redstone_lamp_on.png b/src/assets/minecraft/textures/block/redstone_lamp_on/redstone_lamp_on.png
deleted file mode 100644
index d8922271..00000000
Binary files a/src/assets/minecraft/textures/block/redstone_lamp_on/redstone_lamp_on.png and /dev/null differ
diff --git a/src/assets/minecraft/textures/block/redstone_lamp_on/smooth.png b/src/assets/minecraft/textures/block/redstone_lamp_on/smooth.png
index eccd7353..098c4c70 100644
Binary files a/src/assets/minecraft/textures/block/redstone_lamp_on/smooth.png and b/src/assets/minecraft/textures/block/redstone_lamp_on/smooth.png differ
diff --git a/src/assets/minecraft/textures/block/soul_fire_0/albedo.png b/src/assets/minecraft/textures/block/soul_fire_0/albedo.png
new file mode 100644
index 00000000..73c0a65e
Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_fire_0/albedo.png differ
diff --git a/src/assets/minecraft/textures/block/soul_fire_0/alpha.png b/src/assets/minecraft/textures/block/soul_fire_0/alpha.png
new file mode 100644
index 00000000..8e8d4777
Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_fire_0/alpha.png differ
diff --git a/src/assets/minecraft/textures/block/soul_fire_0/emissive.png b/src/assets/minecraft/textures/block/soul_fire_0/emissive.png
new file mode 100644
index 00000000..71aa8341
Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_fire_0/emissive.png differ
diff --git a/src/assets/minecraft/textures/block/soul_fire_0/mat.mcmeta b/src/assets/minecraft/textures/block/soul_fire_0/mat.mcmeta
new file mode 100644
index 00000000..76446714
--- /dev/null
+++ b/src/assets/minecraft/textures/block/soul_fire_0/mat.mcmeta
@@ -0,0 +1,38 @@
+{
+  "animation": {
+    "frames": [
+      16,
+      17,
+      18,
+      19,
+      20,
+      21,
+      22,
+      23,
+      24,
+      25,
+      26,
+      27,
+      28,
+      29,
+      30,
+      31,
+      0,
+      1,
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      8,
+      9,
+      10,
+      11,
+      12,
+      13,
+      14,
+      15
+    ]
+  }
+}
diff --git a/src/assets/minecraft/textures/block/soul_fire_0/pbr.yml b/src/assets/minecraft/textures/block/soul_fire_0/pbr.yml
new file mode 100644
index 00000000..42de1d82
--- /dev/null
+++ b/src/assets/minecraft/textures/block/soul_fire_0/pbr.yml
@@ -0,0 +1,2 @@
+emissive:
+  scale: 0.8
diff --git a/src/assets/minecraft/textures/block/soul_fire_1/albedo.png b/src/assets/minecraft/textures/block/soul_fire_1/albedo.png
new file mode 100644
index 00000000..b837b98a
Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_fire_1/albedo.png differ
diff --git a/src/assets/minecraft/textures/block/soul_fire_1/alpha.png b/src/assets/minecraft/textures/block/soul_fire_1/alpha.png
new file mode 100644
index 00000000..a64e387e
Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_fire_1/alpha.png differ
diff --git a/src/assets/minecraft/textures/block/soul_fire_1/emissive.png b/src/assets/minecraft/textures/block/soul_fire_1/emissive.png
new file mode 100644
index 00000000..beb75fed
Binary files /dev/null and b/src/assets/minecraft/textures/block/soul_fire_1/emissive.png differ
diff --git a/src/assets/minecraft/textures/block/soul_fire_1/mat.mcmeta b/src/assets/minecraft/textures/block/soul_fire_1/mat.mcmeta
new file mode 100644
index 00000000..4f0718ac
--- /dev/null
+++ b/src/assets/minecraft/textures/block/soul_fire_1/mat.mcmeta
@@ -0,0 +1,3 @@
+{
+  "animation": {}
+}
\ No newline at end of file
diff --git a/src/assets/minecraft/textures/block/soul_fire_1/pbr.yml b/src/assets/minecraft/textures/block/soul_fire_1/pbr.yml
new file mode 100644
index 00000000..42de1d82
--- /dev/null
+++ b/src/assets/minecraft/textures/block/soul_fire_1/pbr.yml
@@ -0,0 +1,2 @@
+emissive:
+  scale: 0.8
diff --git a/src/assets/minecraft/textures/entity/bell/bell_body.pbr.yml b/src/assets/minecraft/textures/entity/bell/bell_body.pbr.yml
index ecaa5771..d1723225 100644
--- a/src/assets/minecraft/textures/entity/bell/bell_body.pbr.yml
+++ b/src/assets/minecraft/textures/entity/bell/bell_body.pbr.yml
@@ -1,4 +1,6 @@
 texture-size: 32
+wrap-x: false
+wrap-y: false
 alpha:
   value: 255
 albedo:
@@ -8,16 +10,13 @@ albedo:
 height:
   value: 0
 normal:
-  strength: 0.2
-  filter: sobel-low
+  filter: sobel-high
 occlusion:
-  quality: 0.1
-  z-bias: 0.2
-  z-scale: 3
-  steps: 8
+  z-scale: 1
+  step-distance: 0.15
 smooth:
-  value: 0.85
+  value: 0.7
 metal:
-  value: 231
+  value: 255
 porosity:
   value: 0
diff --git a/src/assets/minecraft/textures/entity/bell/bell_body.png b/src/assets/minecraft/textures/entity/bell/bell_body.png
new file mode 100644
index 00000000..511a979f
Binary files /dev/null and b/src/assets/minecraft/textures/entity/bell/bell_body.png differ
diff --git a/src/assets/minecraft/textures/entity/bell/bell_body_ao.png b/src/assets/minecraft/textures/entity/bell/bell_body_ao.png
deleted file mode 100644
index f32fe124..00000000
Binary files a/src/assets/minecraft/textures/entity/bell/bell_body_ao.png and /dev/null differ
diff --git a/src/assets/minecraft/textures/entity/bell/bell_body_h.png b/src/assets/minecraft/textures/entity/bell/bell_body_h.png
index 9d3a0d1c..bf28b23f 100644
Binary files a/src/assets/minecraft/textures/entity/bell/bell_body_h.png and b/src/assets/minecraft/textures/entity/bell/bell_body_h.png differ
diff --git a/src/assets/minecraft/textures/entity/bell/bell_body_h.xcf b/src/assets/minecraft/textures/entity/bell/bell_body_h.xcf
deleted file mode 100644
index 04b614f6..00000000
Binary files a/src/assets/minecraft/textures/entity/bell/bell_body_h.xcf and /dev/null differ
diff --git a/src/assets/minecraft/textures/entity/bell/bell_body_n.png b/src/assets/minecraft/textures/entity/bell/bell_body_n.png
deleted file mode 100644
index 4972ce4d..00000000
Binary files a/src/assets/minecraft/textures/entity/bell/bell_body_n.png and /dev/null differ
diff --git a/src/assets/minecraft/textures/entity/villager/profession/armorer/albedo.png b/src/assets/minecraft/textures/entity/villager/profession/armorer/albedo.png
new file mode 100644
index 00000000..6d13f986
Binary files /dev/null and b/src/assets/minecraft/textures/entity/villager/profession/armorer/albedo.png differ
diff --git a/src/assets/minecraft/textures/entity/villager/profession/armorer/alpha.png b/src/assets/minecraft/textures/entity/villager/profession/armorer/alpha.png
new file mode 100644
index 00000000..7aac57f8
Binary files /dev/null and b/src/assets/minecraft/textures/entity/villager/profession/armorer/alpha.png differ
diff --git a/src/assets/minecraft/textures/entity/villager/profession/armorer/f0.png b/src/assets/minecraft/textures/entity/villager/profession/armorer/f0.png
new file mode 100644
index 00000000..b3ed495e
Binary files /dev/null and b/src/assets/minecraft/textures/entity/villager/profession/armorer/f0.png differ
diff --git a/src/assets/minecraft/textures/entity/villager/profession/armorer/height.png b/src/assets/minecraft/textures/entity/villager/profession/armorer/height.png
new file mode 100644
index 00000000..8fa9bf15
Binary files /dev/null and b/src/assets/minecraft/textures/entity/villager/profession/armorer/height.png differ
diff --git a/src/assets/minecraft/textures/entity/villager/profession/armorer/metal.png b/src/assets/minecraft/textures/entity/villager/profession/armorer/metal.png
new file mode 100644
index 00000000..01812b91
Binary files /dev/null and b/src/assets/minecraft/textures/entity/villager/profession/armorer/metal.png differ
diff --git a/src/assets/minecraft/textures/entity/villager/profession/armorer/pbr.yml b/src/assets/minecraft/textures/entity/villager/profession/armorer/pbr.yml
new file mode 100644
index 00000000..c8187aa9
--- /dev/null
+++ b/src/assets/minecraft/textures/entity/villager/profession/armorer/pbr.yml
@@ -0,0 +1,12 @@
+texture-size: 64
+wrap-x: false
+wrap-y: false
+height:
+  value: 0
+normal:
+  strength: 2
+  filter: sobel-low
+occlusion:
+  z-bias: 0
+  z-scale: 5
+  step-distance: 0.15
diff --git a/src/assets/minecraft/textures/entity/villager/profession/armorer/smooth.png b/src/assets/minecraft/textures/entity/villager/profession/armorer/smooth.png
new file mode 100644
index 00000000..143006b9
Binary files /dev/null and b/src/assets/minecraft/textures/entity/villager/profession/armorer/smooth.png differ
diff --git a/src/assets/minecraft/textures/entity/villager/profession/farmer.png b/src/assets/minecraft/textures/entity/villager/profession/farmer/albedo.png
similarity index 100%
rename from src/assets/minecraft/textures/entity/villager/profession/farmer.png
rename to src/assets/minecraft/textures/entity/villager/profession/farmer/albedo.png
diff --git a/src/assets/minecraft/textures/entity/villager/profession/farmer_a.png b/src/assets/minecraft/textures/entity/villager/profession/farmer/alpha.png
similarity index 100%
rename from src/assets/minecraft/textures/entity/villager/profession/farmer_a.png
rename to src/assets/minecraft/textures/entity/villager/profession/farmer/alpha.png
diff --git a/src/assets/minecraft/textures/entity/villager/profession/farmer.pbr.yml b/src/assets/minecraft/textures/entity/villager/profession/farmer/pbr.yml
similarity index 100%
rename from src/assets/minecraft/textures/entity/villager/profession/farmer.pbr.yml
rename to src/assets/minecraft/textures/entity/villager/profession/farmer/pbr.yml
diff --git a/src/assets/minecraft/textures/entity/villager/type/desert.png b/src/assets/minecraft/textures/entity/villager/type/desert/albedo.png
similarity index 100%
rename from src/assets/minecraft/textures/entity/villager/type/desert.png
rename to src/assets/minecraft/textures/entity/villager/type/desert/albedo.png
diff --git a/src/assets/minecraft/textures/entity/villager/type/desert_a.png b/src/assets/minecraft/textures/entity/villager/type/desert/alpha.png
similarity index 100%
rename from src/assets/minecraft/textures/entity/villager/type/desert_a.png
rename to src/assets/minecraft/textures/entity/villager/type/desert/alpha.png
diff --git a/src/assets/minecraft/textures/entity/villager/type/desert.pbr.yml b/src/assets/minecraft/textures/entity/villager/type/desert/pbr.yml
similarity index 100%
rename from src/assets/minecraft/textures/entity/villager/type/desert.pbr.yml
rename to src/assets/minecraft/textures/entity/villager/type/desert/pbr.yml
diff --git a/src/assets/minecraft/textures/entity/villager/type/plains.png b/src/assets/minecraft/textures/entity/villager/type/plains/albedo.png
similarity index 100%
rename from src/assets/minecraft/textures/entity/villager/type/plains.png
rename to src/assets/minecraft/textures/entity/villager/type/plains/albedo.png
diff --git a/src/assets/minecraft/textures/entity/villager/type/plains_a.png b/src/assets/minecraft/textures/entity/villager/type/plains/alpha.png
similarity index 100%
rename from src/assets/minecraft/textures/entity/villager/type/plains_a.png
rename to src/assets/minecraft/textures/entity/villager/type/plains/alpha.png
diff --git a/src/assets/minecraft/textures/entity/villager/type/plains/height.png b/src/assets/minecraft/textures/entity/villager/type/plains/height.png
new file mode 100644
index 00000000..e4df4372
Binary files /dev/null and b/src/assets/minecraft/textures/entity/villager/type/plains/height.png differ
diff --git a/src/assets/minecraft/textures/entity/villager/type/plains.pbr.yml b/src/assets/minecraft/textures/entity/villager/type/plains/pbr.yml
similarity index 64%
rename from src/assets/minecraft/textures/entity/villager/type/plains.pbr.yml
rename to src/assets/minecraft/textures/entity/villager/type/plains/pbr.yml
index c8c7ddad..5f27a284 100644
--- a/src/assets/minecraft/textures/entity/villager/type/plains.pbr.yml
+++ b/src/assets/minecraft/textures/entity/villager/type/plains/pbr.yml
@@ -3,8 +3,12 @@ wrap-x: false
 wrap-y: false
 height:
   value: 0
+normal:
+  filter: sobel-low
 occlusion:
-  value: 0
+  z-bias: 0
+  z-scale: 3
+  step-distance: 0.15
 smooth:
   value: 0.02
 f0:
diff --git a/src/assets/minecraft/textures/entity/villager/villager.pbr.yml b/src/assets/minecraft/textures/entity/villager/villager.pbr.yml
deleted file mode 100644
index 41db16d4..00000000
--- a/src/assets/minecraft/textures/entity/villager/villager.pbr.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-texture-size: 64
-wrap-x: false
-wrap-y: false
-height:
-  value: 0
-occlusion:
-  value: 0
-smooth:
-  value: 0.1
-f0:
-  value: 0.04
-sss:
-  value: 0.1
diff --git a/src/assets/minecraft/textures/entity/villager/villager.png b/src/assets/minecraft/textures/entity/villager/villager/albedo.png
similarity index 100%
rename from src/assets/minecraft/textures/entity/villager/villager.png
rename to src/assets/minecraft/textures/entity/villager/villager/albedo.png
diff --git a/src/assets/minecraft/textures/entity/villager/villager_a.png b/src/assets/minecraft/textures/entity/villager/villager/alpha.png
similarity index 100%
rename from src/assets/minecraft/textures/entity/villager/villager_a.png
rename to src/assets/minecraft/textures/entity/villager/villager/alpha.png
diff --git a/src/assets/minecraft/textures/entity/villager/villager/f0.png b/src/assets/minecraft/textures/entity/villager/villager/f0.png
new file mode 100644
index 00000000..3885138c
Binary files /dev/null and b/src/assets/minecraft/textures/entity/villager/villager/f0.png differ
diff --git a/src/assets/minecraft/textures/entity/villager/villager/height.png b/src/assets/minecraft/textures/entity/villager/villager/height.png
new file mode 100644
index 00000000..44eb06f2
Binary files /dev/null and b/src/assets/minecraft/textures/entity/villager/villager/height.png differ
diff --git a/src/assets/minecraft/textures/entity/villager/villager/pbr.yml b/src/assets/minecraft/textures/entity/villager/villager/pbr.yml
new file mode 100644
index 00000000..5b021776
--- /dev/null
+++ b/src/assets/minecraft/textures/entity/villager/villager/pbr.yml
@@ -0,0 +1,13 @@
+texture-size: 64
+wrap-x: false
+wrap-y: false
+height:
+  value: 0
+normal:
+  filter: sobel-low
+occlusion:
+  z-scale: 2
+  step-distance: 0.15
+smooth: {}
+f0: {}
+sss: {}
diff --git a/src/assets/minecraft/textures/entity/villager/villager/porosity.png b/src/assets/minecraft/textures/entity/villager/villager/porosity.png
new file mode 100644
index 00000000..f872193f
Binary files /dev/null and b/src/assets/minecraft/textures/entity/villager/villager/porosity.png differ
diff --git a/src/assets/minecraft/textures/entity/villager/villager/smooth.png b/src/assets/minecraft/textures/entity/villager/villager/smooth.png
new file mode 100644
index 00000000..290c4cc4
Binary files /dev/null and b/src/assets/minecraft/textures/entity/villager/villager/smooth.png differ
diff --git a/src/assets/minecraft/textures/entity/villager/villager/sss.png b/src/assets/minecraft/textures/entity/villager/villager/sss.png
new file mode 100644
index 00000000..42af26ad
Binary files /dev/null and b/src/assets/minecraft/textures/entity/villager/villager/sss.png differ