diff --git a/README.md b/README.md
index b3dcdb5..8b42bd2 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,7 @@ The settings are the following:
 ```
 throwing.enable_arrow = true
 throwing.enable_golden_arrow = true
+throwing.enable_diamond_arrow = true
 throwing.enable_fire_arrow = true
 throwing.enable_teleport_arrow = true
 throwing.enable_dig_arrow = true
diff --git a/init.lua b/init.lua
index 52ac0ee..18fcae4 100644
--- a/init.lua
+++ b/init.lua
@@ -92,6 +92,24 @@ if get_setting("golden_arrow") then
 	})
 end
 
+if get_setting("diamond_arrow") then
+	throwing.register_arrow("throwing:arrow_diamond", {
+		itemcraft = "default:diamond",
+		craft_quantity = 16,
+		description = "Diamond Arrow",
+		tiles = {"throwing_arrow_diamond.png", "throwing_arrow_diamond.png", "throwing_arrow_diamond_back.png", "throwing_arrow_diamond_front.png", "throwing_arrow_diamond_2.png", "throwing_arrow_diamond.png"},
+		target = throwing.target_object,
+		allow_protected = true,
+		on_hit_sound = "throwing_arrow",
+		on_hit = function(self, pos, _, _, object, hitter)
+			object:punch(hitter, 1, {
+				full_punch_interval = 1,
+				damage_groups = {fleshy = 8}
+			})
+		end
+	})
+end
+
 if get_setting("dig_arrow") then
 	throwing.register_arrow("throwing:arrow_dig", {
 		itemcraft = "default:pick_wood",
@@ -119,7 +137,7 @@ end
 
 if get_setting("teleport_arrow") then
 	throwing.register_arrow("throwing:arrow_teleport", {
-		itemcraft = "default:diamond",
+		itemcraft = "default:mese_crystal",
 		description = "Teleport Arrow",
 		tiles = {"throwing_arrow_teleport.png", "throwing_arrow_teleport.png", "throwing_arrow_teleport_back.png", "throwing_arrow_teleport_front.png", "throwing_arrow_teleport_2.png", "throwing_arrow_teleport.png"},
 		allow_protected = true,
diff --git a/textures/throwing_arrow_diamond.png b/textures/throwing_arrow_diamond.png
new file mode 100644
index 0000000..479b5f6
Binary files /dev/null and b/textures/throwing_arrow_diamond.png differ
diff --git a/textures/throwing_arrow_diamond_2.png b/textures/throwing_arrow_diamond_2.png
new file mode 100644
index 0000000..73c3fb7
Binary files /dev/null and b/textures/throwing_arrow_diamond_2.png differ
diff --git a/textures/throwing_arrow_diamond_back.png b/textures/throwing_arrow_diamond_back.png
new file mode 100644
index 0000000..a8a58e9
Binary files /dev/null and b/textures/throwing_arrow_diamond_back.png differ
diff --git a/textures/throwing_arrow_diamond_front.png b/textures/throwing_arrow_diamond_front.png
new file mode 100644
index 0000000..4a3a3b3
Binary files /dev/null and b/textures/throwing_arrow_diamond_front.png differ
diff --git a/textures/throwing_arrow_teleport.png b/textures/throwing_arrow_teleport.png
index e0b6f08..069f7f9 100644
Binary files a/textures/throwing_arrow_teleport.png and b/textures/throwing_arrow_teleport.png differ
diff --git a/textures/throwing_arrow_teleport_2.png b/textures/throwing_arrow_teleport_2.png
index 1a3c6fe..2ec4e7b 100644
Binary files a/textures/throwing_arrow_teleport_2.png and b/textures/throwing_arrow_teleport_2.png differ
diff --git a/textures/throwing_arrow_teleport_back.png b/textures/throwing_arrow_teleport_back.png
index ecd3e70..01e6877 100644
Binary files a/textures/throwing_arrow_teleport_back.png and b/textures/throwing_arrow_teleport_back.png differ
diff --git a/textures/throwing_arrow_teleport_front.png b/textures/throwing_arrow_teleport_front.png
index 1233c14..b9c79df 100644
Binary files a/textures/throwing_arrow_teleport_front.png and b/textures/throwing_arrow_teleport_front.png differ