diff --git a/shaders/lib/entities.glsl b/shaders/lib/entities.glsl
index 3a6d61e..2c76411 100644
--- a/shaders/lib/entities.glsl
+++ b/shaders/lib/entities.glsl
@@ -1,3 +1,5 @@
+#define ENTITY_SHADOW 1599
+#define ENTITY_NAME_TAG 1600
 #define ENTITY_PLAYER 1601
 #define ENTITY_LIGHTNING 1602
 #define ENTITY_BLAZE 1603
@@ -11,4 +13,4 @@
 #define ENTITY_SPECTRAL_ARROW 1611
 #define ENTITY_SSS_MEDIUM 1801
 #define ENTITY_SSS_WEAK 1802
-#define ENTITY_SLIME 1803
+#define ENTITY_SLIME 1803
\ No newline at end of file
diff --git a/shaders/lib/items.glsl b/shaders/lib/items.glsl
index 46da563..bac5161 100644
--- a/shaders/lib/items.glsl
+++ b/shaders/lib/items.glsl
@@ -22,4 +22,4 @@
 #define ITEM_SHROOMLIGHT 1021
 #define ITEM_SOUL_LANTERN 1022
 #define ITEM_SOUL_TORCH 1023
-#define ITEM_TORCH 1024
+#define ITEM_TORCH 1024
\ No newline at end of file
diff --git a/shaders/template/entity.properties b/shaders/template/entity.properties
index 9de9313..6d4fce3 100644
--- a/shaders/template/entity.properties
+++ b/shaders/template/entity.properties
@@ -1,5 +1,10 @@
+#= ENTITY_SHADOW
+entity.1599=minecraft:entity_shadow
+#= ENTITY_NAME_TAG
+entity.1600=minecraft:name_tag
+
 #= ENTITY_PLAYER
-entity.1601= player
+entity.1601=player
 
 #= ENTITY_LIGHTNING
 entity.*= minecraft:lightning_bolt weather2:lightning_bolt
@@ -8,6 +13,7 @@ entity.*= minecraft:lightning_bolt weather2:lightning_bolt
 
 #= ENTITY_BLAZE
 entity.*= blaze minecraft:entity_flame
+# TODO: Why is entity flame in both `ENTITY_SPECTRAL_ARROW` and `ENTITY_BLAZE` ???
 
 #= ENTITY_DRAGON_WITHER
 entity.*= ender_dragon wither
@@ -32,6 +38,7 @@ entity.*= small_fireball
 
 #= ENTITY_SPECTRAL_ARROW
 entity.*= spectral_arrow bigglobe:torch_arrow entity_flame
+# TODO: Why is entity flame in both `ENTITY_SPECTRAL_ARROW` and `ENTITY_BLAZE` ???
 
 ################################################
 ###### SUB-SURFACE SCATTERING
@@ -39,11 +46,13 @@ entity.*= spectral_arrow bigglobe:torch_arrow entity_flame
 
 ## medium sss (same as strong sss for blocks)
 #= ENTITY_SSS_MEDIUM
-entity.1801 = giant ghast elder_guardian 
+entity.1801 = giant ghast elder_guardian \
+ naturalist:butterfly naturalist:firefly naturalist:caterpillar naturalist:dragonfly
 
 ## weak sss (same as weak sss for blocks)
 #= ENTITY_SSS_WEAK
-entity.* = furnace_minecart sheep frog chicken iron_golem snow_golem polar_bear zombie_horse armor_stand arrow squid bat cat cod cow donkey fox horse mooshroom mule ocelot parrot pig piglin polar_bear pufferfish rabbit salmon strider tropical_fish turtle villager wandering_trader bee cave_spider dolphin enderman llama panda spider wolf zombified_piglin creeper drowned endermite evoker guardian hoglin husk phantom piglin_brute pillager ravager silverfish stray vex vindicator witch zoglin zombie zombie_villager trader_llama
+entity.* = furnace_minecart sheep frog chicken iron_golem snow_golem polar_bear zombie_horse armor_stand arrow squid bat cat cod cow donkey fox horse mooshroom mule ocelot parrot pig piglin polar_bear pufferfish rabbit salmon strider tropical_fish turtle villager wandering_trader bee cave_spider dolphin enderman llama panda spider wolf zombified_piglin creeper drowned endermite evoker guardian hoglin husk phantom piglin_brute pillager ravager silverfish stray vex vindicator witch zoglin zombie zombie_villager trader_llama \
+ naturalist:bear naturalist:snail naturalist:snake naturalist:coral_snake naturalist:rattlesnake naturalist:bluejay naturalist:cardinal naturalist:canary naturalist:robin naturalist:finch naturalist:sparrow naturalist:rhino naturalist:elephant naturalist:lion naturalist:zebra naturalist:giraffe naturalist:hippo naturalist:vulture naturalist:boar naturalist:catfish naturalist:alligator naturalist:bass naturalist:tortoise naturalist:duck
 #removed: player blaze magma_cube
 
 ################################################
@@ -51,4 +60,4 @@ entity.* = furnace_minecart sheep frog chicken iron_golem snow_golem polar_bear
 ################################################
 
 #= ENTITY_SLIME
-entity.* = slime
+entity.* = slime
\ No newline at end of file
diff --git a/shaders/template/item.properties b/shaders/template/item.properties
index 60c08b5..2df3a71 100644
--- a/shaders/template/item.properties
+++ b/shaders/template/item.properties
@@ -1,5 +1,6 @@
 #= ITEM_LIGHT_SOURCES
 item.1000 = soul_lantern conduit beacon sea_pickle sea_lantern glowstone redstone_torch jack_o_lantern magma_block lantern shroomlight end_rod lava_bucket conquest:white_paper_lantern conquest:yellow_paper_lantern conquest:small_red_paper_lantern conquest:chinese_palace_lantern conquest:campfire conquest:brazier conquest:hanging_brazier conquest:chandelier conquest:candelabra conquest:cross_chandelier conquest:conquest:iron_candelabrum_1 conquest:conquest:golden_candelabrum_1 conquest:candle conquest:hanging_candle_holder conquest:candle_in_a_lantern conquest:candles conquest:hand_candle conquest:torch_with_grille conquest:elven_hand_light conquest:ship_lantern conquest:victorian_lantern conquest:small_lantern conquest:big_lantern conquest:hanging_oil_lamp conquest:oil_lamp conquest:terracotta_oil_lamp conquest:invisible_light_low conquest:invisible_light_medium conquest:invisible_light
+# TODO: Why all the items have a duplication here?
 
 #= ITEM_AMETHYST_BUD_LARGE
 item.* = large_amethyst_bud
@@ -62,7 +63,8 @@ item.* = redstone_torch
 item.* = sculk_catalyst
 
 #= ITEM_SEA_LANTERN
-item.* = sea_lantern
+item.* = sea_lantern \
+ betternether:willow_torch
 
 #= ITEM_SHROOMLIGHT
 item.* = shroomlight
@@ -74,4 +76,4 @@ item.* = soul_lantern
 item.* = soul_torch
 
 #= ITEM_TORCH
-item.* = torch
+item.* = torch
\ No newline at end of file