diff --git a/README.md b/README.md
index 82e14e3..d129e19 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,7 @@ Ethereal Mapgen mod for Minetest (works on all except v6)
  - Added new Fishing mechanics (inspired by Rootyjr's on mineclone2)
  - Added fishing api to add new items (read API.txt file)
  - Certain fish can only be found in specific biomes
+ - Rename textures so they begin with ethereal_ (sorry texture pack folks)
 
 ### 1.27
 
diff --git a/crystal.lua b/crystal.lua
index 623fa1d..0891e3a 100644
--- a/crystal.lua
+++ b/crystal.lua
@@ -1,13 +1,14 @@
 
 local S = ethereal.intllib
 
--- Crystal Spike (Hurts if you touch it - thanks to ZonerDarkRevention for his DokuCraft DeviantArt crystal texture)
+-- Crystal Spike (Hurts if you touch it)
+-- thanks to ZonerDarkRevention for his DokuCraft DeviantArt crystal texture
 minetest.register_node("ethereal:crystal_spike", {
 	description = S("Crystal Spike"),
 	drawtype = "plantlike",
-	tiles = { "crystal_spike.png" },
-	inventory_image = "crystal_spike.png",
-	wield_image = "crystal_spike.png",
+	tiles = {"ethereal_crystal_spike.png"},
+	inventory_image = "ethereal_crystal_spike.png",
+	wield_image = "ethereal_crystal_spike.png",
 	paramtype = "light",
 	light_source = 7,
 	sunlight_propagates = true,
@@ -22,14 +23,14 @@ minetest.register_node("ethereal:crystal_spike", {
 	node_box = {
 		type = "fixed",
 		fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 0, 5 / 16},
-	},
+	}
 })
 
 -- Crystal Ingot
 minetest.register_craftitem("ethereal:crystal_ingot", {
 	description = S("Crystal Ingot"),
-	inventory_image = "crystal_ingot.png",
-	wield_image = "crystal_ingot.png",
+	inventory_image = "ethereal_crystal_ingot.png",
+	wield_image = "ethereal_crystal_ingot.png"
 })
 
 if minetest.get_modpath("builtin_item") then
@@ -98,11 +99,11 @@ minetest.register_craft({
 -- Crystal Block
 minetest.register_node("ethereal:crystal_block", {
 	description = S("Crystal Block"),
-	tiles = {"crystal_block.png"},
+	tiles = {"ethereal_crystal_block.png"},
 	light_source = 9,
 	is_ground_content = false,
 	groups = {cracky = 1, level = 2, puts_out_fire = 1, cools_lava = 1},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_craft({
@@ -124,8 +125,8 @@ minetest.register_craft({
 -- Crystal Sword (Powerful wee beastie)
 minetest.register_tool("ethereal:sword_crystal", {
 	description = S("Crystal Sword"),
-	inventory_image = "crystal_sword.png",
-	wield_image = "crystal_sword.png",
+	inventory_image = "ethereal_crystal_sword.png",
+	wield_image = "ethereal_crystal_sword.png",
 	tool_capabilities = {
 		full_punch_interval = 0.6,
 		max_drop_level = 1,
@@ -139,7 +140,7 @@ minetest.register_tool("ethereal:sword_crystal", {
 		damage_groups = {fleshy = 10},
 	},
 	groups = {sword = 1},
-	sound = {breaks = "default_tool_breaks"},
+	sound = {breaks = "default_tool_breaks"}
 })
 
 minetest.register_craft({
@@ -147,15 +148,15 @@ minetest.register_craft({
 	recipe = {
 		{"ethereal:crystal_ingot"},
 		{"ethereal:crystal_ingot"},
-		{"default:steel_ingot"},
+		{"default:steel_ingot"}
 	}
 })
 
 -- Crystal Axe
 minetest.register_tool("ethereal:axe_crystal", {
 	description = S("Crystal Axe"),
-	inventory_image = "crystal_axe.png",
-	wield_image = "crystal_axe.png",
+	inventory_image = "ethereal_crystal_axe.png",
+	wield_image = "ethereal_crystal_axe.png",
 	tool_capabilities = {
 		full_punch_interval = 0.8,
 		max_drop_level = 1,
@@ -164,12 +165,12 @@ minetest.register_tool("ethereal:axe_crystal", {
 				times = {[1] = 2.00, [2] = 0.80, [3] = 0.40},
 				uses = 40,
 				maxlevel = 3
-			},
+			}
 		},
 		damage_groups = {fleshy = 7},
 	},
 	groups = {axe = 1},
-	sound = {breaks = "default_tool_breaks"},
+	sound = {breaks = "default_tool_breaks"}
 })
 
 minetest.register_craft({
@@ -177,7 +178,7 @@ minetest.register_craft({
 	recipe = {
 		{"ethereal:crystal_ingot", "ethereal:crystal_ingot"},
 		{"ethereal:crystal_ingot", "default:steel_ingot"},
-		{"", "default:steel_ingot"},
+		{"", "default:steel_ingot"}
 	}
 })
 
@@ -186,15 +187,15 @@ minetest.register_craft({
 	recipe = {
 		{"ethereal:crystal_ingot", "ethereal:crystal_ingot"},
 		{"default:steel_ingot", "ethereal:crystal_ingot"},
-		{"default:steel_ingot", ""},
+		{"default:steel_ingot", ""}
 	}
 })
 
 -- Crystal Pick (This will last a while)
 minetest.register_tool("ethereal:pick_crystal", {
 	description = S("Crystal Pickaxe"),
-	inventory_image = "crystal_pick.png",
-	wield_image = "crystal_pick.png",
+	inventory_image = "ethereal_crystal_pick.png",
+	wield_image = "ethereal_crystal_pick.png",
 	tool_capabilities = {
 		full_punch_interval = 0.7,
 		max_drop_level = 3,
@@ -203,12 +204,12 @@ minetest.register_tool("ethereal:pick_crystal", {
 				times = {[1] = 1.8, [2] = 0.8, [3] = 0.40},
 				uses = 40,
 				maxlevel = 3
-			},
+			}
 		},
 		damage_groups = {fleshy = 6},
 	},
 	groups = {pickaxe = 1},
-	sound = {breaks = "default_tool_breaks"},
+	sound = {breaks = "default_tool_breaks"}
 })
 
 minetest.register_craft({
@@ -216,7 +217,7 @@ minetest.register_craft({
 	recipe = {
 		{"ethereal:crystal_ingot", "ethereal:crystal_ingot", "ethereal:crystal_ingot"},
 		{"", "default:steel_ingot", ""},
-		{"", "default:steel_ingot", ""},
+		{"", "default:steel_ingot", ""}
 	}
 })
 
@@ -242,8 +243,8 @@ end
 
 minetest.register_tool("ethereal:shovel_crystal", {
 	description = "Crystal Shovel",
-	inventory_image = "crystal_shovel.png",
-	wield_image = "crystal_shovel.png^[transformR90",
+	inventory_image = "ethereal_crystal_shovel.png",
+	wield_image = "ethereal_crystal_shovel.png^[transformR90",
 	tool_capabilities = {
 		full_punch_interval = 1.0,
 		max_drop_level = 1,
@@ -252,12 +253,12 @@ minetest.register_tool("ethereal:shovel_crystal", {
 				times = {[1] = 1.10, [2] = 0.50, [3] = 0.30},
 				uses = 30,
 				maxlevel = 3
-			},
+			}
 		},
 		damage_groups = {fleshy = 4},
 	},
 	groups = {shovel = 1},
-	sound = {breaks = "default_tool_breaks"},
+	sound = {breaks = "default_tool_breaks"}
 })
 
 minetest.register_craft({
@@ -265,21 +266,21 @@ minetest.register_craft({
 	recipe = {
 		{"ethereal:crystal_ingot"},
 		{"default:steel_ingot"},
-		{"default:steel_ingot"},
+		{"default:steel_ingot"}
 	}
 })
 
 -- Crystal Gilly Staff (replenishes air supply when used)
 minetest.register_tool("ethereal:crystal_gilly_staff", {
 	description = S("Crystal Gilly Staff"),
-	inventory_image = "crystal_gilly_staff.png",
-	wield_image = "crystal_gilly_staff.png",
+	inventory_image = "ethereal_crystal_gilly_staff.png",
+	wield_image = "ethereal_crystal_gilly_staff.png",
 
 	on_use = function(itemstack, user, pointed_thing)
 		if user:get_breath() < 10 then
 			user:set_breath(10)
 		end
-	end,
+	end
 })
 
 minetest.register_craft({
diff --git a/dirt.lua b/dirt.lua
index 2bf3abd..b58f1c0 100644
--- a/dirt.lua
+++ b/dirt.lua
@@ -237,7 +237,7 @@ if not minetest.get_modpath("bakedclay") then
 		tiles = {"baked_clay_red.png"},
 		groups = {cracky = 3},
 		is_ground_content = ethereal.cavedirt,
-		sounds = default.node_sound_stone_defaults(),
+		sounds = default.node_sound_stone_defaults()
 	})
 
 	minetest.register_node(":bakedclay:orange", {
@@ -245,7 +245,7 @@ if not minetest.get_modpath("bakedclay") then
 		tiles = {"baked_clay_orange.png"},
 		groups = {cracky = 3},
 		is_ground_content = ethereal.cavedirt,
-		sounds = default.node_sound_stone_defaults(),
+		sounds = default.node_sound_stone_defaults()
 	})
 
 	minetest.register_node(":bakedclay:grey", {
@@ -253,7 +253,7 @@ if not minetest.get_modpath("bakedclay") then
 		tiles = {"baked_clay_grey.png"},
 		groups = {cracky = 3},
 		is_ground_content = ethereal.cavedirt,
-		sounds = default.node_sound_stone_defaults(),
+		sounds = default.node_sound_stone_defaults()
 	})
 
 end
@@ -275,7 +275,7 @@ minetest.register_node("ethereal:quicksand", {
 	climbable = false,
 	post_effect_color = {r = 230, g = 210, b = 160, a = 245},
 	groups = {crumbly = 3, sand = 1, liquid = 3, disable_jump = 1},
-	sounds = default.node_sound_sand_defaults(),
+	sounds = default.node_sound_sand_defaults()
 })
 
 -- Quicksand (new style, sinking inside shows yellow effect with or without noclip,
@@ -297,7 +297,7 @@ minetest.register_node("ethereal:quicksand2", {
 	climbable = false,
 	post_effect_color = {r = 230, g = 210, b = 160, a = 245},
 	groups = {crumbly = 3, sand = 1, liquid = 3, disable_jump = 1},
-	sounds = default.node_sound_sand_defaults(),
+	sounds = default.node_sound_sand_defaults()
 })
 
 -- craft quicksand
@@ -306,7 +306,7 @@ minetest.register_craft({
 	recipe = {
 		{"group:sand", "group:sand", "group:sand"},
 		{"group:sand", "bucket:bucket_water", "group:sand"},
-		{"group:sand", "group:sand", "group:sand"},
+		{"group:sand", "group:sand", "group:sand"}
 	},
 	replacements = {
 		{"bucket:bucket_water", "bucket:bucket_empty"}
diff --git a/extra.lua b/extra.lua
index 1ede726..3477924 100644
--- a/extra.lua
+++ b/extra.lua
@@ -21,9 +21,9 @@ minetest.register_node("ethereal:etherium_ore", {
 minetest.register_node("ethereal:bamboo_floor", {
 	description = S("Bamboo Floor"),
 	drawtype = "nodebox",
-	tiles = { "bamboo_floor.png" },
-	wield_image = "bamboo_floor.png",
-	inventory_image = "bamboo_floor.png",
+	tiles = {"ethereal_bamboo_floor.png"},
+	wield_image = "ethereal_bamboo_floor.png",
+	inventory_image = "ethereal_bamboo_floor.png",
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	walkable = true,
@@ -31,11 +31,11 @@ minetest.register_node("ethereal:bamboo_floor", {
 		type = "wallmounted",
 		wall_top    = {-0.5, 0.4375, -0.5, 0.5, 0.5, 0.5},
 		wall_bottom = {-0.5, -0.5, -0.5, 0.5, -0.4375, 0.5},
-		wall_side   = {-0.5, -0.5, -0.5, -0.4375, 0.5, 0.5},
+		wall_side   = {-0.5, -0.5, -0.5, -0.4375, 0.5, 0.5}
 	},
 	selection_box = {type = "wallmounted"},
 	groups = {snappy = 3, choppy = 3 , flammable = 2},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
 })
 
 -- Craft Bamboo into Bamboo Flooring
@@ -43,7 +43,7 @@ minetest.register_craft({
 	output = "ethereal:bamboo_floor 2",
 	recipe = {
 		{"ethereal:bamboo", "ethereal:bamboo"},
-		{"ethereal:bamboo", "ethereal:bamboo"},
+		{"ethereal:bamboo", "ethereal:bamboo"}
 	}
 })
 
@@ -58,10 +58,10 @@ minetest.register_craft({
 -- Bamboo Block
 minetest.register_node("ethereal:bamboo_block", {
 	description = S("Bamboo Block"),
-	tiles = { "bamboo_floor.png" },
+	tiles = {"ethereal_bamboo_floor.png"},
 	paramtype = "light",
 	groups = {snappy = 3, choppy = 3 , flammable = 2, wood = 1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
 })
 
 minetest.register_craft({
@@ -69,7 +69,7 @@ minetest.register_craft({
 	recipe = {
 		{"ethereal:bamboo", "ethereal:bamboo", "ethereal:bamboo"},
 		{"ethereal:bamboo", "ethereal:bamboo", "ethereal:bamboo"},
-		{"ethereal:bamboo", "ethereal:bamboo", "ethereal:bamboo"},
+		{"ethereal:bamboo", "ethereal:bamboo", "ethereal:bamboo"}
 	}
 })
 
@@ -79,7 +79,7 @@ minetest.register_craft({
 	recipe = {
 		{"ethereal:bamboo", "ethereal:bamboo"},
 		{"ethereal:bamboo", "ethereal:bamboo"},
-		{"ethereal:bamboo", "ethereal:bamboo"},
+		{"ethereal:bamboo", "ethereal:bamboo"}
 	}
 })
 
@@ -102,7 +102,7 @@ for n = 1, #cheat do
 		recipe = {
 			{cheat[n][1], "", cheat[n][1]},
 			{"", cheat[n][1], ""},
-			{cheat[n][1], "", cheat[n][1]},
+			{cheat[n][1], "", cheat[n][1]}
 		}
 	})
 end
@@ -120,8 +120,8 @@ minetest.register_craft({
 -- Palm Wax
 minetest.register_craftitem("ethereal:palm_wax", {
 	description = S("Palm Wax"),
-	inventory_image = "palm_wax.png",
-	wield_image = "palm_wax.png",
+	inventory_image = "ethereal_palm_wax.png",
+	wield_image = "ethereal_palm_wax.png"
 })
 
 minetest.register_craft({
@@ -135,18 +135,18 @@ minetest.register_craft({
 minetest.register_node("ethereal:candle", {
 	description = S("Candle"),
 	drawtype = "plantlike",
-	inventory_image = "candle_static.png",
-	wield_image = "candle_static.png",
+	inventory_image = "ethereal_candle_static.png",
+	wield_image = "ethereal_candle_static.png",
 	tiles = {
 		{
-			name = "candle.png",
-			animation={
+			name = "ethereal_candle.png",
+			animation = {
 				type="vertical_frames",
 				aspect_w = 32,
 				aspect_h = 32,
 				length = 1.0
 			}
-		},
+		}
 	},
 	paramtype = "light",
 	light_source = 11,
@@ -157,7 +157,7 @@ minetest.register_node("ethereal:candle", {
 	selection_box = {
 		type = "fixed",
 		fixed = { -0.15, -0.5, -0.15, 0.15, 0, 0.15 }
-	},
+	}
 })
 
 minetest.register_craft({
@@ -165,15 +165,15 @@ minetest.register_craft({
 	recipe = {
 		{"farming:string"},
 		{"ethereal:palm_wax"},
-		{"ethereal:palm_wax"},
+		{"ethereal:palm_wax"}
 	}
 })
 
 -- Wooden Bowl
 minetest.register_craftitem("ethereal:bowl", {
 	description = S("Bowl"),
-	inventory_image = "bowl.png",
-	groups = {food_bowl = 1, flammable = 2},
+	inventory_image = "ethereal_bowl.png",
+	groups = {food_bowl = 1, flammable = 2}
 })
 
 -- use farming redo's recipe if found
@@ -183,7 +183,7 @@ if not minetest.registered_items["farming:bowl"] then
 		output = "ethereal:bowl 4",
 		recipe = {
 			{"group:wood", "", "group:wood"},
-			{"", "group:wood", ""},
+			{"", "group:wood", ""}
 		}
 	})
 end
@@ -192,9 +192,9 @@ end
 minetest.register_node("ethereal:stone_ladder", {
 	description = S("Stone Ladder"),
 	drawtype = "signlike",
-	tiles = {"stone_ladder.png"},
-	inventory_image = "stone_ladder.png",
-	wield_image = "stone_ladder.png",
+	tiles = {"ethereal_stone_ladder.png"},
+	inventory_image = "ethereal_stone_ladder.png",
+	wield_image = "ethereal_stone_ladder.png",
 	paramtype = "light",
 	sunlight_propagates = true,
 	paramtype2 = "wallmounted",
@@ -202,11 +202,11 @@ minetest.register_node("ethereal:stone_ladder", {
 	climbable = true,
 	is_ground_content = false,
 	selection_box = {
-		type = "wallmounted",
+		type = "wallmounted"
 	},
 	groups = {cracky = 3, oddly_breakable_by_hand = 1},
 	legacy_wallmounted = true,
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
 minetest.register_craft({
@@ -214,7 +214,7 @@ minetest.register_craft({
 	recipe = {
 		{"group:stone", "", "group:stone"},
 		{"group:stone", "group:stone", "group:stone"},
-		{"group:stone", "", "group:stone"},
+		{"group:stone", "", "group:stone"}
 	}
 })
 
@@ -222,9 +222,9 @@ minetest.register_craft({
 minetest.register_node("ethereal:paper_wall", {
 	drawtype = "nodebox",
 	description = S("Paper Wall"),
-	tiles = {"paper_wall.png"},
-	inventory_image_image = "paper_wall.png",
-	wield_image = "paper_wall.png",
+	tiles = {"ethereal_paper_wall.png"},
+	inventory_image_image = "ethereal_paper_wall.png",
+	wield_image = "ethereal_paper_wall.png",
 	paramtype = "light",
 	groups = {snappy = 3},
 	sounds = default.node_sound_wood_defaults(),
@@ -241,7 +241,7 @@ minetest.register_node("ethereal:paper_wall", {
 		fixed = {
 			{ -0.5, -0.5, 5/11, 0.5, 0.5, 8/16 }
 		}
-	},
+	}
 })
 
 minetest.register_craft({
@@ -249,18 +249,18 @@ minetest.register_craft({
 	recipe = {
 		{"group:stick", "default:paper", "group:stick"},
 		{"group:stick", "default:paper", "group:stick"},
-		{"group:stick", "default:paper", "group:stick"},
+		{"group:stick", "default:paper", "group:stick"}
 	}
 })
 
 -- Glostone (A little bit of light decoration)
 minetest.register_node("ethereal:glostone", {
 	description = S("Glo Stone"),
-	tiles = {"glostone.png"},
+	tiles = {"ethereal_glostone.png"},
 	groups = {cracky = 3},
 	light_source = 13,
 	drop = "ethereal:glostone",
-	sounds = default.node_sound_stone_defaults(),
+	sounds = default.node_sound_stone_defaults()
 })
 
 minetest.register_craft({
@@ -272,7 +272,7 @@ minetest.register_craft({
 -- Charcoal Lump
 minetest.register_craftitem("ethereal:charcoal_lump", {
 	description = S("Lump of Charcoal"),
-	inventory_image = "charcoal_lump.png",
+	inventory_image = "ethereal_charcoal_lump.png"
 })
 
 minetest.register_craft({
@@ -292,7 +292,7 @@ minetest.register_craft({
 minetest.register_craft({
 	type = "fuel",
 	recipe = "ethereal:charcoal_lump",
-	burntime = 10,
+	burntime = 10
 })
 
 -- Make Torch from Charcoal Lump
@@ -300,15 +300,15 @@ minetest.register_craft({
 	output = "default:torch 4",
 	recipe = {
 		{"ethereal:charcoal_lump"},
-		{"default:stick"},
+		{"default:stick"}
 	}
 })
 
 -- Staff of Light (by Xanthin)
 minetest.register_tool("ethereal:light_staff", {
 	description = S("Staff of Light"),
-	inventory_image = "light_staff.png",
-	wield_image = "light_staff.png",
+	inventory_image = "ethereal_light_staff.png",
+	wield_image = "ethereal_light_staff.png",
 	sound = {breaks = "default_tool_breaks"},
 	stack_max = 1,
 	on_use = function(itemstack, user, pointed_thing)
@@ -339,8 +339,7 @@ minetest.register_tool("ethereal:light_staff", {
 
 			return itemstack
 		end
-
-	end,
+	end
 })
 
 minetest.register_craft({
diff --git a/fences.lua b/fences.lua
index aca4968..236b55e 100644
--- a/fences.lua
+++ b/fences.lua
@@ -3,7 +3,7 @@ local S = ethereal.intllib
 
 default.register_fence("ethereal:fence_scorched", {
 	description = S("Scorched Fence"),
-	texture = "scorched_tree.png",
+	texture = "ethereal_scorched_tree.png",
 	material = "ethereal:scorched_tree",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
@@ -12,7 +12,7 @@ default.register_fence("ethereal:fence_scorched", {
 
 default.register_fence("ethereal:fence_frostwood", {
 	description = S("Frost Fence"),
-	texture = "frost_wood.png",
+	texture = "ethereal_frost_wood.png",
 	material = "ethereal:frost_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
@@ -21,7 +21,7 @@ default.register_fence("ethereal:fence_frostwood", {
 
 default.register_fence("ethereal:fence_redwood", {
 	description = S("Redwood Fence"),
-	texture = "redwood_wood.png",
+	texture = "ethereal_redwood_wood.png",
 	material = "ethereal:redwood_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
@@ -30,7 +30,7 @@ default.register_fence("ethereal:fence_redwood", {
 
 default.register_fence("ethereal:fence_willow", {
 	description = S("Willow Fence"),
-	texture = "willow_wood.png",
+	texture = "ethereal_willow_wood.png",
 	material = "ethereal:willow_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
@@ -39,7 +39,7 @@ default.register_fence("ethereal:fence_willow", {
 
 default.register_fence("ethereal:fence_yellowwood", {
 	description = S("Healing Wood Fence"),
-	texture = "yellow_wood.png",
+	texture = "ethereal_yellow_wood.png",
 	material = "ethereal:yellow_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
@@ -57,7 +57,7 @@ default.register_fence("ethereal:fence_palm", {
 
 default.register_fence("ethereal:fence_banana", {
 	description = S("Banana Wood Fence"),
-	texture = "banana_wood.png",
+	texture = "ethereal_banana_wood.png",
 	material = "ethereal:banana_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
@@ -66,7 +66,7 @@ default.register_fence("ethereal:fence_banana", {
 
 default.register_fence("ethereal:fence_mushroom", {
 	description = S("Mushroom Fence"),
-	texture = "mushroom_trunk.png",
+	texture = "ethereal_mushroom_trunk.png",
 	material = "ethereal:mushroom_trunk",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
@@ -97,7 +97,7 @@ if default.register_fence_rail then
 
 default.register_fence_rail("ethereal:fence_rail_scorched", {
 	description = S("Scorched Fence Rail"),
-	texture = "scorched_tree.png",
+	texture = "ethereal_scorched_tree.png",
 	material = "ethereal:scorched_tree",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults()
@@ -105,7 +105,7 @@ default.register_fence_rail("ethereal:fence_rail_scorched", {
 
 default.register_fence_rail("ethereal:fence_rail_frostwood", {
 	description = S("Frost Fence Rail"),
-	texture = "frost_wood.png",
+	texture = "ethereal_frost_wood.png",
 	material = "ethereal:frost_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults()
@@ -113,7 +113,7 @@ default.register_fence_rail("ethereal:fence_rail_frostwood", {
 
 default.register_fence_rail("ethereal:fence_rail_redwood", {
 	description = S("Redwood Fence Rail"),
-	texture = "redwood_wood.png",
+	texture = "ethereal_redwood_wood.png",
 	material = "ethereal:redwood_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults()
@@ -121,7 +121,7 @@ default.register_fence_rail("ethereal:fence_rail_redwood", {
 
 default.register_fence_rail("ethereal:fence_rail_willow", {
 	description = S("Willow Fence Rail"),
-	texture = "willow_wood.png",
+	texture = "ethereal_willow_wood.png",
 	material = "ethereal:willow_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults()
@@ -129,7 +129,7 @@ default.register_fence_rail("ethereal:fence_rail_willow", {
 
 default.register_fence_rail("ethereal:fence_rail_yellowwood", {
 	description = S("Healing Wood Fence Rail"),
-	texture = "yellow_wood.png",
+	texture = "ethereal_yellow_wood.png",
 	material = "ethereal:yellow_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults()
@@ -145,7 +145,7 @@ default.register_fence_rail("ethereal:fence_rail_palm", {
 
 default.register_fence_rail("ethereal:fence_rail_banana", {
 	description = S("Banana Wood Fence Rail"),
-	texture = "banana_wood.png",
+	texture = "ethereal_banana_wood.png",
 	material = "ethereal:banana_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults()
@@ -153,7 +153,7 @@ default.register_fence_rail("ethereal:fence_rail_banana", {
 
 default.register_fence_rail("ethereal:fence_rail_mushroom", {
 	description = S("Mushroom Fence Rail"),
-	texture = "mushroom_trunk.png",
+	texture = "ethereal_mushroom_trunk.png",
 	material = "ethereal:mushroom_trunk",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
 	sounds = default.node_sound_wood_defaults()
diff --git a/fishing.lua b/fishing.lua
index f5e643c..9ce89d9 100644
--- a/fishing.lua
+++ b/fishing.lua
@@ -530,8 +530,8 @@ minetest.register_craft({
 -- Sashimi (Thanks to Natalia Grosner for letting me use the sashimi image)
 minetest.register_craftitem("ethereal:sashimi", {
 	description = S("Sashimi"),
-	inventory_image = "sashimi.png",
-	wield_image = "sashimi.png",
+	inventory_image = "ethereal_sashimi.png",
+	wield_image = "ethereal_sashimi.png",
 	on_use = minetest.item_eat(4)
 })
 
@@ -545,14 +545,14 @@ minetest.register_craft({
 -- Worm
 minetest.register_craftitem("ethereal:worm", {
 	description = S("Worm"),
-	inventory_image = "worm.png",
-	wield_image = "worm.png",
+	inventory_image = "ethereal_worm.png",
+	wield_image = "ethereal_worm.png"
 })
 
 minetest.register_craft({
 	output = "ethereal:worm",
 	recipe = {
-		{"default:dirt","default:dirt"},
+		{"default:dirt","default:dirt"}
 	}
 })
 
diff --git a/food.lua b/food.lua
index bcf0077..d624edb 100644
--- a/food.lua
+++ b/food.lua
@@ -5,9 +5,9 @@ local S = ethereal.intllib
 minetest.register_node("ethereal:banana", {
 	description = S("Banana"),
 	drawtype = "torchlike",
-	tiles = {"banana_single.png"},
-	inventory_image = "banana_single.png",
-	wield_image = "banana_single.png",
+	tiles = {"ethereal_banana_single.png"},
+	inventory_image = "ethereal_banana_single.png",
+	wield_image = "ethereal_banana_single.png",
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
@@ -26,16 +26,16 @@ minetest.register_node("ethereal:banana", {
 		if placer:is_player() then
 			minetest.set_node(pos, {name = "ethereal:banana", param2 = 1})
 		end
-	end,
+	end
 })
 
 -- Banana Bunch
 minetest.register_node("ethereal:banana_bunch", {
 	description = S("Banana Bunch"),
 	drawtype = "torchlike",
-	tiles = {"banana_bunch.png"},
-	inventory_image = "banana_bunch.png",
-	wield_image = "banana_bunch.png",
+	tiles = {"ethereal_banana_bunch.png"},
+	inventory_image = "ethereal_banana_bunch.png",
+	wield_image = "ethereal_banana_bunch.png",
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
@@ -54,7 +54,7 @@ minetest.register_node("ethereal:banana_bunch", {
 		if placer:is_player() then
 			minetest.set_node(pos, {name = "ethereal:banana_bunch", param2 = 1})
 		end
-	end,
+	end
 })
 
 -- Bunch to Single
@@ -73,7 +73,7 @@ minetest.register_craft({
 -- Banana Dough
 minetest.register_craftitem("ethereal:banana_dough", {
 	description = S("Banana Dough"),
-	inventory_image = "banana_dough.png",
+	inventory_image = "ethereal_banana_dough.png"
 })
 
 minetest.register_craft({
@@ -120,19 +120,19 @@ minetest.register_node("ethereal:orange", {
 -- Pine Nuts (Heals 1/2 heart when eaten)
 minetest.register_craftitem("ethereal:pine_nuts", {
 	description = S("Pine Nuts"),
-	inventory_image = "pine_nuts.png",
-	wield_image = "pine_nuts.png",
+	inventory_image = "ethereal_pine_nuts.png",
+	wield_image = "ethereal_pine_nuts.png",
 	groups = {food_pine_nuts = 1, flammable = 2},
-	on_use = minetest.item_eat(1),
+	on_use = minetest.item_eat(1)
 })
 
 -- Banana Loaf (Heals 3 hearts when eaten)
 minetest.register_craftitem("ethereal:banana_bread", {
 	description = S("Banana Loaf"),
-	inventory_image = "banana_bread.png",
-	wield_image = "banana_bread.png",
+	inventory_image = "ethereal_banana_bread.png",
+	wield_image = "ethereal_banana_bread.png",
 	groups = {food_bread = 1, flammable = 3},
-	on_use = minetest.item_eat(6),
+	on_use = minetest.item_eat(6)
 })
 
 -- Coconut (Gives 4 coconut slices, each heal 1/2 heart)
@@ -154,7 +154,7 @@ minetest.register_node("ethereal:coconut", {
 		choppy = 1, flammable = 1, leafdecay = 3, leafdecay_drop = 1
 	},
 	drop = "ethereal:coconut_slice 4",
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
 })
 
 -- Coconut Slice (Heals half heart when eaten)
@@ -163,7 +163,7 @@ minetest.register_craftitem("ethereal:coconut_slice", {
 	inventory_image = "moretrees_coconut_slice.png",
 	wield_image = "moretrees_coconut_slice.png",
 	groups = {food_coconut_slice = 1, flammable = 1},
-	on_use = minetest.item_eat(1),
+	on_use = minetest.item_eat(1)
 })
 
 -- Golden Apple (Found on Healing Tree, heals all 10 hearts)
@@ -197,15 +197,15 @@ minetest.register_node("ethereal:golden_apple", {
 		if placer:is_player() then
 			minetest.set_node(pos, {name = "ethereal:golden_apple", param2 = 1})
 		end
-	end,
+	end
 })
 
 -- Hearty Stew (Heals 5 hearts - thanks to ZonerDarkRevention for his DokuCraft DeviantArt bowl texture)
 minetest.register_craftitem("ethereal:hearty_stew", {
 	description = S("Hearty Stew"),
-	inventory_image = "hearty_stew.png",
-	wield_image = "hearty_stew.png",
-	on_use = minetest.item_eat(10, "ethereal:bowl"),
+	inventory_image = "ethereal_hearty_stew.png",
+	wield_image = "ethereal_hearty_stew.png",
+	on_use = minetest.item_eat(10, "ethereal:bowl")
 })
 
 minetest.register_craft({
@@ -213,7 +213,7 @@ minetest.register_craft({
 	recipe = {
 		{"group:food_onion","flowers:mushroom_brown", "group:food_tuber"},
 		{"","flowers:mushroom_brown", ""},
-		{"","group:food_bowl", ""},
+		{"","group:food_bowl", ""}
 	}
 })
 
@@ -224,7 +224,7 @@ minetest.register_craft({
 	recipe = {
 		{"group:food_onion","flowers:mushroom_brown", "group:food_beans"},
 		{"","flowers:mushroom_brown", ""},
-		{"","group:food_bowl", ""},
+		{"","group:food_bowl", ""}
 	}
 })
 end
@@ -253,7 +253,7 @@ minetest.register_craftitem("ethereal:firethorn_jelly", {
 	inventory_image = "ethereal_firethorn_jelly.png",
 	wield_image = "ethereal_firethorn_jelly.png",
 	on_use = minetest.item_eat(2, "vessels:glass_bottle"),
-	groups = {vessel = 1},
+	groups = {vessel = 1}
 })
 
 if minetest.registered_items["farming:bowl"] then
@@ -264,12 +264,12 @@ minetest.register_craft({
 	recipe = {
 		"farming:mortar_pestle","vessels:glass_bottle",
 		"ethereal:firethorn", "ethereal:firethorn", "ethereal:firethorn",
-		"bucket:bucket_water", "bucket:bucket_water", "bucket:bucket_water",
+		"bucket:bucket_water", "bucket:bucket_water", "bucket:bucket_water"
 	},
 	replacements = {
 		{"bucket:bucket_water", "bucket:bucket_empty 3"},
-		{"farming:mortar_pestle", "farming:mortar_pestle"},
-	},
+		{"farming:mortar_pestle", "farming:mortar_pestle"}
+	}
 })
 end
 
@@ -278,9 +278,9 @@ end
 minetest.register_node("ethereal:lemon", {
 	description = S("Lemon"),
 	drawtype = "plantlike",
-	tiles = {"lemon.png"},
-	inventory_image = "lemon_fruit.png",
-	wield_image = "lemon_fruit.png",
+	tiles = {"ethereal_lemon.png"},
+	inventory_image = "ethereal_lemon_fruit.png",
+	wield_image = "ethereal_lemon_fruit.png",
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
@@ -299,7 +299,7 @@ minetest.register_node("ethereal:lemon", {
 		if placer:is_player() then
 			minetest.set_node(pos, {name = "ethereal:lemon", param2 = 1})
 		end
-	end,
+	end
 })
 
 -- Candied Lemon
@@ -308,7 +308,7 @@ minetest.register_craftitem("ethereal:candied_lemon", {
 	inventory_image = "ethereal_candied_lemon.png",
 	wield_image = "ethereal_candied_lemon.png",
 	groups = {food_candied_lemon = 1},
-	on_use = minetest.item_eat(5),
+	on_use = minetest.item_eat(5)
 })
 
 minetest.register_craft({
@@ -319,7 +319,7 @@ minetest.register_craft({
 	},
 	replacements = {
 		{"farming:baking_tray", "farming:baking_tray"}
-	},
+	}
 })
 
 -- Lemonade
@@ -356,9 +356,9 @@ minetest.register_craft({
 minetest.register_node("ethereal:olive", {
 	description = S("Olive"),
 	drawtype = "plantlike",
-	tiles = {"olive.png"},
-	inventory_image = "olive_fruit.png",
-	wield_image = "olive_fruit.png",
+	tiles = {"ethereal_olive.png"},
+	inventory_image = "ethereal_olive_fruit.png",
+	wield_image = "ethereal_olive_fruit.png",
 	visual_scale = 0.2,
 	paramtype = "light",
 	sunlight_propagates = true,
@@ -378,7 +378,7 @@ minetest.register_node("ethereal:olive", {
 		if placer:is_player() then
 			minetest.set_node(pos, {name = "ethereal:olive", param2 = 1})
 		end
-	end,
+	end
 })
 
 -- Olive Oil
@@ -386,7 +386,7 @@ minetest.register_craftitem("ethereal:olive_oil", {
 	description = S("Olive Oil"),
 	inventory_image = "ethereal_olive_oil.png",
 	wield_image = "ethereal_olive_oil.png",
-	groups = {food_oil = 1, food_olive_oil = 1, vessel = 1},
+	groups = {food_oil = 1, food_olive_oil = 1, vessel = 1}
 })
 
 minetest.register_craft({
@@ -399,14 +399,14 @@ minetest.register_craft({
 	},
 	replacements = {
 		{"farming:juicer", "farming:juicer"}
-	},
+	}
 })
 
 -- Kappa Maki (sushi with cucumber)
 minetest.register_craftitem("ethereal:sushi_kappamaki", {
 	description = S("Kappa Maki Sushi"),
 	inventory_image = "ethereal_sushi_kappa_maki.png",
-	on_use = minetest.item_eat(3),
+	on_use = minetest.item_eat(3)
 })
 
 minetest.register_craft({
@@ -420,7 +420,7 @@ minetest.register_craft({
 minetest.register_craftitem("ethereal:sushi_nigiri", {
 	description = S("Nigiri Sushi"),
 	inventory_image = "ethereal_sushi_nigiri.png",
-	on_use = minetest.item_eat(2),
+	on_use = minetest.item_eat(2)
 })
 
 minetest.register_craft({
@@ -434,7 +434,7 @@ minetest.register_craft({
 minetest.register_craftitem("ethereal:sushi_tamago", {
 	description = S("Tamago Sushi"),
 	inventory_image = "ethereal_sushi_tamago.png",
-	on_use = minetest.item_eat(2),
+	on_use = minetest.item_eat(2)
 })
 
 minetest.register_craft({
diff --git a/gates.lua b/gates.lua
index d98c568..938d14e 100644
--- a/gates.lua
+++ b/gates.lua
@@ -5,35 +5,35 @@ local S = ethereal.intllib
 
 doors.register_fencegate("ethereal:fencegate_scorched", {
 	description = S("Scorched Wood Fence Gate"),
-	texture = "scorched_tree.png",
+	texture = "ethereal_scorched_tree.png",
 	material = "ethereal:scorched_tree",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
 doors.register_fencegate("ethereal:fencegate_frostwood", {
 	description = S("Frost Wood Fence Gate"),
-	texture = "frost_wood.png",
+	texture = "ethereal_frost_wood.png",
 	material = "ethereal:frost_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
 doors.register_fencegate("ethereal:fencegate_redwood", {
 	description = S("Redwood Fence Gate"),
-	texture = "redwood_wood.png",
+	texture = "ethereal_redwood_wood.png",
 	material = "ethereal:redwood_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
 doors.register_fencegate("ethereal:fencegate_willow", {
 	description = S("Willow Wood Fence Gate"),
-	texture = "willow_wood.png",
+	texture = "ethereal_willow_wood.png",
 	material = "ethereal:willow_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
 doors.register_fencegate("ethereal:fencegate_yellowwood", {
 	description = S("Healing Wood Fence Gate"),
-	texture = "yellow_wood.png",
+	texture = "ethereal_yellow_wood.png",
 	material = "ethereal:yellow_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
@@ -47,14 +47,14 @@ doors.register_fencegate("ethereal:fencegate_palm", {
 
 doors.register_fencegate("ethereal:fencegate_banana", {
 	description = S("Banana Wood Fence Gate"),
-	texture = "banana_wood.png",
+	texture = "ethereal_banana_wood.png",
 	material = "ethereal:banana_wood",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
 
 doors.register_fencegate("ethereal:fencegate_mushroom", {
 	description = S("Mushroom Trunk Fence Gate"),
-	texture = "mushroom_trunk.png",
+	texture = "ethereal_mushroom_trunk.png",
 	material = "ethereal:mushroom_trunk",
 	groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}
 })
@@ -88,22 +88,22 @@ minetest.register_alias("ethereal:fencegate_pine_closed", "doors:gate_pine_wood_
 
 -- sakura door
 doors.register_door("ethereal:door_sakura", {
-		tiles = {
-			{name = "ethereal_sakura_door.png", backface_culling = true}
-		},
-		description = S("Sakura Wood Door"),
-		inventory_image = "ethereal_sakura_door_inv.png",
-		groups = {
-			snappy = 1, choppy = 2, oddly_breakable_by_hand = 2,
-			flammable = 2
-		},
-		sound_open = "doors_glass_door_open",
-		sound_close = "doors_glass_door_close",
-		recipe = {
-			{"group:stick",  "default:paper"},
-			{"default:paper",  "group:stick"},
-			{"ethereal:sakura_wood", "ethereal:sakura_wood"}
-		}
+	tiles = {
+		{name = "ethereal_sakura_door.png", backface_culling = true}
+	},
+	description = S("Sakura Wood Door"),
+	inventory_image = "ethereal_sakura_door_inv.png",
+	groups = {
+		snappy = 1, choppy = 2, oddly_breakable_by_hand = 2,
+		flammable = 2
+	},
+	sound_open = "doors_glass_door_open",
+	sound_close = "doors_glass_door_close",
+	recipe = {
+		{"group:stick",  "default:paper"},
+		{"default:paper",  "group:stick"},
+		{"ethereal:sakura_wood", "ethereal:sakura_wood"}
+	}
 })
 
 minetest.register_alias("ethereal:sakura_door", "ethereal:door_sakura")
diff --git a/leaves.lua b/leaves.lua
index af49b57..e3e6de2 100644
--- a/leaves.lua
+++ b/leaves.lua
@@ -73,9 +73,9 @@ minetest.override_item("default:aspen_leaves", {
 minetest.register_node("ethereal:willow_twig", {
 	description = S("Willow Twig"),
 	drawtype = "plantlike",
-	tiles = {"willow_twig.png"},
-	inventory_image = "willow_twig.png",
-	wield_image = "willow_twig.png",
+	tiles = {"ethereal_willow_twig.png"},
+	inventory_image = "ethereal_willow_twig.png",
+	wield_image = "ethereal_willow_twig.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
 	visual_scale = leafscale,
@@ -89,7 +89,7 @@ minetest.register_node("ethereal:willow_twig", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
+	after_place_node = default.after_place_leaves
 })
 
 -- redwood leaves
@@ -97,9 +97,9 @@ minetest.register_node("ethereal:redwood_leaves", {
 	description = S("Redwood Leaves"),
 	drawtype = leaftype,
 	visual_scale = leafscale,
-	tiles = {"redwood_leaves.png"},
-	inventory_image = "redwood_leaves.png",
-	wield_image = "redwood_leaves.png",
+	tiles = {"ethereal_redwood_leaves.png"},
+	inventory_image = "ethereal_redwood_leaves.png",
+	wield_image = "ethereal_redwood_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
 	waving = 1,
@@ -112,7 +112,7 @@ minetest.register_node("ethereal:redwood_leaves", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
+	after_place_node = default.after_place_leaves
 })
 
 -- orange tree leaves
@@ -120,9 +120,9 @@ minetest.register_node("ethereal:orange_leaves", {
 	description = S("Orange Leaves"),
 	drawtype = leaftype,
 	visual_scale = leafscale,
-	tiles = {"orange_leaves.png"},
-	inventory_image = "orange_leaves.png",
-	wield_image = "orange_leaves.png",
+	tiles = {"ethereal_orange_leaves.png"},
+	inventory_image = "ethereal_orange_leaves.png",
+	wield_image = "ethereal_orange_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
 	waving = 1,
@@ -135,7 +135,7 @@ minetest.register_node("ethereal:orange_leaves", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
+	after_place_node = default.after_place_leaves
 })
 
 -- banana tree leaves
@@ -143,9 +143,9 @@ minetest.register_node("ethereal:bananaleaves", {
 	description = S("Banana Leaves"),
 	drawtype = leaftype,
 	visual_scale = leafscale,
-	tiles = {"banana_leaf.png"},
-	inventory_image = "banana_leaf.png",
-	wield_image = "banana_leaf.png",
+	tiles = {"ethereal_banana_leaf.png"},
+	inventory_image = "ethereal_banana_leaf.png",
+	wield_image = "ethereal_banana_leaf.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
 	waving = 1,
@@ -158,7 +158,7 @@ minetest.register_node("ethereal:bananaleaves", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
+	after_place_node = default.after_place_leaves
 })
 
 -- healing tree leaves
@@ -166,9 +166,9 @@ minetest.register_node("ethereal:yellowleaves", {
 	description = S("Healing Tree Leaves"),
 	drawtype = leaftype,
 	visual_scale = leafscale,
-	tiles = {"yellow_leaves.png"},
-	inventory_image = "yellow_leaves.png",
-	wield_image = "yellow_leaves.png",
+	tiles = {"ethereal_yellow_leaves.png"},
+	inventory_image = "ethereal_yellow_leaves.png",
+	wield_image = "ethereal_yellow_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
 	waving = 1,
@@ -184,7 +184,7 @@ minetest.register_node("ethereal:yellowleaves", {
 	on_use = minetest.item_eat(1),
 	sounds = default.node_sound_leaves_defaults(),
 	after_place_node = default.after_place_leaves,
-	light_source = 9,
+	light_source = 9
 })
 
 -- palm tree leaves
@@ -207,7 +207,7 @@ minetest.register_node("ethereal:palmleaves", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
+	after_place_node = default.after_place_leaves
 })
 
 -- birch tree leaves
@@ -230,7 +230,7 @@ minetest.register_node("ethereal:birch_leaves", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
+	after_place_node = default.after_place_leaves
 })
 
 -- frost tree leaves
@@ -254,7 +254,7 @@ minetest.register_node("ethereal:frost_leaves", {
 	},
 	light_source = 9,
 	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
+	after_place_node = default.after_place_leaves
 })
 
 -- bamboo stalk leaves
@@ -262,9 +262,9 @@ minetest.register_node("ethereal:bamboo_leaves", {
 	description = S("Bamboo Leaves"),
 	drawtype = leaftype,
 	visual_scale = leafscale,
-	tiles = {"bamboo_leaves.png"},
-	inventory_image = "bamboo_leaves.png",
-	wield_image = "bamboo_leaves.png",
+	tiles = {"ethereal_bamboo_leaves.png"},
+	inventory_image = "ethereal_bamboo_leaves.png",
+	wield_image = "ethereal_bamboo_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
 	waving = 1,
@@ -277,7 +277,7 @@ minetest.register_node("ethereal:bamboo_leaves", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
+	after_place_node = default.after_place_leaves
 })
 
 -- sakura leaves
@@ -300,7 +300,7 @@ minetest.register_node("ethereal:sakura_leaves", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
+	after_place_node = default.after_place_leaves
 })
 
 minetest.register_node("ethereal:sakura_leaves2", {
@@ -322,7 +322,7 @@ minetest.register_node("ethereal:sakura_leaves2", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
+	after_place_node = default.after_place_leaves
 })
 
 -- lemon tree leaves
@@ -330,9 +330,9 @@ minetest.register_node("ethereal:lemon_leaves", {
 	description = S("Lemon Tree Leaves"),
 	drawtype = leaftype,
 	visual_scale = leafscale,
-	tiles = {"lemon_leaves.png"},
-	inventory_image = "lemon_leaves.png",
-	wield_image = "lemon_leaves.png",
+	tiles = {"ethereal_lemon_leaves.png"},
+	inventory_image = "ethereal_lemon_leaves.png",
+	wield_image = "ethereal_lemon_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
 	waving = 1,
@@ -345,7 +345,7 @@ minetest.register_node("ethereal:lemon_leaves", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
+	after_place_node = default.after_place_leaves
 })
 
 -- olive tree leaves
@@ -353,9 +353,9 @@ minetest.register_node("ethereal:olive_leaves", {
 	description = S("Olive Tree Leaves"),
 	drawtype = leaftype,
 	visual_scale = leafscale,
-	tiles = {"olive_leaves.png"},
-	inventory_image = "olive_leaves.png",
-	wield_image = "olive_leaves.png",
+	tiles = {"ethereal_olive_leaves.png"},
+	inventory_image = "ethereal_olive_leaves.png",
+	wield_image = "ethereal_olive_leaves.png",
 	paramtype = "light",
 	walkable = ethereal.leafwalk,
 	waving = 1,
@@ -368,13 +368,13 @@ minetest.register_node("ethereal:olive_leaves", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
+	after_place_node = default.after_place_leaves
 })
 
 -- mushroom tops
 minetest.register_node("ethereal:mushroom", {
 	description = S("Mushroom Cap"),
-	tiles = {"mushroom_block.png"},
+	tiles = {"ethereal_mushroom_block.png"},
 	groups = {choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, leafdecay = 3},
 	drop = {
 		max_items = 1,
@@ -383,31 +383,31 @@ minetest.register_node("ethereal:mushroom", {
 			{items = {"ethereal:mushroom"}}
 		}
 	},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "ethereal:mushroom",
-	burntime = 10,
+	burntime = 10
 })
 
 -- mushroom pore (spongelike material found inside giant shrooms)
 minetest.register_node("ethereal:mushroom_pore", {
 	description = S("Mushroom Pore"),
-	tiles = {"mushroom_pore.png"},
+	tiles = {"ethereal_mushroom_pore.png"},
 	groups = {
 		snappy = 3, cracky = 3, choppy = 3, oddly_breakable_by_hand = 3,
 		flammable = 2, disable_jump = 1, fall_damage_add_percent = -100,
 		leafdecay = 3
 	},
-	sounds = default.node_sound_dirt_defaults(),
+	sounds = default.node_sound_dirt_defaults()
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "ethereal:mushroom_pore",
-	burntime = 3,
+	burntime = 3
 })
 
 -- hedge block
@@ -416,7 +416,7 @@ minetest.register_node("ethereal:bush", {
 	tiles = {"ethereal_bush.png"},
 	walkable = true,
 	groups = {snappy = 3, flammable = 2},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })
 
 minetest.register_craft({
@@ -424,14 +424,14 @@ minetest.register_craft({
 	recipe = {
 		{"group:leaves", "group:leaves", "group:leaves"},
 		{"group:leaves", "ethereal:bamboo_leaves", "group:leaves"},
-		{"group:leaves", "group:leaves", "group:leaves"},
+		{"group:leaves", "group:leaves", "group:leaves"}
 	}
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "ethereal:bush",
-	burntime = 1,
+	burntime = 1
 })
 
 -- bush block #2
@@ -442,7 +442,7 @@ minetest.register_node("ethereal:bush2", {
 	paramtype = "light",
 	walkable = true,
 	groups = {snappy = 3, flammable = 2},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })
 
 minetest.register_craft({
@@ -450,14 +450,14 @@ minetest.register_craft({
 	recipe = {
 		{"group:leaves", "group:leaves", "group:leaves"},
 		{"group:leaves", "default:aspen_leaves", "group:leaves"},
-		{"group:leaves", "group:leaves", "group:leaves"},
+		{"group:leaves", "group:leaves", "group:leaves"}
 	}
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "ethereal:bush2",
-	burntime = 1,
+	burntime = 1
 })
 
 -- bush block #3
@@ -468,7 +468,7 @@ minetest.register_node("ethereal:bush3", {
 	paramtype = "light",
 	walkable = true,
 	groups = {snappy = 3, flammable = 2},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })
 
 minetest.register_craft({
@@ -476,14 +476,14 @@ minetest.register_craft({
 	recipe = {
 		{"group:leaves", "group:leaves", "group:leaves"},
 		{"group:leaves", "default:pine_needles", "group:leaves"},
-		{"group:leaves", "group:leaves", "group:leaves"},
+		{"group:leaves", "group:leaves", "group:leaves"}
 	}
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "ethereal:bush3",
-	burntime = 1,
+	burntime = 1
 })
 
 -- compatibility check for new mt version with leafdecay function
diff --git a/mushroom.lua b/mushroom.lua
index 0781f88..417430a 100644
--- a/mushroom.lua
+++ b/mushroom.lua
@@ -4,9 +4,9 @@ local S = ethereal.intllib
 -- mushroom soup (Heals 1 heart)
 minetest.register_craftitem("ethereal:mushroom_soup", {
 	description = S("Mushroom Soup"),
-	inventory_image = "mushroom_soup.png",
+	inventory_image = "ethereal_mushroom_soup.png",
 	groups = {drink = 1},
-	on_use = minetest.item_eat(5, "ethereal:bowl"),
+	on_use = minetest.item_eat(5, "ethereal:bowl")
 })
 
 minetest.register_craft({
@@ -14,7 +14,7 @@ minetest.register_craft({
 	recipe = {
 		{"flowers:mushroom_brown"},
 		{"flowers:mushroom_brown"},
-		{"group:food_bowl"},
+		{"group:food_bowl"}
 	}
 })
 
@@ -23,6 +23,6 @@ minetest.register_craft({
 	output = "ethereal:mushroom",
 	recipe = {
 		{"flowers:mushroom_red", "flowers:mushroom_red"},
-		{"flowers:mushroom_red", "flowers:mushroom_red"},
+		{"flowers:mushroom_red", "flowers:mushroom_red"}
 	}
 })
diff --git a/onion.lua b/onion.lua
index 69671c3..41a9d42 100644
--- a/onion.lua
+++ b/onion.lua
@@ -1,104 +1,104 @@
-
-local S = ethereal.intllib
-
--- wild onion
-minetest.register_craftitem("ethereal:wild_onion_plant", {
-	description = S("Wild Onion"),
-	inventory_image = "wild_onion.png",
-	wield_image = "wild_onion.png",
-	groups = {food_onion = 1, flammable = 2},
-	on_place = function(itemstack, placer, pointed_thing)
-		return farming.place_seed(itemstack, placer, pointed_thing, "ethereal:wild_onion_1")
-	end,
-	on_use = minetest.item_eat(2),
-})
-
--- Define Onion growth stages
-local crop_def = {
-	drawtype = "plantlike",
-	tiles = {"ethereal_wild_onion_1.png"},
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	buildable_to = true,
-	drop = "",
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}
-	},
-	groups = {
-		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
-		growing = 1, not_in_creative_inventory = 1
-	},
-	sounds = default.node_sound_leaves_defaults(),
-}
-
---stage 1
-minetest.register_node("ethereal:onion_1", table.copy(crop_def))
-
---stage 2
-crop_def.tiles = {"ethereal_wild_onion_2.png"}
-minetest.register_node("ethereal:onion_2", table.copy(crop_def))
-
---stage 3
-crop_def.tiles = {"ethereal_wild_onion_3.png"}
-minetest.register_node("ethereal:onion_3", table.copy(crop_def))
-
---stage 4
-crop_def.tiles = {"ethereal_wild_onion_4.png"}
-crop_def.drop = {
-	items = {
-		{items = {"ethereal:wild_onion_plant"}, rarity = 1},
-		{items = {"ethereal:wild_onion_plant 2"}, rarity = 3},
-	}
-}
-minetest.register_node("ethereal:onion_4", table.copy(crop_def))
-
---stage 5
-crop_def.tiles = {"ethereal_wild_onion_5.png"}
-crop_def.groups.growing = 0
-crop_def.drop = {
-	items = {
-		{items = {"ethereal:wild_onion_plant 2"}, rarity = 1},
-		{items = {"ethereal:wild_onion_plant 3"}, rarity = 2},
-	}
-}
-minetest.register_node("ethereal:onion_5", table.copy(crop_def))
-
--- growing routine if farming redo isn't present
-if not farming or not farming.mod or farming.mod ~= "redo" then
-
-minetest.register_abm({
-	label = "Ethereal grow onion",
-	nodenames = {"ethereal:onion_1", "ethereal:onion_2", "ethereal:onion_3", "ethereal:onion_4"},
-	neighbors = {"farming:soil_wet"},
-	interval = 9,
-	chance = 20,
-	catch_up = false,
-	action = function(pos, node)
-
-		-- are we on wet soil?
-		pos.y = pos.y - 1
-		if minetest.get_item_group(minetest.get_node(pos).name, "soil") < 3 then
-			return
-		end
-		pos.y = pos.y + 1
-		
-		-- do we have enough light?
-		local light = minetest.get_node_light(pos)
-
-		if not light
-		or light < 13 then
-			return
-		end
-		
-		-- grow to next stage
-		local num = node.name:split("_")[2]
-
-		node.name = "ethereal:onion_" .. tonumber(num + 1)
-
-		minetest.swap_node(pos, node)
-	end
-})
-
-end -- END IF
+
+local S = ethereal.intllib
+
+-- wild onion
+minetest.register_craftitem("ethereal:wild_onion_plant", {
+	description = S("Wild Onion"),
+	inventory_image = "ethereal_wild_onion.png",
+	wield_image = "ethereal_wild_onion.png",
+	groups = {food_onion = 1, flammable = 2},
+	on_place = function(itemstack, placer, pointed_thing)
+		return farming.place_seed(itemstack, placer, pointed_thing, "ethereal:wild_onion_1")
+	end,
+	on_use = minetest.item_eat(2),
+})
+
+-- Define Onion growth stages
+local crop_def = {
+	drawtype = "plantlike",
+	tiles = {"ethereal_wild_onion_1.png"},
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	buildable_to = true,
+	drop = "",
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5}
+	},
+	groups = {
+		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
+		growing = 1, not_in_creative_inventory = 1
+	},
+	sounds = default.node_sound_leaves_defaults(),
+}
+
+--stage 1
+minetest.register_node("ethereal:onion_1", table.copy(crop_def))
+
+--stage 2
+crop_def.tiles = {"ethereal_wild_onion_2.png"}
+minetest.register_node("ethereal:onion_2", table.copy(crop_def))
+
+--stage 3
+crop_def.tiles = {"ethereal_wild_onion_3.png"}
+minetest.register_node("ethereal:onion_3", table.copy(crop_def))
+
+--stage 4
+crop_def.tiles = {"ethereal_wild_onion_4.png"}
+crop_def.drop = {
+	items = {
+		{items = {"ethereal:wild_onion_plant"}, rarity = 1},
+		{items = {"ethereal:wild_onion_plant 2"}, rarity = 3},
+	}
+}
+minetest.register_node("ethereal:onion_4", table.copy(crop_def))
+
+--stage 5
+crop_def.tiles = {"ethereal_wild_onion_5.png"}
+crop_def.groups.growing = nil
+crop_def.drop = {
+	items = {
+		{items = {"ethereal:wild_onion_plant 2"}, rarity = 1},
+		{items = {"ethereal:wild_onion_plant 3"}, rarity = 2},
+	}
+}
+minetest.register_node("ethereal:onion_5", table.copy(crop_def))
+
+-- growing routine if farming redo isn't present
+if not farming or not farming.mod or farming.mod ~= "redo" then
+
+minetest.register_abm({
+	label = "Ethereal grow onion",
+	nodenames = {"ethereal:onion_1", "ethereal:onion_2", "ethereal:onion_3", "ethereal:onion_4"},
+	neighbors = {"farming:soil_wet"},
+	interval = 9,
+	chance = 20,
+	catch_up = false,
+	action = function(pos, node)
+
+		-- are we on wet soil?
+		pos.y = pos.y - 1
+		if minetest.get_item_group(minetest.get_node(pos).name, "soil") < 3 then
+			return
+		end
+		pos.y = pos.y + 1
+
+		-- do we have enough light?
+		local light = minetest.get_node_light(pos)
+
+		if not light
+		or light < 13 then
+			return
+		end
+
+		-- grow to next stage
+		local num = node.name:split("_")[2]
+
+		node.name = "ethereal:onion_" .. tonumber(num + 1)
+
+		minetest.swap_node(pos, node)
+	end
+})
+
+end -- END IF
diff --git a/plantlife.lua b/plantlife.lua
index eb989f3..975d28d 100644
--- a/plantlife.lua
+++ b/plantlife.lua
@@ -17,8 +17,8 @@ minetest.register_node("ethereal:firethorn", {
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
-		fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 4 / 16, 5 / 16},
-	},
+		fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 4 / 16, 5 / 16}
+	}
 })
 
 -- Fire Flower
@@ -38,7 +38,7 @@ minetest.register_node("ethereal:fire_flower", {
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
-		fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 1 / 2, 5 / 16},
+		fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 1 / 2, 5 / 16}
 	},
 
 	on_punch = function(pos, node, puncher)
@@ -47,52 +47,52 @@ minetest.register_node("ethereal:fire_flower", {
 			full_punch_interval = 1.0,
 			damage_groups = {fleshy = 2}
 		}, nil)
-	end,
+	end
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "ethereal:fire_flower",
-	burntime = 20,
+	burntime = 20
 })
 
 -- Fire Dust
 minetest.register_craftitem("ethereal:fire_dust", {
 	description = S("Fire Dust"),
-	inventory_image = "fire_dust.png",
+	inventory_image = "ethereal_fire_dust.png"
 })
 
 minetest.register_craft({
 	output = "ethereal:fire_dust 2",
 	recipe = {
-		{"ethereal:fire_flower"},
+		{"ethereal:fire_flower"}
 	}
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "ethereal:fire_dust",
-	burntime = 10,
+	burntime = 10
 })
 
 -- vines
 minetest.register_node("ethereal:vine", {
 	description = S("Vine"),
 	drawtype = "signlike",
-	tiles = {"vine.png"},
-	inventory_image = "vine.png",
-	wield_image = "vine.png",
+	tiles = {"ethereal_vine.png"},
+	inventory_image = "ethereal_vine.png",
+	wield_image = "ethereal_vine.png",
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	walkable = false,
 	climbable = true,
 	is_ground_content = false,
 	selection_box = {
-		type = "wallmounted",
+		type = "wallmounted"
 	},
 	groups = {choppy = 3, oddly_breakable_by_hand = 1, flammable = 2},
 	legacy_wallmounted = true,
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })
 
 minetest.register_craft({
@@ -100,7 +100,7 @@ minetest.register_craft({
 	recipe = {
 		{"group:leaves", "", "group:leaves"},
 		{"", "group:leaves", ""},
-		{"group:leaves", "", "group:leaves"},
+		{"group:leaves", "", "group:leaves"}
 	}
 })
 
@@ -108,9 +108,9 @@ minetest.register_craft({
 minetest.register_node("ethereal:lightstring", {
 	description = S("Light String Vine"),
 	drawtype = "signlike",
-	tiles = {"lightstring.png"},
-	inventory_image = "lightstring.png",
-	wield_image = "lightstring.png",
+	tiles = {"ethereal_lightstring.png"},
+	inventory_image = "ethereal_lightstring.png",
+	wield_image = "ethereal_lightstring.png",
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	light_source = 10,
@@ -118,11 +118,11 @@ minetest.register_node("ethereal:lightstring", {
 	climbable = true,
 	is_ground_content = false,
 	selection_box = {
-		type = "wallmounted",
+		type = "wallmounted"
 	},
 	groups = {choppy = 3, oddly_breakable_by_hand = 1, flammable = 2},
 	legacy_wallmounted = true,
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })
 
 minetest.register_craft({
@@ -130,8 +130,8 @@ minetest.register_craft({
 	recipe = {
 		{"ethereal:vine", "ethereal:vine", "ethereal:vine"},
 		{"ethereal:vine", "ethereal:fire_dust", "ethereal:vine"},
-		{"ethereal:vine", "ethereal:vine", "ethereal:vine"},
-	},
+		{"ethereal:vine", "ethereal:vine", "ethereal:vine"}
+	}
 })
 
 -- Fern (boston)
@@ -139,9 +139,9 @@ minetest.register_node("ethereal:fern", {
 	description = S("Fern"),
 	drawtype = "plantlike",
 	visual_scale = 1.4,
-	tiles = {"fern.png"},
-	inventory_image = "fern.png",
-	wield_image = "fern.png",
+	tiles = {"ethereal_fern.png"},
+	inventory_image = "ethereal_fern.png",
+	wield_image = "ethereal_fern.png",
 	paramtype = "light",
 	sunlight_propagates = true,
 	waving = 1,
@@ -158,16 +158,16 @@ minetest.register_node("ethereal:fern", {
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
-		fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 0.67, 5 / 16},
-	},
+		fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 0.67, 5 / 16}
+	}
 })
 
 -- Boston Ferns sometimes drop edible Tubers (heals 1/2 heart when eaten)
 minetest.register_craftitem("ethereal:fern_tubers", {
 	description = S("Fern Tubers"),
-	inventory_image = "fern_tubers.png",
+	inventory_image = "ethereal_fern_tubers.png",
 	groups = {food_tuber = 1, flammable = 2},
-	on_use = minetest.item_eat(1),
+	on_use = minetest.item_eat(1)
 })
 
 -- Red Shrub (not flammable)
@@ -186,8 +186,8 @@ minetest.register_node("ethereal:dry_shrub", {
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
-		fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 4 / 16, 5 / 16},
-	},
+		fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 4 / 16, 5 / 16}
+	}
 })
 
 -- Grey Shrub (not Flammable - too cold to burn)
@@ -207,8 +207,8 @@ minetest.register_node("ethereal:snowygrass", {
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
-		fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 5 / 16, 5 / 16},
-	},
+		fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 5 / 16, 5 / 16}
+	}
 })
 
 -- Crystal Shrub (not Flammable - too cold to burn)
@@ -228,8 +228,8 @@ minetest.register_node("ethereal:crystalgrass", {
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
-		fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 5 / 16, 5 / 16},
-	},
+		fixed = {-5 / 16, -0.5, -5 / 16, 5 / 16, 5 / 16, 5 / 16}
+	}
 })
 
 -- Define Moss Types (Has grass textures on all sides)
@@ -245,8 +245,8 @@ local add_moss = function(typ, descr, texture, receipe_item)
 
 	minetest.register_craft({
 		type = "shapeless",
-		output = "ethereal:"..typ.."_moss",
-		recipe = {"default:dirt", receipe_item }
+		output = "ethereal:" .. typ .. "_moss",
+		recipe = {"default:dirt", receipe_item}
 	})
 end
 
@@ -260,9 +260,9 @@ add_moss( "green", "Green", "default_grass.png", "default:jungleleaves")
 minetest.register_node("ethereal:illumishroom", {
 	description = S("Red Illumishroom"),
 	drawtype = "plantlike",
-	tiles = { "illumishroom.png" },
-	inventory_image = "illumishroom.png",
-	wield_image = "illumishroom.png",
+	tiles = {"ethereal_illumishroom_red.png"},
+	inventory_image = "ethereal_illumishroom_red.png",
+	wield_image = "ethereal_illumishroom_red.png",
 	paramtype = "light",
 	light_source = 5,
 	sunlight_propagates = true,
@@ -271,16 +271,16 @@ minetest.register_node("ethereal:illumishroom", {
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
-		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.47, 6 / 16},
-	},
+		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.47, 6 / 16}
+	}
 })
 
 minetest.register_node("ethereal:illumishroom2", {
 	description = S("Green Illumishroom"),
 	drawtype = "plantlike",
-	tiles = { "illumishroom2.png" },
-	inventory_image = "illumishroom2.png",
-	wield_image = "illumishroom2.png",
+	tiles = {"ethereal_illumishroom_green.png"},
+	inventory_image = "ethereal_illumishroom_green.png",
+	wield_image = "ethereal_illumishroom_green.png",
 	paramtype = "light",
 	light_source = 5,
 	sunlight_propagates = true,
@@ -289,16 +289,16 @@ minetest.register_node("ethereal:illumishroom2", {
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
-		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.47, 6 / 16},
-	},
+		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.47, 6 / 16}
+	}
 })
 
 minetest.register_node("ethereal:illumishroom3", {
 	description = S("Cyan Illumishroom"),
 	drawtype = "plantlike",
-	tiles = { "illumishroom3.png" },
-	inventory_image = "illumishroom3.png",
-	wield_image = "illumishroom3.png",
+	tiles = {"ethereal_illumishroom_cyan.png"},
+	inventory_image = "ethereal_illumishroom_cyan.png",
+	wield_image = "ethereal_illumishroom_cyan.png",
 	paramtype = "light",
 	light_source = 5,
 	sunlight_propagates = true,
@@ -307,6 +307,6 @@ minetest.register_node("ethereal:illumishroom3", {
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
-		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.47, 6 / 16},
-	},
+		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.47, 6 / 16}
+	}
 })
diff --git a/plantpack.lua b/plantpack.lua
index 51d7aaa..34d07cd 100644
--- a/plantpack.lua
+++ b/plantpack.lua
@@ -13,7 +13,7 @@ minetest.register_decoration({
 	decoration = {
 		"xanadu:cactus_echinocereus", "xanadu:cactus_matucana",
 		"xanadu:cactus_baseball", "xanadu:cactus_golden"
-	},
+	}
 })
 
 -- Desert Plants
@@ -26,7 +26,7 @@ minetest.register_decoration({
 	decoration = {
 		"xanadu:desert_kangaroo", "xanadu:desert_brittle",
 		"xanadu:desert_ocotillo", "xanadu:desert_whitesage"
-	},
+	}
 })
 
 --=  Prairie Biome
@@ -41,7 +41,7 @@ minetest.register_decoration({
 	decoration = {
 		"xanadu:grass_prairie", "xanadu:grass_cord",
 		"xanadu:grass_wheatgrass", "xanadu:desert_whitesage"
-	},
+	}
 })
 
 -- Flowers
@@ -57,7 +57,7 @@ minetest.register_decoration({
 	decoration = {
 		"xanadu:flower_jacobsladder", "xanadu:flower_thistle",
 		"xanadu:flower_wildcarrot"
-	},
+	}
 })
 
 minetest.register_decoration({
@@ -72,7 +72,7 @@ minetest.register_decoration({
 	decoration = {
 		"xanadu:flower_delphinium", "xanadu:flower_celosia",
 		"xanadu:flower_daisy", "xanadu:flower_bluerose"
-	},
+	}
 })
 
 -- Shrubs
@@ -89,7 +89,7 @@ minetest.register_decoration({
 		"prairie", "grassy", "grassytwo", "grove", "junglee",
 		"grayness", "jumble"
 	},
-	decoration = {"xanadu:shrub_kerria", "xanadu:shrub_spicebush"},
+	decoration = {"xanadu:shrub_kerria", "xanadu:shrub_spicebush"}
 })
 
 --= Jungle Biome
@@ -104,7 +104,7 @@ minetest.register_decoration({
 		"xanadu:rainforest_guzmania", "xanadu:rainforest_devil",
 		"xanadu:rainforest_lazarus", "xanadu:rainforest_lollipop",
 		"xanadu:mushroom_woolly"
-	},
+	}
 })
 
 --= Cold Biomes
@@ -122,8 +122,7 @@ minetest.register_decoration({
 		"xanadu:mountain_edelweiss", "xanadu:mountain_armeria",
 		"xanadu:mountain_bellflower", "xanadu:mountain_willowherb",
 		"xanadu:mountain_bistort"
-	},
-
+	}
 })
 
 --= Mushroom Biome
@@ -137,7 +136,7 @@ minetest.register_decoration({
 	decoration = {
 		"xanadu:mushroom_powderpuff", "xanadu:mushroom_chanterelle",
 		"xanadu:mushroom_parasol"
-	},
+	}
 })
 
 --= Lakeside
@@ -153,7 +152,7 @@ minetest.register_decoration({
 		"xanadu:wetlands_mannagrass", "xanadu:wetlands_turtle"
 	},
 	spawn_by = "default:water_source",
-	num_spawn_by = 1,
+	num_spawn_by = 1
 })
 
 --= Harsh Biomes
@@ -176,7 +175,7 @@ minetest.register_decoration({
 		"junglee", "grassy", "grassytwo", "jumble", "snowy", "alpine",
 		"fiery", "mesa", "bamboo"
 	},
-	decoration = {"xanadu:spooky_thornbush", "xanadu:spooky_baneberry"},
+	decoration = {"xanadu:spooky_thornbush", "xanadu:spooky_baneberry"}
 })
 
 --= Poppy's growing in Clearing Biome in memory of RealBadAngel
@@ -189,5 +188,5 @@ minetest.register_decoration({
 	sidelen = 16,
 	fill_ratio = 0.004,
 	biomes = {"clearing"},
-	decoration = {"xanadu:poppy"},
+	decoration = {"xanadu:poppy"}
 })
diff --git a/sapling.lua b/sapling.lua
index ae58cda..77c3c06 100644
--- a/sapling.lua
+++ b/sapling.lua
@@ -5,9 +5,9 @@ local S = ethereal.intllib
 minetest.register_node("ethereal:bamboo_sprout", {
 	description = S("Bamboo Sprout"),
 	drawtype = "plantlike",
-	tiles = {"bamboo_sprout.png"},
-	inventory_image = "bamboo_sprout.png",
-	wield_image = "bamboo_sprout.png",
+	tiles = {"ethereal_bamboo_sprout.png"},
+	inventory_image = "ethereal_bamboo_sprout.png",
+	wield_image = "ethereal_bamboo_sprout.png",
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
@@ -21,7 +21,7 @@ minetest.register_node("ethereal:bamboo_sprout", {
 		fixed = {-4 / 16, -0.5, -4 / 16, 4 / 16, 0, 4 / 16}
 	},
 	on_use = minetest.item_eat(2),
-	grown_height = 11,
+	grown_height = 11
 })
 
 -- Register Saplings
@@ -46,23 +46,23 @@ local register_sapling = function(name, desc, texture, height)
 			ethereal_sapling = 1, attached_node = 1, sapling = 1
 		},
 		sounds = default.node_sound_leaves_defaults(),
-		grown_height = height,
+		grown_height = height
 	})
 end
 
-register_sapling("ethereal:willow", "Willow", "willow_sapling", 14)
-register_sapling("ethereal:yellow_tree", "Healing", "yellow_tree_sapling", 19)
+register_sapling("ethereal:willow", "Willow", "ethereal_willow_sapling", 14)
+register_sapling("ethereal:yellow_tree", "Healing", "ethereal_yellow_tree_sapling", 19)
 register_sapling("ethereal:big_tree", "Big", "ethereal_big_tree_sapling", 7)
-register_sapling("ethereal:banana_tree", "Banana", "banana_tree_sapling", 8)
+register_sapling("ethereal:banana_tree", "Banana", "ethereal_banana_tree_sapling", 8)
 register_sapling("ethereal:frost_tree", "Frost", "ethereal_frost_tree_sapling", 19)
 register_sapling("ethereal:mushroom", "Mushroom", "ethereal_mushroom_sapling", 11)
 register_sapling("ethereal:palm", "Palm", "moretrees_palm_sapling", 9)
-register_sapling("ethereal:redwood", "Redwood", "redwood_sapling", 31)
-register_sapling("ethereal:orange_tree", "Orange", "orange_tree_sapling", 6)
+register_sapling("ethereal:redwood", "Redwood", "ethereal_redwood_sapling", 31)
+register_sapling("ethereal:orange_tree", "Orange", "ethereal_orange_tree_sapling", 6)
 register_sapling("ethereal:birch", "Birch", "moretrees_birch_sapling", 7)
 register_sapling("ethereal:sakura", "Sakura", "ethereal_sakura_sapling", 10)
-register_sapling("ethereal:lemon_tree", "Lemon", "lemon_tree_sapling", 7)
-register_sapling("ethereal:olive_tree", "Olive", "olive_tree_sapling", 10)
+register_sapling("ethereal:lemon_tree", "Lemon", "ethereal_lemon_tree_sapling", 7)
+register_sapling("ethereal:olive_tree", "Olive", "ethereal_olive_tree_sapling", 10)
 
 
 local add_tree = function (pos, ofx, ofy, ofz, schem, replace)
@@ -260,5 +260,5 @@ minetest.register_abm({
 		end
 
 		grow_sapling(pos, node)
-	end,
+	end
 })
diff --git a/sealife.lua b/sealife.lua
index c25a880..edc908f 100644
--- a/sealife.lua
+++ b/sealife.lua
@@ -5,9 +5,9 @@ local S = ethereal.intllib
 minetest.register_node("ethereal:seaweed", {
 	description = S("Seaweed"),
 	drawtype = "plantlike",
-	tiles = {"seaweed.png"},
-	inventory_image = "seaweed.png",
-	wield_image = "seaweed.png",
+	tiles = {"ethereal_seaweed.png"},
+	inventory_image = "ethereal_seaweed.png",
+	wield_image = "ethereal_seaweed.png",
 	paramtype = "light",
 	walkable = false,
 	climbable = true,
@@ -22,20 +22,20 @@ minetest.register_node("ethereal:seaweed", {
 	sounds = default.node_sound_leaves_defaults(),
 	after_dig_node = function(pos, node, metadata, digger)
 		default.dig_up(pos, node, digger)
-	end,
+	end
 })
 
 minetest.register_craft( {
 	type = "shapeless",
 	output = "dye:dark_green 3",
-	recipe = {"ethereal:seaweed",},
+	recipe = {"ethereal:seaweed"}
 })
 
 -- agar powder
 minetest.register_craftitem("ethereal:agar_powder", {
 	description = S("Agar Powder"),
 	inventory_image = "ethereal_agar_powder.png",
-	groups = {food_gelatin = 1, flammable = 2},
+	groups = {food_gelatin = 1, flammable = 2}
 })
 
 minetest.register_craft({
@@ -43,103 +43,103 @@ minetest.register_craft({
 	recipe = {
 		{"group:food_seaweed", "group:food_seaweed", "group:food_seaweed"},
 		{"bucket:bucket_water", "bucket:bucket_water", "default:torch"},
-		{"bucket:bucket_water", "bucket:bucket_water", "default:torch"},
+		{"bucket:bucket_water", "bucket:bucket_water", "default:torch"}
 	},
 	replacements = {
-		{"bucket:bucket_water", "bucket:bucket_empty 4"},
-	},
+		{"bucket:bucket_water", "bucket:bucket_empty 4"}
+	}
 })
 
 -- Blue Coral
 minetest.register_node("ethereal:coral2", {
 	description = S("Blue Glow Coral"),
 	drawtype = "plantlike",
-	tiles = {"coral2.png"},
-	inventory_image = "coral2.png",
-	wield_image = "coral2.png",
+	tiles = {"ethereal_coral_blue.png"},
+	inventory_image = "ethereal_coral_blue.png",
+	wield_image = "ethereal_coral_blue.png",
 	paramtype = "light",
 	selection_box = {
 		type = "fixed",
-		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 1 / 4, 6 / 16},
+		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 1 / 4, 6 / 16}
 	},
 	light_source = 3,
 	groups = {snappy = 3},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })
 
 minetest.register_craft( {
 	type = "shapeless",
 	output = "dye:cyan 3",
-	recipe = {"ethereal:coral2",},
+	recipe = {"ethereal:coral2"}
 })
 
 -- Orange Coral
 minetest.register_node("ethereal:coral3", {
 	description = S("Orange Glow Coral"),
 	drawtype = "plantlike",
-	tiles = {"coral3.png"},
-	inventory_image = "coral3.png",
-	wield_image = "coral3.png",
+	tiles = {"ethereal_coral_orange.png"},
+	inventory_image = "ethereal_coral_orange.png",
+	wield_image = "ethereal_coral_orange.png",
 	paramtype = "light",
 	selection_box = {
 		type = "fixed",
-		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 1 / 4, 6 / 16},
+		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 1 / 4, 6 / 16}
 	},
 	light_source = 3,
 	groups = {snappy = 3},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })
 
 minetest.register_craft( {
 	type = "shapeless",
 	output = "dye:orange 3",
-	recipe = {"ethereal:coral3",},
+	recipe = {"ethereal:coral3"}
 })
 
 -- Pink Coral
 minetest.register_node("ethereal:coral4", {
 	description = S("Pink Glow Coral"),
 	drawtype = "plantlike",
-	tiles = {"coral4.png"},
-	inventory_image = "coral4.png",
-	wield_image = "coral4.png",
+	tiles = {"ethereal_coral_pink.png"},
+	inventory_image = "ethereal_coral_pink.png",
+	wield_image = "ethereal_coral_pink.png",
 	paramtype = "light",
 	selection_box = {
 		type = "fixed",
-		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 8 / 16, 6 / 16},
+		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 8 / 16, 6 / 16}
 	},
 	light_source = 3,
 	groups = {snappy = 3},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })
 
 minetest.register_craft( {
 	type = "shapeless",
 	output = "dye:pink 3",
-	recipe = {"ethereal:coral4",},
+	recipe = {"ethereal:coral4"}
 })
 
 -- Green Coral
 minetest.register_node("ethereal:coral5", {
 	description = S("Green Glow Coral"),
 	drawtype = "plantlike",
-	tiles = {"coral5.png"},
-	inventory_image = "coral5.png",
-	wield_image = "coral5.png",
+	tiles = {"ethereal_coral_green.png"},
+	inventory_image = "ethereal_coral_green.png",
+	wield_image = "ethereal_coral_green.png",
 	paramtype = "light",
 	selection_box = {
 		type = "fixed",
-		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 3 / 16, 6 / 16},
+		fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 3 / 16, 6 / 16}
 	},
 	light_source = 3,
 	groups = {snappy = 3},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 })
 
 minetest.register_craft( {
 	type = "shapeless",
 	output = "dye:green 3",
-	recipe = {"ethereal:coral5",},
+	recipe = {"ethereal:coral5"}
 })
 
 -- Undersea Sand
@@ -151,7 +151,7 @@ minetest.register_node("ethereal:sandy", {
 		crumbly = 3, falling_node = 1, sand = 1, not_in_creative_inventory = 1
 	},
 	drop = "default:sand",
-	sounds = default.node_sound_sand_defaults(),
+	sounds = default.node_sound_sand_defaults()
 })
 
 -- randomly generate coral or seaweed and have seaweed grow up to 14 high
@@ -220,7 +220,7 @@ minetest.register_node("ethereal:sponge_air", {
 	sunlight_propagates = true,
 	pointable = false,
 	drop = "",
-	groups = {not_in_creative_inventory = 1},
+	groups = {not_in_creative_inventory = 1}
 })
 
 
@@ -267,7 +267,7 @@ minetest.register_node("ethereal:sponge_wet", {
 	description = S("Wet sponge"),
 	tiles = {"ethereal_sponge_wet.png"},
 	groups = {crumbly = 3},
-	sounds = default.node_sound_sand_defaults(),
+	sounds = default.node_sound_sand_defaults()
 })
 
 -- cook wet sponge into dry sponge
@@ -275,7 +275,7 @@ minetest.register_craft({
 	type = "cooking",
 	recipe = "ethereal:sponge_wet",
 	output = "ethereal:sponge",
-	cooktime = 3,
+	cooktime = 3
 })
 
 -- use leaf decay to remove sponge air nodes
@@ -289,5 +289,5 @@ default.register_leafdecay({
 minetest.register_craft({
 	type = "fuel",
 	recipe = "ethereal:sponge",
-	burntime = 5,
+	burntime = 5
 })
diff --git a/stairs.lua b/stairs.lua
index d6be3cb..e5551e9 100644
--- a/stairs.lua
+++ b/stairs.lua
@@ -53,7 +53,7 @@ do_stair(
 	"crystal_block",
 	"ethereal:crystal_block",
 	{cracky = 1, level = 2, puts_out_fire = 1, cools_lava = 1},
-	{"crystal_block.png"},
+	{"ethereal_crystal_block.png"},
 	default.node_sound_glass_defaults())
 
 do_stair(
@@ -61,7 +61,7 @@ do_stair(
 	"icebrick",
 	"ethereal:icebrick",
 	{cracky = 3, puts_out_fire = 1, cools_lava = 1},
-	{"brick_ice.png"},
+	{"ethereal_brick_ice.png"},
 	default.node_sound_glass_defaults())
 
 do_stair(
@@ -69,7 +69,7 @@ do_stair(
 	"snowbrick",
 	"ethereal:snowbrick",
 	{crumbly = 3, puts_out_fire = 1, cools_lava = 1},
-	{"brick_snow.png"},
+	{"ethereal_brick_snow.png"},
 	default.node_sound_dirt_defaults({
 		footstep = {name = "default_snow_footstep", gain = 0.25},
 		dug = {name = "default_snow_footstep", gain = 0.75},
@@ -88,7 +88,7 @@ do_stair(
 	"mushroom_trunk",
 	"ethereal:mushroom_trunk",
 	{choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
-	{"mushroom_trunk.png"},
+	{"ethereal_mushroom_trunk.png"},
 	default.node_sound_wood_defaults())
 
 do_stair(
@@ -96,7 +96,7 @@ do_stair(
 	"mushroom",
 	"ethereal:mushroom",
 	{choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
-	{"mushroom_block.png"},
+	{"ethereal_mushroom_block.png"},
 	default.node_sound_wood_defaults())
 
 do_stair(
@@ -104,7 +104,7 @@ do_stair(
 	"frost_wood",
 	"ethereal:frost_wood",
 	{choppy = 2, oddly_breakable_by_hand = 1, put_out_fire = 1},
-	{"frost_wood.png"},
+	{"ethereal_frost_wood.png"},
 	default.node_sound_wood_defaults())
 
 do_stair(
@@ -112,7 +112,7 @@ do_stair(
 	"yellow_wood",
 	"ethereal:yellow_wood",
 	{choppy = 2, oddly_breakable_by_hand = 1, put_out_fire = 1},
-	{"yellow_wood.png"},
+	{"ethereal_yellow_wood.png"},
 	default.node_sound_wood_defaults())
 
 do_stair(
@@ -136,7 +136,7 @@ do_stair(
 	"banana_wood",
 	"ethereal:banana_wood",
 	{choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
-	{"banana_wood.png"},
+	{"ethereal_banana_wood.png"},
 	default.node_sound_wood_defaults())
 
 do_stair(
@@ -144,7 +144,7 @@ do_stair(
 	"willow_wood",
 	"ethereal:willow_wood",
 	{choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
-	{"willow_wood.png"},
+	{"ethereal_willow_wood.png"},
 	default.node_sound_wood_defaults())
 
 do_stair(
@@ -152,7 +152,7 @@ do_stair(
 	"redwood_wood",
 	"ethereal:redwood_wood",
 	{choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
-	{"redwood_wood.png"},
+	{"ethereal_redwood_wood.png"},
 	default.node_sound_wood_defaults())
 
 do_stair(
@@ -160,7 +160,7 @@ do_stair(
 	"bamboo_wood",
 	"ethereal:bamboo_block",
 	{snappy = 3, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
-	{"bamboo_floor.png"},
+	{"ethereal_bamboo_floor.png"},
 	default.node_sound_wood_defaults())
 
 do_stair(
@@ -176,5 +176,5 @@ do_stair(
 	"olive_wood",
 	"ethereal:olive_wood",
 	{choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
-	{"olive_wood.png"},
+	{"ethereal_olive_wood.png"},
 	default.node_sound_wood_defaults())
diff --git a/strawberry.lua b/strawberry.lua
index 3fe3fa7..753fed4 100644
--- a/strawberry.lua
+++ b/strawberry.lua
@@ -4,19 +4,19 @@ local S = ethereal.intllib
 -- Strawberry (can also be planted as seed)
 minetest.register_craftitem("ethereal:strawberry", {
 	description = S("Strawberry"),
-	inventory_image = "strawberry.png",
-	wield_image = "strawberry.png",
+	inventory_image = "ethereal_strawberry.png",
+	wield_image = "ethereal_strawberry.png",
 	groups = {food_strawberry = 1, food_berry = 1, flammable = 2},
 	on_place = function(itemstack, placer, pointed_thing)
 		return farming.place_seed(itemstack, placer, pointed_thing, "ethereal:strawberry_1")
 	end,
-	on_use = minetest.item_eat(1),
+	on_use = minetest.item_eat(1)
 })
 
 -- Define Strawberry Bush growth stages
 local crop_def = {
 	drawtype = "plantlike",
-	tiles = {"strawberry_1.png"},
+	tiles = {"ethereal_strawberry_1.png"},
 	paramtype = "light",
 	sunlight_propagates = true,
 	waving = 1,
@@ -31,55 +31,55 @@ local crop_def = {
 		snappy = 3, flammable = 2, plant = 1, attached_node = 1,
 		not_in_creative_inventory = 1, growing = 1
 	},
-	sounds = default.node_sound_leaves_defaults(),
+	sounds = default.node_sound_leaves_defaults()
 }
 
 --stage 1
 minetest.register_node("ethereal:strawberry_1", table.copy(crop_def))
 
 -- stage 2
-crop_def.tiles = {"strawberry_2.png"}
+crop_def.tiles = {"ethereal_strawberry_2.png"}
 minetest.register_node("ethereal:strawberry_2", table.copy(crop_def))
 
 -- stage 3
-crop_def.tiles = {"strawberry_3.png"}
+crop_def.tiles = {"ethereal_strawberry_3.png"}
 minetest.register_node("ethereal:strawberry_3", table.copy(crop_def))
 
 -- stage 4
-crop_def.tiles = {"strawberry_4.png"}
+crop_def.tiles = {"ethereal_strawberry_4.png"}
 minetest.register_node("ethereal:strawberry_4", table.copy(crop_def))
 
 -- stage 5
-crop_def.tiles = {"strawberry_5.png"}
+crop_def.tiles = {"ethereal_strawberry_5.png"}
 minetest.register_node("ethereal:strawberry_5", table.copy(crop_def))
 
 -- stage 6
-crop_def.tiles = {"strawberry_6.png"}
+crop_def.tiles = {"ethereal_strawberry_6.png"}
 crop_def.drop = {
 	items = {
 		{items = {"ethereal:strawberry 1"},rarity = 2},
-		{items = {"ethereal:strawberry 2"},rarity = 3},
+		{items = {"ethereal:strawberry 2"},rarity = 3}
 	}
 }
 minetest.register_node("ethereal:strawberry_6", table.copy(crop_def))
 
 -- stage 7
-crop_def.tiles = {"strawberry_7.png"}
+crop_def.tiles = {"ethereal_strawberry_7.png"}
 crop_def.drop = {
 	items = {
 		{items = {"ethereal:strawberry 1"},rarity = 1},
-		{items = {"ethereal:strawberry 2"},rarity = 3},
+		{items = {"ethereal:strawberry 2"},rarity = 3}
 	}
 }
 minetest.register_node("ethereal:strawberry_7", table.copy(crop_def))
 
 -- stage 8
-crop_def.tiles = {"strawberry_8.png"}
-crop_def.groups.growing = 0
+crop_def.tiles = {"ethereal_strawberry_8.png"}
+crop_def.groups.growing = nil
 crop_def.drop = {
 	items = {
 		{items = {"ethereal:strawberry 2"},rarity = 1},
-		{items = {"ethereal:strawberry 3"},rarity = 3},
+		{items = {"ethereal:strawberry 3"},rarity = 3}
 	}
 }
 minetest.register_node("ethereal:strawberry_8", table.copy(crop_def))
@@ -106,7 +106,7 @@ minetest.register_abm({
 			return
 		end
 		pos.y = pos.y + 1
-		
+
 		-- do we have enough light?
 		local light = minetest.get_node_light(pos)
 
@@ -114,7 +114,7 @@ minetest.register_abm({
 		or light < 13 then
 			return
 		end
-		
+
 		-- grow to next stage
 		local num = node.name:split("_")[2]
 
diff --git a/textures/banana_leaf_old.png b/textures/banana_leaf_old.png
deleted file mode 100644
index 0d744ec..0000000
Binary files a/textures/banana_leaf_old.png and /dev/null differ
diff --git a/textures/blank.png b/textures/blank.png
deleted file mode 100644
index b25455e..0000000
Binary files a/textures/blank.png and /dev/null differ
diff --git a/textures/brick_ice.png_old b/textures/brick_ice.png_old
deleted file mode 100644
index d893299..0000000
Binary files a/textures/brick_ice.png_old and /dev/null differ
diff --git a/textures/bamboo_floor.png b/textures/ethereal_bamboo_floor.png
similarity index 100%
rename from textures/bamboo_floor.png
rename to textures/ethereal_bamboo_floor.png
diff --git a/textures/bamboo_leaves.png b/textures/ethereal_bamboo_leaves.png
similarity index 100%
rename from textures/bamboo_leaves.png
rename to textures/ethereal_bamboo_leaves.png
diff --git a/textures/bamboo_sprout.png b/textures/ethereal_bamboo_sprout.png
similarity index 100%
rename from textures/bamboo_sprout.png
rename to textures/ethereal_bamboo_sprout.png
diff --git a/textures/bamboo_trunk.png b/textures/ethereal_bamboo_trunk.png
similarity index 100%
rename from textures/bamboo_trunk.png
rename to textures/ethereal_bamboo_trunk.png
diff --git a/textures/banana_bread.png b/textures/ethereal_banana_bread.png
similarity index 100%
rename from textures/banana_bread.png
rename to textures/ethereal_banana_bread.png
diff --git a/textures/banana_bunch.png b/textures/ethereal_banana_bunch.png
similarity index 100%
rename from textures/banana_bunch.png
rename to textures/ethereal_banana_bunch.png
diff --git a/textures/banana_dough.png b/textures/ethereal_banana_dough.png
similarity index 100%
rename from textures/banana_dough.png
rename to textures/ethereal_banana_dough.png
diff --git a/textures/banana_leaf.png b/textures/ethereal_banana_leaf.png
similarity index 100%
rename from textures/banana_leaf.png
rename to textures/ethereal_banana_leaf.png
diff --git a/textures/banana_single.png b/textures/ethereal_banana_single.png
similarity index 100%
rename from textures/banana_single.png
rename to textures/ethereal_banana_single.png
diff --git a/textures/banana_tree_sapling.png b/textures/ethereal_banana_tree_sapling.png
similarity index 100%
rename from textures/banana_tree_sapling.png
rename to textures/ethereal_banana_tree_sapling.png
diff --git a/textures/banana_trunk.png b/textures/ethereal_banana_trunk.png
similarity index 100%
rename from textures/banana_trunk.png
rename to textures/ethereal_banana_trunk.png
diff --git a/textures/banana_trunk_top.png b/textures/ethereal_banana_trunk_top.png
similarity index 100%
rename from textures/banana_trunk_top.png
rename to textures/ethereal_banana_trunk_top.png
diff --git a/textures/banana_wood.png b/textures/ethereal_banana_wood.png
similarity index 100%
rename from textures/banana_wood.png
rename to textures/ethereal_banana_wood.png
diff --git a/textures/bowl.png b/textures/ethereal_bowl.png
similarity index 100%
rename from textures/bowl.png
rename to textures/ethereal_bowl.png
diff --git a/textures/brick_ice.png b/textures/ethereal_brick_ice.png
similarity index 100%
rename from textures/brick_ice.png
rename to textures/ethereal_brick_ice.png
diff --git a/textures/brick_snow.png b/textures/ethereal_brick_snow.png
similarity index 100%
rename from textures/brick_snow.png
rename to textures/ethereal_brick_snow.png
diff --git a/textures/candle.png b/textures/ethereal_candle.png
similarity index 100%
rename from textures/candle.png
rename to textures/ethereal_candle.png
diff --git a/textures/candle_static.png b/textures/ethereal_candle_static.png
similarity index 100%
rename from textures/candle_static.png
rename to textures/ethereal_candle_static.png
diff --git a/textures/charcoal_lump.png b/textures/ethereal_charcoal_lump.png
similarity index 100%
rename from textures/charcoal_lump.png
rename to textures/ethereal_charcoal_lump.png
diff --git a/textures/coral2.png b/textures/ethereal_coral_blue.png
similarity index 100%
rename from textures/coral2.png
rename to textures/ethereal_coral_blue.png
diff --git a/textures/coral5.png b/textures/ethereal_coral_green.png
similarity index 100%
rename from textures/coral5.png
rename to textures/ethereal_coral_green.png
diff --git a/textures/coral3.png b/textures/ethereal_coral_orange.png
similarity index 100%
rename from textures/coral3.png
rename to textures/ethereal_coral_orange.png
diff --git a/textures/coral4.png b/textures/ethereal_coral_pink.png
similarity index 100%
rename from textures/coral4.png
rename to textures/ethereal_coral_pink.png
diff --git a/textures/crystal_axe.png b/textures/ethereal_crystal_axe.png
similarity index 100%
rename from textures/crystal_axe.png
rename to textures/ethereal_crystal_axe.png
diff --git a/textures/crystal_block.png b/textures/ethereal_crystal_block.png
similarity index 100%
rename from textures/crystal_block.png
rename to textures/ethereal_crystal_block.png
diff --git a/textures/crystal_gilly_staff.png b/textures/ethereal_crystal_gilly_staff.png
similarity index 100%
rename from textures/crystal_gilly_staff.png
rename to textures/ethereal_crystal_gilly_staff.png
diff --git a/textures/crystal_ingot.png b/textures/ethereal_crystal_ingot.png
similarity index 100%
rename from textures/crystal_ingot.png
rename to textures/ethereal_crystal_ingot.png
diff --git a/textures/crystal_pick.png b/textures/ethereal_crystal_pick.png
similarity index 100%
rename from textures/crystal_pick.png
rename to textures/ethereal_crystal_pick.png
diff --git a/textures/crystal_shovel.png b/textures/ethereal_crystal_shovel.png
similarity index 100%
rename from textures/crystal_shovel.png
rename to textures/ethereal_crystal_shovel.png
diff --git a/textures/crystal_spike.png b/textures/ethereal_crystal_spike.png
similarity index 100%
rename from textures/crystal_spike.png
rename to textures/ethereal_crystal_spike.png
diff --git a/textures/crystal_sword.png b/textures/ethereal_crystal_sword.png
similarity index 100%
rename from textures/crystal_sword.png
rename to textures/ethereal_crystal_sword.png
diff --git a/textures/fern.png b/textures/ethereal_fern.png
similarity index 100%
rename from textures/fern.png
rename to textures/ethereal_fern.png
diff --git a/textures/fern_tubers.png b/textures/ethereal_fern_tubers.png
similarity index 100%
rename from textures/fern_tubers.png
rename to textures/ethereal_fern_tubers.png
diff --git a/textures/fire_dust.png b/textures/ethereal_fire_dust.png
similarity index 100%
rename from textures/fire_dust.png
rename to textures/ethereal_fire_dust.png
diff --git a/textures/frost_wood.png b/textures/ethereal_frost_wood.png
similarity index 100%
rename from textures/frost_wood.png
rename to textures/ethereal_frost_wood.png
diff --git a/textures/glostone.png b/textures/ethereal_glostone.png
similarity index 100%
rename from textures/glostone.png
rename to textures/ethereal_glostone.png
diff --git a/textures/hearty_stew.png b/textures/ethereal_hearty_stew.png
similarity index 100%
rename from textures/hearty_stew.png
rename to textures/ethereal_hearty_stew.png
diff --git a/textures/illumishroom3.png b/textures/ethereal_illumishroom_cyan.png
similarity index 100%
rename from textures/illumishroom3.png
rename to textures/ethereal_illumishroom_cyan.png
diff --git a/textures/illumishroom2.png b/textures/ethereal_illumishroom_green.png
similarity index 100%
rename from textures/illumishroom2.png
rename to textures/ethereal_illumishroom_green.png
diff --git a/textures/illumishroom.png b/textures/ethereal_illumishroom_red.png
similarity index 100%
rename from textures/illumishroom.png
rename to textures/ethereal_illumishroom_red.png
diff --git a/textures/lemon.png b/textures/ethereal_lemon.png
similarity index 100%
rename from textures/lemon.png
rename to textures/ethereal_lemon.png
diff --git a/textures/lemon_fruit.png b/textures/ethereal_lemon_fruit.png
similarity index 100%
rename from textures/lemon_fruit.png
rename to textures/ethereal_lemon_fruit.png
diff --git a/textures/lemon_leaves.png b/textures/ethereal_lemon_leaves.png
similarity index 100%
rename from textures/lemon_leaves.png
rename to textures/ethereal_lemon_leaves.png
diff --git a/textures/lemon_tree_sapling.png b/textures/ethereal_lemon_tree_sapling.png
similarity index 100%
rename from textures/lemon_tree_sapling.png
rename to textures/ethereal_lemon_tree_sapling.png
diff --git a/textures/light_staff.png b/textures/ethereal_light_staff.png
similarity index 100%
rename from textures/light_staff.png
rename to textures/ethereal_light_staff.png
diff --git a/textures/lightstring.png b/textures/ethereal_lightstring.png
similarity index 100%
rename from textures/lightstring.png
rename to textures/ethereal_lightstring.png
diff --git a/textures/mushroom_block.png b/textures/ethereal_mushroom_block.png
similarity index 100%
rename from textures/mushroom_block.png
rename to textures/ethereal_mushroom_block.png
diff --git a/textures/mushroom_pore.png b/textures/ethereal_mushroom_pore.png
similarity index 100%
rename from textures/mushroom_pore.png
rename to textures/ethereal_mushroom_pore.png
diff --git a/textures/mushroom_soup.png b/textures/ethereal_mushroom_soup.png
similarity index 100%
rename from textures/mushroom_soup.png
rename to textures/ethereal_mushroom_soup.png
diff --git a/textures/mushroom_trunk.png b/textures/ethereal_mushroom_trunk.png
similarity index 100%
rename from textures/mushroom_trunk.png
rename to textures/ethereal_mushroom_trunk.png
diff --git a/textures/mushroom_trunk_top.png b/textures/ethereal_mushroom_trunk_top.png
similarity index 100%
rename from textures/mushroom_trunk_top.png
rename to textures/ethereal_mushroom_trunk_top.png
diff --git a/textures/olive.png b/textures/ethereal_olive.png
similarity index 100%
rename from textures/olive.png
rename to textures/ethereal_olive.png
diff --git a/textures/olive_fruit.png b/textures/ethereal_olive_fruit.png
similarity index 100%
rename from textures/olive_fruit.png
rename to textures/ethereal_olive_fruit.png
diff --git a/textures/olive_leaves.png b/textures/ethereal_olive_leaves.png
similarity index 100%
rename from textures/olive_leaves.png
rename to textures/ethereal_olive_leaves.png
diff --git a/textures/olive_tree_sapling.png b/textures/ethereal_olive_tree_sapling.png
similarity index 100%
rename from textures/olive_tree_sapling.png
rename to textures/ethereal_olive_tree_sapling.png
diff --git a/textures/olive_trunk.png b/textures/ethereal_olive_trunk.png
similarity index 100%
rename from textures/olive_trunk.png
rename to textures/ethereal_olive_trunk.png
diff --git a/textures/olive_trunk_top.png b/textures/ethereal_olive_trunk_top.png
similarity index 100%
rename from textures/olive_trunk_top.png
rename to textures/ethereal_olive_trunk_top.png
diff --git a/textures/olive_wood.png b/textures/ethereal_olive_wood.png
similarity index 100%
rename from textures/olive_wood.png
rename to textures/ethereal_olive_wood.png
diff --git a/textures/orange_leaves.png b/textures/ethereal_orange_leaves.png
similarity index 100%
rename from textures/orange_leaves.png
rename to textures/ethereal_orange_leaves.png
diff --git a/textures/orange_tree_sapling.png b/textures/ethereal_orange_tree_sapling.png
similarity index 100%
rename from textures/orange_tree_sapling.png
rename to textures/ethereal_orange_tree_sapling.png
diff --git a/textures/palm_wax.png b/textures/ethereal_palm_wax.png
similarity index 100%
rename from textures/palm_wax.png
rename to textures/ethereal_palm_wax.png
diff --git a/textures/paper_wall.png b/textures/ethereal_paper_wall.png
similarity index 100%
rename from textures/paper_wall.png
rename to textures/ethereal_paper_wall.png
diff --git a/textures/pine_nuts.png b/textures/ethereal_pine_nuts.png
similarity index 100%
rename from textures/pine_nuts.png
rename to textures/ethereal_pine_nuts.png
diff --git a/textures/redwood_leaves.png b/textures/ethereal_redwood_leaves.png
similarity index 100%
rename from textures/redwood_leaves.png
rename to textures/ethereal_redwood_leaves.png
diff --git a/textures/redwood_sapling.png b/textures/ethereal_redwood_sapling.png
similarity index 100%
rename from textures/redwood_sapling.png
rename to textures/ethereal_redwood_sapling.png
diff --git a/textures/redwood_trunk.png b/textures/ethereal_redwood_trunk.png
similarity index 100%
rename from textures/redwood_trunk.png
rename to textures/ethereal_redwood_trunk.png
diff --git a/textures/redwood_trunk_top.png b/textures/ethereal_redwood_trunk_top.png
similarity index 100%
rename from textures/redwood_trunk_top.png
rename to textures/ethereal_redwood_trunk_top.png
diff --git a/textures/redwood_wood.png b/textures/ethereal_redwood_wood.png
similarity index 100%
rename from textures/redwood_wood.png
rename to textures/ethereal_redwood_wood.png
diff --git a/textures/sashimi.png b/textures/ethereal_sashimi.png
similarity index 100%
rename from textures/sashimi.png
rename to textures/ethereal_sashimi.png
diff --git a/textures/scorched_tree.png b/textures/ethereal_scorched_tree.png
similarity index 100%
rename from textures/scorched_tree.png
rename to textures/ethereal_scorched_tree.png
diff --git a/textures/scorched_tree_top.png b/textures/ethereal_scorched_tree_top.png
similarity index 100%
rename from textures/scorched_tree_top.png
rename to textures/ethereal_scorched_tree_top.png
diff --git a/textures/seaweed.png b/textures/ethereal_seaweed.png
similarity index 100%
rename from textures/seaweed.png
rename to textures/ethereal_seaweed.png
diff --git a/textures/stone_ladder.png b/textures/ethereal_stone_ladder.png
similarity index 100%
rename from textures/stone_ladder.png
rename to textures/ethereal_stone_ladder.png
diff --git a/textures/strawberry.png b/textures/ethereal_strawberry.png
similarity index 100%
rename from textures/strawberry.png
rename to textures/ethereal_strawberry.png
diff --git a/textures/strawberry_1.png b/textures/ethereal_strawberry_1.png
similarity index 100%
rename from textures/strawberry_1.png
rename to textures/ethereal_strawberry_1.png
diff --git a/textures/strawberry_2.png b/textures/ethereal_strawberry_2.png
similarity index 100%
rename from textures/strawberry_2.png
rename to textures/ethereal_strawberry_2.png
diff --git a/textures/strawberry_3.png b/textures/ethereal_strawberry_3.png
similarity index 100%
rename from textures/strawberry_3.png
rename to textures/ethereal_strawberry_3.png
diff --git a/textures/strawberry_4.png b/textures/ethereal_strawberry_4.png
similarity index 100%
rename from textures/strawberry_4.png
rename to textures/ethereal_strawberry_4.png
diff --git a/textures/strawberry_5.png b/textures/ethereal_strawberry_5.png
similarity index 100%
rename from textures/strawberry_5.png
rename to textures/ethereal_strawberry_5.png
diff --git a/textures/strawberry_6.png b/textures/ethereal_strawberry_6.png
similarity index 100%
rename from textures/strawberry_6.png
rename to textures/ethereal_strawberry_6.png
diff --git a/textures/strawberry_7.png b/textures/ethereal_strawberry_7.png
similarity index 100%
rename from textures/strawberry_7.png
rename to textures/ethereal_strawberry_7.png
diff --git a/textures/strawberry_8.png b/textures/ethereal_strawberry_8.png
similarity index 100%
rename from textures/strawberry_8.png
rename to textures/ethereal_strawberry_8.png
diff --git a/textures/vine.png b/textures/ethereal_vine.png
similarity index 100%
rename from textures/vine.png
rename to textures/ethereal_vine.png
diff --git a/textures/wild_onion.png b/textures/ethereal_wild_onion.png
similarity index 100%
rename from textures/wild_onion.png
rename to textures/ethereal_wild_onion.png
diff --git a/textures/willow_sapling.png b/textures/ethereal_willow_sapling.png
similarity index 100%
rename from textures/willow_sapling.png
rename to textures/ethereal_willow_sapling.png
diff --git a/textures/willow_trunk.png b/textures/ethereal_willow_trunk.png
similarity index 100%
rename from textures/willow_trunk.png
rename to textures/ethereal_willow_trunk.png
diff --git a/textures/willow_trunk_top.png b/textures/ethereal_willow_trunk_top.png
similarity index 100%
rename from textures/willow_trunk_top.png
rename to textures/ethereal_willow_trunk_top.png
diff --git a/textures/willow_twig.png b/textures/ethereal_willow_twig.png
similarity index 100%
rename from textures/willow_twig.png
rename to textures/ethereal_willow_twig.png
diff --git a/textures/willow_wood.png b/textures/ethereal_willow_wood.png
similarity index 100%
rename from textures/willow_wood.png
rename to textures/ethereal_willow_wood.png
diff --git a/textures/worm.png b/textures/ethereal_worm.png
similarity index 100%
rename from textures/worm.png
rename to textures/ethereal_worm.png
diff --git a/textures/yellow_leaves.png b/textures/ethereal_yellow_leaves.png
similarity index 100%
rename from textures/yellow_leaves.png
rename to textures/ethereal_yellow_leaves.png
diff --git a/textures/yellow_tree.png b/textures/ethereal_yellow_tree.png
similarity index 100%
rename from textures/yellow_tree.png
rename to textures/ethereal_yellow_tree.png
diff --git a/textures/yellow_tree_sapling.png b/textures/ethereal_yellow_tree_sapling.png
similarity index 100%
rename from textures/yellow_tree_sapling.png
rename to textures/ethereal_yellow_tree_sapling.png
diff --git a/textures/yellow_tree_top.png b/textures/ethereal_yellow_tree_top.png
similarity index 100%
rename from textures/yellow_tree_top.png
rename to textures/ethereal_yellow_tree_top.png
diff --git a/textures/yellow_wood.png b/textures/ethereal_yellow_wood.png
similarity index 100%
rename from textures/yellow_wood.png
rename to textures/ethereal_yellow_wood.png
diff --git a/textures/pine_leaves.png b/textures/pine_leaves.png
deleted file mode 100644
index a15ebf9..0000000
Binary files a/textures/pine_leaves.png and /dev/null differ
diff --git a/textures/purple_leaves.png b/textures/purple_leaves.png
deleted file mode 100644
index 06160b1..0000000
Binary files a/textures/purple_leaves.png and /dev/null differ
diff --git a/water.lua b/water.lua
index ed37626..61aa757 100644
--- a/water.lua
+++ b/water.lua
@@ -4,26 +4,26 @@ local S = ethereal.intllib
 -- Ice Brick
 minetest.register_node("ethereal:icebrick", {
 	description = S("Ice Brick"),
-	tiles = {"brick_ice.png"},
+	tiles = {"ethereal_brick_ice.png"},
 	paramtype = "light",
 	freezemelt = "default:water_source",
 	is_ground_content = false,
 	groups = {cracky = 3, puts_out_fire = 1, cools_lava = 1},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_craft({
 	output = "ethereal:icebrick 4",
 	recipe = {
 		{"default:ice", "default:ice"},
-		{"default:ice", "default:ice"},
+		{"default:ice", "default:ice"}
 	}
 })
 
 -- Snow Brick
 minetest.register_node("ethereal:snowbrick", {
 	description = S("Snow Brick"),
-	tiles = {"brick_snow.png"},
+	tiles = {"ethereal_brick_snow.png"},
 	paramtype = "light",
 	freezemelt = "default:water_source",
 	is_ground_content = false,
@@ -31,15 +31,15 @@ minetest.register_node("ethereal:snowbrick", {
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name = "default_snow_footstep", gain = 0.15},
 		dug = {name = "default_snow_footstep", gain = 0.2},
-		dig = {name = "default_snow_footstep", gain = 0.2},
-	}),
+		dig = {name = "default_snow_footstep", gain = 0.2}
+	})
 })
 
 minetest.register_craft({
 	output = "ethereal:snowbrick 4",
 	recipe = {
 		{"default:snowblock", "default:snowblock"},
-		{"default:snowblock", "default:snowblock"},
+		{"default:snowblock", "default:snowblock"}
 	}
 })
 
diff --git a/wood.lua b/wood.lua
index 4698a71..d41c256 100644
--- a/wood.lua
+++ b/wood.lua
@@ -33,20 +33,20 @@ minetest.register_craft({
 minetest.register_node("ethereal:willow_trunk", {
 	description = S("Willow Trunk"),
 	tiles = {
-		"willow_trunk_top.png",
-		"willow_trunk_top.png",
-		"willow_trunk.png"
+		"ethereal_willow_trunk_top.png",
+		"ethereal_willow_trunk_top.png",
+		"ethereal_willow_trunk.png"
 	},
 	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
 })
 
 -- willow wood
 minetest.register_node("ethereal:willow_wood", {
 	description = S("Willow Wood"),
-	tiles = {"willow_wood.png"},
+	tiles = {"ethereal_willow_wood.png"},
 	is_ground_content = false,
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
 	sounds = default.node_sound_wood_defaults(),
@@ -61,28 +61,28 @@ minetest.register_craft({
 minetest.register_node("ethereal:redwood_trunk", {
 	description = S("Redwood Trunk"),
 	tiles = {
-		"redwood_trunk_top.png",
-		"redwood_trunk_top.png",
-		"redwood_trunk.png"
+		"ethereal_redwood_trunk_top.png",
+		"ethereal_redwood_trunk_top.png",
+		"ethereal_redwood_trunk.png"
 	},
 	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
 })
 
 -- redwood wood
 minetest.register_node("ethereal:redwood_wood", {
 	description = S("Redwood Wood"),
-	tiles = {"redwood_wood.png"},
+	tiles = {"ethereal_redwood_wood.png"},
 	is_ground_content = false,
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
 })
 
 minetest.register_craft({
 	output = "ethereal:redwood_wood 4",
-	recipe = {{"ethereal:redwood_trunk"}},
+	recipe = {{"ethereal:redwood_trunk"}}
 })
 
 -- frost trunk
@@ -96,16 +96,16 @@ minetest.register_node("ethereal:frost_tree", {
 	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, put_out_fire = 1},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
 })
 
 -- frost wood
 minetest.register_node("ethereal:frost_wood", {
 	description = S("Frost Wood"),
-	tiles = {"frost_wood.png"},
+	tiles = {"ethereal_frost_wood.png"},
 	is_ground_content = false,
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, put_out_fire = 1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
 })
 
 minetest.register_craft({
@@ -117,23 +117,23 @@ minetest.register_craft({
 minetest.register_node("ethereal:yellow_trunk", {
 	description = S("Healing Tree Trunk"),
 	tiles = {
-		"yellow_tree_top.png",
-		"yellow_tree_top.png",
-		"yellow_tree.png"
+		"ethereal_yellow_tree_top.png",
+		"ethereal_yellow_tree_top.png",
+		"ethereal_yellow_tree.png"
 	},
 	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, put_out_fire = 1},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
 })
 
 -- healing wood
 minetest.register_node("ethereal:yellow_wood", {
 	description = S("Healing Tree Wood"),
-	tiles = {"yellow_wood.png"},
+	tiles = {"ethereal_yellow_wood.png"},
 	is_ground_content = false,
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, put_out_fire = 1},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
 })
 
 minetest.register_craft({
@@ -152,7 +152,7 @@ minetest.register_node("ethereal:palm_trunk", {
 	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
 })
 
 -- palm wood
@@ -161,7 +161,7 @@ minetest.register_node("ethereal:palm_wood", {
 	tiles = {"moretrees_palm_wood.png"},
 	is_ground_content = false,
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
 })
 
 minetest.register_craft({
@@ -173,23 +173,23 @@ minetest.register_craft({
 minetest.register_node("ethereal:banana_trunk", {
 	description = S("Banana Trunk"),
 	tiles = {
-		"banana_trunk_top.png",
-		"banana_trunk_top.png",
-		"banana_trunk.png"
+		"ethereal_banana_trunk_top.png",
+		"ethereal_banana_trunk_top.png",
+		"ethereal_banana_trunk.png"
 	},
 	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
 })
 
 -- banana wood
 minetest.register_node("ethereal:banana_wood", {
 	description = S("Banana Wood"),
-	tiles = {"banana_wood.png"},
+	tiles = {"ethereal_banana_wood.png"},
 	is_ground_content = false,
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
 })
 
 minetest.register_craft({
@@ -201,14 +201,14 @@ minetest.register_craft({
 minetest.register_node("ethereal:scorched_tree", {
 	description = S("Scorched Tree"),
 	tiles = {
-		"scorched_tree_top.png",
-		"scorched_tree_top.png",
-		"scorched_tree.png"
+		"ethereal_scorched_tree_top.png",
+		"ethereal_scorched_tree_top.png",
+		"ethereal_scorched_tree.png"
 	},
 	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 1},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
 })
 
 minetest.register_craft({
@@ -216,7 +216,7 @@ minetest.register_craft({
 	recipe = {
 		{"group:tree", "group:tree", "group:tree"},
 		{"group:tree", "default:torch", "group:tree"},
-		{"group:tree", "group:tree", "group:tree"},
+		{"group:tree", "group:tree", "group:tree"}
 	}
 })
 
@@ -224,14 +224,14 @@ minetest.register_craft({
 minetest.register_node("ethereal:mushroom_trunk", {
 	description = S("Mushroom"),
 	tiles = {
-		"mushroom_trunk_top.png",
-		"mushroom_trunk_top.png",
-		"mushroom_trunk.png"
+		"ethereal_mushroom_trunk_top.png",
+		"ethereal_mushroom_trunk_top.png",
+		"ethereal_mushroom_trunk.png"
 	},
 	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
 })
 
 -- birch trunk (thanks to VanessaE for birch textures)
@@ -245,7 +245,7 @@ minetest.register_node("ethereal:birch_trunk", {
 	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
 })
 
 -- birch wood
@@ -254,7 +254,7 @@ minetest.register_node("ethereal:birch_wood", {
 	tiles = {"moretrees_birch_wood.png"},
 	is_ground_content = false,
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
 })
 
 minetest.register_craft({
@@ -266,9 +266,9 @@ minetest.register_craft({
 minetest.register_node("ethereal:bamboo", {
 	description = S("Bamboo"),
 	drawtype = "plantlike",
-	tiles = {"bamboo_trunk.png"},
-	inventory_image = "bamboo_trunk.png",
-	wield_image = "bamboo_trunk.png",
+	tiles = {"ethereal_bamboo_trunk.png"},
+	inventory_image = "ethereal_bamboo_trunk.png",
+	wield_image = "ethereal_bamboo_trunk.png",
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = true,
@@ -276,40 +276,40 @@ minetest.register_node("ethereal:bamboo", {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3}
 	},
-	groups = {choppy = 3, oddly_breakable_by_hand = 1, flammable = 2},--tree = 1
+	groups = {choppy = 3, oddly_breakable_by_hand = 1, flammable = 2},
 	sounds = default.node_sound_leaves_defaults(),
 	after_dig_node = function(pos, node, metadata, digger)
 		default.dig_up(pos, node, digger)
-	end,
+	end
 })
 
 minetest.register_craft({
 	type = "fuel",
 	recipe = "ethereal:bamboo",
-	burntime = 1,
+	burntime = 2
 })
 
 -- olive trunk
 minetest.register_node("ethereal:olive_trunk", {
 	description = S("Olive Trunk"),
 	tiles = {
-		"olive_trunk_top.png",
-		"olive_trunk_top.png",
-		"olive_trunk.png"
+		"ethereal_olive_trunk_top.png",
+		"ethereal_olive_trunk_top.png",
+		"ethereal_olive_trunk.png"
 	},
 	groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2},
 	sounds = default.node_sound_wood_defaults(),
 	paramtype2 = "facedir",
-	on_place = minetest.rotate_node,
+	on_place = minetest.rotate_node
 })
 
 -- olive wood
 minetest.register_node("ethereal:olive_wood", {
 	description = S("Olive Wood"),
-	tiles = {"olive_wood.png"},
+	tiles = {"ethereal_olive_wood.png"},
 	is_ground_content = false,
 	groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 3},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
 })
 
 minetest.register_craft({