diff --git a/README.md b/README.md
index c3689eb..213a505 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Version: 0.10.2
 **Code**  
 LGPL 2.1 (see included LICENSE file)
   
-**Textures** 
+**Textures**   
 vessels_glass_bottle_full_cc_by_sa_3.png  
 Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)  
 modified from vessels_glass_bottle.png  
@@ -21,11 +21,17 @@ thirsty_wooden_bowl_cc0.png +.xcf
 thirsty_bronze_canteen_cc0.png +.xcf  
 thirsty_steel_canteen_cc0.png  
 thirsty_amulet_moisture_cc0.png +.xcf  
-thirsty_amulet_hydration_cc0.png +.xcf  
+thirsty_amulet_hydration_cc0.png +.xcf 
 Public Domain CC0 1.0 Universal  
 Sirrobzeroone  
 
-All other Images CC BY-SA 4.0 (see http://creativecommons.org/licenses/by-sa/4.0/)  
+All other Images CC BY-SA 4.0 
+(see http://creativecommons.org/licenses/by-sa/4.0/)
+  
+**Sounds**  
+thirsty_breviceps_drink-drinking-liquid.ogg  
+https://freesound.org/people/Breviceps/sounds/445970/  
+Public Domain CC0 1.0 Universal
 
 Report bugs or request help on the forum topic.
 
@@ -83,7 +89,7 @@ Configure nodes that can be drunk from using a cup/glass etc assuming this was
 not done as part of Tier 0 or if you wish to override max_hydration to be more
 than the default value (normally 20):
 
-** thirsty.register_drinkable_node(node_name,max_hydration)**  
+**thirsty.register_drinkable_node(node_name,max_hydration)**  
 **"item_name"** registered node name  
 **"max_hydration"**  optional will default to thirsty.config.start (default 20)
  max hydration can be set above 20 to encourage use of drinking fountains or
@@ -282,7 +288,7 @@ once and for all.
 
 **Example**
 
-    thirsty.register_amulet_extractor("thirsty:extractor", 0.6)	
+    thirsty.register_amulet_extractor("thirsty:amulet_of_moisture", 0.6)	
 
 **Amulet of Moisture**  - Absorbs moisture from the surronding environment places it into a canteen or other water holding item. Must be held in Inventory.  
 
@@ -294,7 +300,7 @@ once and for all.
 			  
 **Example**  
 
-    thirsty.register_amulet_supplier("thirsty:injector", 0.5)
+    thirsty.register_amulet_supplier("thirsty:amulet_of_hydration", 0.5)
 
 **Amulet of Hydration** - Feeds water from a Canteen or other water holding
 item directly into the player to keep them always hydrated. Must be held in Inventory.  
@@ -303,20 +309,31 @@ The above two Amulets can be used in combination with each other plus a
 canteen. However this does permenantly fill 3 inventory slots the delibrate
 downside to offset the significant bonus.  
 						  
-**Lesser Amulet of Thirst - Coming Soon**
+**Amulets of Thirst** - Three versions lesser,normal and greater each will slower the rate at which
+a player becomes thirsty. Normal thirst factor is 1, however a "cursed" version could be created
+which makes a player become thirsty faster.  
 
-* thirsty.set_thirst_factor(player, factor) : how fast does the given player get thirsty (default is 1.0)
-* thirsty.get_thirst_factor(player) : returns the current thirst factor of a player
+	thirsty.register_amulet_thirst(item_name, thirst_factor)  
 
-**Amulet of Thirst - Coming Soon**
+**"item_name"** Registered item name  
+**"thirst_factor"** Float value that represents the speed at which a player uses hydration points
 
-**Greater Amulet of Thirst - Coming Soon**
+**Example** 
 
+	minetest.register_craftitem("thirsty:greater_amulet_thirst", {
+        description = "Greater Amulet of Thirst",
+        inventory_image = "thirsty_amulet_of_thirst_greater_cc0.png",
+    })
 
-## *Additional Functions*
+	thirsty.register_amulet_thirst("thirsty:lesser_amulet_thirst",0.85)
 
-**thirsty.get_hydro(player) : returns the current hydration of a player**
+*Note: Included Amulets of Thirst have no craft recipes and are only avaliable as   
+*dungeon loot with more powerful versions only found in deeper dungeons.
+ 
+
+## *Additional Functions*
 
+*thirsty.get_hydro(player) : returns the current hydration of a player*
 
 "player" refers to a player object, i.e. with a get_player_name() method.
 
diff --git a/components.lua b/components.lua
index 22b12fa..cbd1121 100644
--- a/components.lua
+++ b/components.lua
@@ -270,12 +270,12 @@ if thirsty.config.register_amulets and
    minetest.registered_items[E.mese_crystal] and   
    minetest.registered_items[E.bucket_water] then
 
-    minetest.register_craftitem('thirsty:injector', {
-        description = 'Amulet of Hydration',
+    minetest.register_craftitem("thirsty:amulet_of_hydration", {
+        description = "Amulet of Hydration",
         inventory_image = "thirsty_amulet_hydration_cc0.png",
     })
     minetest.register_craft({
-        output = "thirsty:injector",
+        output = "thirsty:amulet_of_hydration",
         recipe = {
             {E.diamond     ,E.mese_crystal,E.diamond},
             {E.mese_crystal,E.bucket_water,E.mese_crystal},
@@ -283,14 +283,14 @@ if thirsty.config.register_amulets and
         }
     })
 
-	thirsty.register_amulet_supplier("thirsty:injector", 0.5)
+	thirsty.register_amulet_supplier("thirsty:amulet_of_hydration", 0.5)
 
-    minetest.register_craftitem('thirsty:extractor', {
+    minetest.register_craftitem("thirsty:amulet_of_moisture", {
         description = "Amulet of Moisture",
         inventory_image = "thirsty_amulet_moisture_cc0.png",
     })
     minetest.register_craft({
-        output = "thirsty:extractor",
+        output = "thirsty:amulet_of_moisture",
         recipe = {
             {E.mese_crystal,E.diamond     ,E.mese_crystal},
             {E.diamond     ,E.bucket_water,E.diamond     },
@@ -298,6 +298,25 @@ if thirsty.config.register_amulets and
         }
     })
 
-	thirsty.register_amulet_extractor("thirsty:extractor", 0.6)
+	thirsty.register_amulet_extractor("thirsty:amulet_of_moisture", 0.6)
 
+	minetest.register_craftitem("thirsty:lesser_amulet_thirst", {
+        description = "Lesser Amulet of Thirst",
+        inventory_image = "thirsty_amulet_of_thirst_lesser_cc0.png",
+    })
+	
+	minetest.register_craftitem("thirsty:amulet_thirst", {
+        description = "Amulet of Thirst",
+        inventory_image = "thirsty_amulet_of_thirst_cc0.png",
+    })
+	
+	minetest.register_craftitem("thirsty:greater_amulet_thirst", {
+        description = "Greater Amulet of Thirst",
+        inventory_image = "thirsty_amulet_of_thirst_greater_cc0.png",
+    })
+
+	thirsty.register_amulet_thirst("thirsty:lesser_amulet_thirst",0.85)
+	thirsty.register_amulet_thirst("thirsty:amulet_thirst",0.70)
+	thirsty.register_amulet_thirst("thirsty:greater_amulet_thirst",0.55)
+	
 end
diff --git a/components_external_nodes_items.lua b/components_external_nodes_items.lua
index bc1aee6..e6b6c54 100644
--- a/components_external_nodes_items.lua
+++ b/components_external_nodes_items.lua
@@ -18,8 +18,8 @@ across the whole mod.
 local E = thirsty.ext_nodes_items
 
 -- item and node mod aliases, change these as needed.
--- if item dosen't exist as either Ing or Aug item
--- it wont register.
+-- if item dosen't exist as either Ingredient or Augumented 
+-- item it wont register.
 
 -- Basic Water, change here or register 
 -- using thirsty.register_hydrate_node() 
diff --git a/functions.lua b/functions.lua
index b89c79e..7b96c92 100644
--- a/functions.lua
+++ b/functions.lua
@@ -10,21 +10,13 @@
 --                See init.lua for license                --
 ------------------------------------------------------------
 
---[[ notes/ideas
-	move settings from conf to node/item defs were appropriate tool
-	Tier 0 nodes what to do? check for node liquid and drinkable?
-	Tier 1 function to register "Drinking containers" Tier 1
-	Tier 2 function to register "Hydro storing"
-]]--
-
 --------------------------
 -- Tier 0 API Functions --
 --------------------------
 -- regen_from_node is a table defining, for each node type, the
 -- amount of hydro per second a player drinks by standing in it.
 -- Default is 0.5 of a hydration per second
-function thirsty.register_hydrate_node(node_name,drink_cup,regen)
-	
+function thirsty.register_hydrate_node(node_name,drink_cup,regen)	
 	local drink_cup = drink_cup or true
 	local regen = regen or 0.5
 	
@@ -90,17 +82,15 @@ end
 --------------------------
 -- Tier 2 API Functions --
 --------------------------
-function thirsty.drink(player, value, max, empty_vessel)
-    -- if max is not specified, assume 20
-    if not max then
-        max = 20
-    end
+function thirsty.drink(player, value, max_hyd, empty_vessel)
+	local max_hyd = max_hyd or 20
+	local value = value or 2
 	local pmeta = player:get_meta()
     local hydro = pmeta:get_float("thirsty_hydro")
-    -- test whether we're not *above* max;
+    -- test whether we're not *above* max_hyd;
     -- this function should not remove any overhydration
-    if hydro < max then
-        hydro = math.min(hydro + value, max)
+    if hydro < max_hyd then
+        hydro = math.min(hydro + value, max_hyd)
         --print("Drinking by "..value.." to "..hydro)
 		pmeta:set_float("thirsty_hydro", hydro)		
 		minetest.sound_play("thirsty_breviceps_drink-drinking-liquid", { to_player = player:get_player_name(), gain = 2.0, })
@@ -221,16 +211,23 @@ function thirsty.register_amulet_supplier(item_name,value)
 	thirsty.config.injection_for_item[item_name] = value
 end
 
+function thirsty.register_amulet_thirst(item_name,value)
+	thirsty.config.thirst_adjust_item[item_name] = value
+end
+
 function thirsty.get_thirst_factor(player)
     local name = player:get_player_name()
-    local pl = thirsty.players[name]
+	local pmeta = player:get_meta()
+	local pl = minetest.deserialize(pmeta:get_string("thirsty_values"))
     return pl.thirst_factor
 end
 
 function thirsty.set_thirst_factor(player, factor)
     local name = player:get_player_name()
-    local pl = thirsty.players[name]
+	local pmeta = player:get_meta()
+	local pl = minetest.deserialize(pmeta:get_string("thirsty_values"))
     pl.thirst_factor = factor
+	pmeta:set_string("thirsty_values",minetest.serialize(pl))
 end
 
 
@@ -259,28 +256,33 @@ function thirsty.on_joinplayer(player)
 		pmeta:set_float("thirsty_hydro", thirsty.config.start)	
 	end
 	
-	-- default entry for joining players 
-	if not thirsty.players[name] then
-        local pos = player:get_pos()
-        thirsty.players[name] = {
-            last_pos = math.floor(pos.x) .. ':' .. math.floor(pos.z),
-            time_in_pos = 0.0,
+	-- default entry for joining players
+	if pmeta:get_string("thirsty_values") == "" then
+	    local pos = player:get_pos()
+	    pmeta:set_string("thirsty_values", minetest.serialize({
+			last_pos = math.floor(pos.x) .. ':' .. math.floor(pos.z),
+	        time_in_pos = 0.0,
             pending_dmg = 0.0,
-            thirst_factor = 1.0,
-        }
-    end
+            thirst_factor = 1.0
+	   }))
+	end
+
     thirsty.hud_init(player)
 end
 
 
 function thirsty.on_dieplayer(player)
     local name = player:get_player_name()
-    local pl   = thirsty.players[name]
-    -- reset after death
+	local pos = player:get_pos()
 	local pmeta = player:get_meta()
+	
     pmeta:set_float("thirsty_hydro", thirsty.config.start)
-    pl.pending_dmg = 0.0
-    pl.thirst_factor = 1.0
+	pmeta:set_string("thirsty_values", minetest.serialize({
+			last_pos = math.floor(pos.x) .. ':' .. math.floor(pos.z),
+	        time_in_pos = 0.0,
+            pending_dmg = 0.0,
+            thirst_factor = 1.0
+	   }))
 end
 
 
@@ -291,17 +293,17 @@ function thirsty.main_loop(dtime)
         -- time for thirst
         thirsty.time_next_tick = thirsty.time_next_tick + thirsty.config.tick_time
         for _,player in ipairs(minetest.get_connected_players()) do
-
-            if player:get_hp() <= 0 then
-                -- dead players don't get thirsty, or full for that matter :-P
+			
+			-- dead players don't get thirsty, or full for that matter :-P
+            if player:get_hp() <= 0 then   
                 break
             end
 
             local name = player:get_player_name()
             local pos  = player:get_pos()
-            local pl = thirsty.players[name]
 			local pmeta = player:get_meta()
             local hydro = pmeta:get_float("thirsty_hydro")
+			local pl = minetest.deserialize(pmeta:get_string("thirsty_values"))
 
             -- how long have we been standing "here"?
             -- (the node coordinates in X and Z should be enough)
@@ -343,19 +345,24 @@ function thirsty.main_loop(dtime)
             local pl_inv = player:get_inventory()
             local extractor_max = 0.0
             local injector_max = 0.0
+			local amulet_thirst = false
             local container_not_full = nil
             local container_not_empty = nil
             local inv_main = player:get_inventory():get_list('main')
+
             for i, itemstack in ipairs(inv_main) do
                 local name = itemstack:get_name()
-                local injector_this = thirsty.config.injection_for_item[name]
+                -- Amulets Hydration/Moisture
+				local injector_this = thirsty.config.injection_for_item[name]
                 if injector_this and injector_this > injector_max then
                     injector_max = injector_this
                 end
+				
                 local extractor_this = thirsty.config.extraction_for_item[name]
                 if extractor_this and extractor_this > extractor_max then
                     extractor_max = extractor_this
                 end
+				
                 if thirsty.config.container_capacity[name] then
                     local wear = itemstack:get_wear()
                     -- can be both!
@@ -366,7 +373,17 @@ function thirsty.main_loop(dtime)
                         container_not_empty = { i, itemstack }
                     end
                 end
+				-- Amulets of Thirst
+				local is_thirst_amulet = thirsty.config.thirst_adjust_item[name]
+				if is_thirst_amulet then
+					amulet_thirst = true
+					pl.thirst_factor = thirsty.config.thirst_adjust_item[name]				
+				end
             end
+
+			if amulet_thirst ~= true and pl.thirst_factor ~= 1.0 then
+				pl.thirst_factor = 1.0
+			end
 			
             if extractor_max > 0.0 and container_not_full then
                 local i = container_not_full[1]
@@ -403,7 +420,8 @@ function thirsty.main_loop(dtime)
 
             if drink_per_second > 0 and pl_standing then
                 -- Drinking from the ground won't give you more than max
-                thirsty.drink(player, drink_per_second * thirsty.config.tick_time, 20)
+                thirsty.drink(player, (drink_per_second * thirsty.config.tick_time)*2, 20)
+				pl.time_in_pos = 0.0
                 --print("Raising hydration by "..(drink_per_second*thirsty.config.tick_time).." to "..PPA.get_value(player, 'thirsty_hydro'))
             else
                 if not pl_afk then
@@ -438,6 +456,7 @@ function thirsty.main_loop(dtime)
                     pl.pending_dmg = 0.0
                 end
             end
+			pmeta:set_string("thirsty_values",minetest.serialize(pl))
         end -- for players
 
         -- check fountains for expiration
@@ -455,9 +474,9 @@ end
 
 
 function thirsty.drink_handler(player, itemstack, node)
-    local pl = thirsty.players[player:get_player_name()]
 	local pmeta = player:get_meta()
     local hydro = pmeta:get_float("thirsty_hydro")
+	local pl = minetest.deserialize(pmeta:get_string("thirsty_values"))
     local old_hydro = hydro
 
     -- selectors, always true, to make the following code easier
diff --git a/hud.lua b/hud.lua
index fc0f725..0f21cd7 100644
--- a/hud.lua
+++ b/hud.lua
@@ -57,7 +57,7 @@ else
         local name = player:get_player_name()
 		local pmeta = player:get_meta()
 		
-        thirsty.players[name].hud_id = player:hud_add({
+        thirsty_hud = player:hud_add({
             hud_elem_type = "statbar",
             position = { x=0.5, y=1 },
             text = "thirsty_drop_100_24_cc0.png",
@@ -69,7 +69,7 @@ else
     end
     function thirsty.hud_update(player, value)
         local name = player:get_player_name()
-        local hud_id = thirsty.players[name].hud_id
+        local hud_id = thirsty_hud
         player:hud_change(hud_id, 'number', thirsty.hud_clamp(value))
     end
 end
diff --git a/init.lua b/init.lua
index 9ca062f..9ffbaa3 100644
--- a/init.lua
+++ b/init.lua
@@ -86,20 +86,10 @@ thirsty = {
 			  drink_from_node      = {},
 			  fountain_type        = {},
 			  extraction_for_item  = {},
-			  injection_for_item   = {}
+			  injection_for_item   = {},
+			  thirst_adjust_item   = {}
              },
 
-    -- the players' values
-    players = {
-        --[[
-        name = {
-            last_pos = '-10:3',
-            time_in_pos = 0.0,
-            pending_dmg = 0.0,
-            thirst_factor = 1.0,
-        }
-        ]]
-    },
 
     -- water fountains
     fountains = {
@@ -144,6 +134,10 @@ dofile(modpath..'/components_external_nodes_items.lua')
 dofile(modpath..'/components.lua')
 dofile(modpath..'/interop_a_functions.lua')
 
+-- dungeon_loot for Aumlets of Thirst
+if minetest.get_modpath("dungeon_loot") then
+	dofile(modpath..'/interop_dungeon_loot.lua')
+end 
 
 -- mobs_animal specific config
 if minetest.get_modpath("mobs_animal") then
@@ -160,3 +154,4 @@ end
 if minetest.get_modpath("ethereal") then
 	dofile(modpath..'/interop_ethereal.lua')
 end
+--minetest.debug(dump(thirsty))
\ No newline at end of file
diff --git a/interop_a_functions.lua b/interop_a_functions.lua
index 7ee89cd..c45b523 100644
--- a/interop_a_functions.lua
+++ b/interop_a_functions.lua
@@ -10,7 +10,7 @@
 --       because I'm lazy and like small code blocks      --
 ------------------------------------------------------------
 
-thirsty.register_hb_hng_drink = function (item_name,satiate_value,heal_value,hyd_value,hyd_max,rtn_item_name)
+thirsty.register_food_drink = function (item_name,satiate_value,heal_value,hyd_value,hyd_max,rtn_item_name)
 	
 	local is_hunger_ng = false
 	local is_hbhunger = false
@@ -36,7 +36,8 @@ thirsty.register_hb_hng_drink = function (item_name,satiate_value,heal_value,hyd
 						thirsty.drink(player,hyd_value,hyd_max,rtn_item_name)
 							
 							if minetest.registered_items[item_name]._hunger_ng then
-							    hunger_ng.alter_hunger(player:get_player_name(), satiate_value, "from:thirsty-"..item_name)
+								minetest.sound_play("hunger_ng_eat", {to_player = player:get_player_name(), gain = 2.0 })
+								hunger_ng.alter_hunger(player:get_player_name(), satiate_value, "from:thirsty-"..item_name)
 								player:set_hp(player:get_hp()+heal_value)								
 								itemstack:take_item()
 								return itemstack
diff --git a/interop_dungeon_loot.lua b/interop_dungeon_loot.lua
new file mode 100644
index 0000000..38183f2
--- /dev/null
+++ b/interop_dungeon_loot.lua
@@ -0,0 +1,18 @@
+------------------------------------------------------------
+--             _____ _    _        _                      --
+--            |_   _| |_ (_)_ _ __| |_ _  _               --
+--              | | | ' \| | '_(_-<  _| || |              --
+--              |_| |_||_|_|_| /__/\__|\_, |              --
+--                                     |__/               --
+------------------------------------------------------------
+--             Thirsty mod [interop_ethereal]             --
+------------------------------------------------------------
+--            Settings to support Dungeon Loot            --
+------------------------------------------------------------
+if register_amulets == true then
+
+	dungeon_loot.register({name = "thirsty:lesser_amulet_thirst", chance = 0.1, count = {1,1}})
+	dungeon_loot.register({name = "thirsty:amulet_thirst", chance = 0.05, count = {1,1}, y = {-100, 32768}})
+	dungeon_loot.register({name = "thirsty:greater_amulet_thirst", chance = 0.05, count = {1,1}, y = {-200, 32768}})
+
+end
\ No newline at end of file
diff --git a/interop_ethereal.lua b/interop_ethereal.lua
index f5a63b6..ef24602 100644
--- a/interop_ethereal.lua
+++ b/interop_ethereal.lua
@@ -14,7 +14,7 @@ local E = thirsty.ext_nodes_items
 ----------------------------
 -- Hydrate and Food Items --
 ----------------------------
-thirsty.register_hb_hng_drink("ethereal:firethorn_jelly" ,1,0,1,20,E.glass_bottle)
-thirsty.register_hb_hng_drink("ethereal:mushroom_soup"   ,2.5,0,2,20,ethereal:bowl)
-thirsty.register_hb_hng_drink("ethereal:hearty_stew"     ,7.0,0,1,20,ethereal:bowl)
-thirsty.register_hb_hng_drink("ethereal:golden_apple"    ,10,10,10,30,nil)
\ No newline at end of file
+thirsty.register_food_drink("ethereal:firethorn_jelly" ,1,0,1,20,E.glass_bottle)
+thirsty.register_food_drink("ethereal:mushroom_soup"   ,2.5,0,2,20,ethereal:bowl)
+thirsty.register_food_drink("ethereal:hearty_stew"     ,7.0,0,1,20,ethereal:bowl)
+thirsty.register_food_drink("ethereal:golden_apple"    ,10,10,10,30,nil)
\ No newline at end of file
diff --git a/interop_farming_redo.lua b/interop_farming_redo.lua
index b3d1b79..66a4feb 100644
--- a/interop_farming_redo.lua
+++ b/interop_farming_redo.lua
@@ -35,19 +35,19 @@ minetest.register_craftitem(":farming:rose_water", def)
 ----------------------------
 -- Hydrate and Food Items --
 ----------------------------
-thirsty.register_hb_hng_drink("farming:soy_milk"          ,1,0,4,22,E.drinking_glass)	
-thirsty.register_hb_hng_drink("farming:pineapple_juice"   ,1,0,4,22,E.drinking_glass)
-thirsty.register_hb_hng_drink("farming:carrot_juice"      ,1,0,4,22,E.drinking_glass)	
-thirsty.register_hb_hng_drink("farming:smoothie_berry"    ,2,0,4,23,E.drinking_glass)
-thirsty.register_hb_hng_drink("farming:smoothie_raspberry",2,0,4,23,E.drinking_glass)	
-thirsty.register_hb_hng_drink("farming:mint_tea"          ,2,0,4,24,E.drinking_glass)
-thirsty.register_hb_hng_drink("farming:coffee_cup"        ,2,0,4,22,E.drinking_glass)
-thirsty.register_hb_hng_drink("farming:beetroot_soup"     ,4,0,2,20,E.wood_bowl)
-thirsty.register_hb_hng_drink("farming:onion_soup"        ,5,0,2,20,E.wood_bowl)
-thirsty.register_hb_hng_drink("farming:pea_soup"          ,6,0,2,20,E.wood_bowl)
-thirsty.register_hb_hng_drink("farming:tomato_soup"       ,7,0,2,20,E.wood_bowl)
-thirsty.register_hb_hng_drink("farming:chili_bowl"        ,7,0,-2,20,E.wood_bowl)
-thirsty.register_hb_hng_drink("farming:chili_pepper"      ,1,-1,-5,40,nil)
+thirsty.register_food_drink("farming:soy_milk"          ,1,0,4,22,E.drinking_glass)	
+thirsty.register_food_drink("farming:pineapple_juice"   ,1,0,4,22,E.drinking_glass)
+thirsty.register_food_drink("farming:carrot_juice"      ,1,0,4,22,E.drinking_glass)	
+thirsty.register_food_drink("farming:smoothie_berry"    ,2,0,4,23,E.drinking_glass)
+thirsty.register_food_drink("farming:smoothie_raspberry",2,0,4,23,E.drinking_glass)	
+thirsty.register_food_drink("farming:mint_tea"          ,2,0,4,24,E.drinking_glass)
+thirsty.register_food_drink("farming:coffee_cup"        ,2,0,4,22,E.drinking_glass)
+thirsty.register_food_drink("farming:beetroot_soup"     ,4,0,2,20,E.wood_bowl)
+thirsty.register_food_drink("farming:onion_soup"        ,5,0,2,20,E.wood_bowl)
+thirsty.register_food_drink("farming:pea_soup"          ,6,0,2,20,E.wood_bowl)
+thirsty.register_food_drink("farming:tomato_soup"       ,7,0,2,20,E.wood_bowl)
+thirsty.register_food_drink("farming:chili_bowl"        ,7,0,-2,20,E.wood_bowl)
+thirsty.register_food_drink("farming:chili_pepper"      ,1,-1,-5,40,nil)
 
 --------------------	
 -- Complex/Custom --
diff --git a/interop_mobs_animal.lua b/interop_mobs_animal.lua
index 8e98f89..70b566e 100644
--- a/interop_mobs_animal.lua
+++ b/interop_mobs_animal.lua
@@ -14,6 +14,6 @@ local E = thirsty.ext_nodes_items
 ----------------------------
 -- Hydrate and Food Items --
 ----------------------------
-	thirsty.register_hb_hng_drink("mobs:glass_milk",1,0,4,22,E.drinking_glass)	
-	thirsty.register_hb_hng_drink("mobs:honey"     ,2,0,1,20,nil)
+	thirsty.register_food_drink("mobs:glass_milk",1,0,4,22,E.drinking_glass)	
+	thirsty.register_food_drink("mobs:honey"     ,2,0,1,20,nil)
 
diff --git a/mod.conf b/mod.conf
index 87697c7..8409b46 100644
--- a/mod.conf
+++ b/mod.conf
@@ -1,4 +1,4 @@
 name = thirsty
 description = A mod that adds a "thirst" mechanic, similar to hunger.
 depends =
-optional_depends = default, bucket, hudbars, vessels, farming, mobs_animal, hunger_ng, hbhunger
\ No newline at end of file
+optional_depends = default, bucket, hudbars, vessels, farming, mobs_animal, hunger_ng, hbhunger, dungeon_loot
\ No newline at end of file
diff --git a/textures/src/thirsty_cup_100_cc0.xcf b/textures/src/thirsty_cup_100_cc0.xcf
index 485531e..61c90f8 100644
Binary files a/textures/src/thirsty_cup_100_cc0.xcf and b/textures/src/thirsty_cup_100_cc0.xcf differ
diff --git a/textures/thirsty_amulet_of _thirst_cc0.png b/textures/thirsty_amulet_of_thirst_cc0.png
similarity index 100%
rename from textures/thirsty_amulet_of _thirst_cc0.png
rename to textures/thirsty_amulet_of_thirst_cc0.png
diff --git a/textures/thirsty_amulet_of _thirst_greater_cc0.png b/textures/thirsty_amulet_of_thirst_greater_cc0.png
similarity index 100%
rename from textures/thirsty_amulet_of _thirst_greater_cc0.png
rename to textures/thirsty_amulet_of_thirst_greater_cc0.png
diff --git a/textures/thirsty_amulet_of _thirst_lesser_cc0.png b/textures/thirsty_amulet_of_thirst_lesser_cc0.png
similarity index 100%
rename from textures/thirsty_amulet_of _thirst_lesser_cc0.png
rename to textures/thirsty_amulet_of_thirst_lesser_cc0.png
diff --git a/textures/thirsty_bowl_16.png b/textures/thirsty_bowl_16.png
deleted file mode 100644
index c7b8df6..0000000
Binary files a/textures/thirsty_bowl_16.png and /dev/null differ
diff --git a/textures/thirsty_bowl_32.png b/textures/thirsty_bowl_32.png
deleted file mode 100644
index 147fa86..0000000
Binary files a/textures/thirsty_bowl_32.png and /dev/null differ
diff --git a/textures/thirsty_bowl_64.png b/textures/thirsty_bowl_64.png
deleted file mode 100644
index c8de654..0000000
Binary files a/textures/thirsty_bowl_64.png and /dev/null differ
diff --git a/textures/thirsty_bronze_canteen_16.png b/textures/thirsty_bronze_canteen_16.png
deleted file mode 100644
index 6c1555c..0000000
Binary files a/textures/thirsty_bronze_canteen_16.png and /dev/null differ
diff --git a/textures/thirsty_bronze_canteen_32.png b/textures/thirsty_bronze_canteen_32.png
deleted file mode 100644
index 1ec8c9f..0000000
Binary files a/textures/thirsty_bronze_canteen_32.png and /dev/null differ
diff --git a/textures/thirsty_cup_0_16.png b/textures/thirsty_cup_0_16.png
deleted file mode 100644
index 9c080ba..0000000
Binary files a/textures/thirsty_cup_0_16.png and /dev/null differ
diff --git a/textures/thirsty_cup_0_24.png b/textures/thirsty_cup_0_24.png
deleted file mode 100644
index aea96a3..0000000
Binary files a/textures/thirsty_cup_0_24.png and /dev/null differ
diff --git a/textures/thirsty_cup_0_32.png b/textures/thirsty_cup_0_32.png
deleted file mode 100644
index 105a2ef..0000000
Binary files a/textures/thirsty_cup_0_32.png and /dev/null differ
diff --git a/textures/thirsty_cup_100.png b/textures/thirsty_cup_100.png
deleted file mode 100644
index a2b9e1c..0000000
Binary files a/textures/thirsty_cup_100.png and /dev/null differ
diff --git a/textures/thirsty_cup_100_16.png b/textures/thirsty_cup_100_16.png
deleted file mode 100644
index a2b9e1c..0000000
Binary files a/textures/thirsty_cup_100_16.png and /dev/null differ
diff --git a/textures/thirsty_cup_100_24.png b/textures/thirsty_cup_100_24.png
deleted file mode 100644
index ee283b8..0000000
Binary files a/textures/thirsty_cup_100_24.png and /dev/null differ
diff --git a/textures/thirsty_cup_100_32.png b/textures/thirsty_cup_100_32.png
deleted file mode 100644
index effe6fd..0000000
Binary files a/textures/thirsty_cup_100_32.png and /dev/null differ
diff --git a/textures/thirsty_cup_50_16.png b/textures/thirsty_cup_50_16.png
deleted file mode 100644
index 64f7581..0000000
Binary files a/textures/thirsty_cup_50_16.png and /dev/null differ
diff --git a/textures/thirsty_cup_50_24.png b/textures/thirsty_cup_50_24.png
deleted file mode 100644
index c5c7c69..0000000
Binary files a/textures/thirsty_cup_50_24.png and /dev/null differ
diff --git a/textures/thirsty_cup_50_32.png b/textures/thirsty_cup_50_32.png
deleted file mode 100644
index ac33d2c..0000000
Binary files a/textures/thirsty_cup_50_32.png and /dev/null differ
diff --git a/textures/thirsty_steel_canteen_16.png b/textures/thirsty_steel_canteen_16.png
deleted file mode 100644
index abcc2a7..0000000
Binary files a/textures/thirsty_steel_canteen_16.png and /dev/null differ
diff --git a/textures/thirsty_steel_canteen_32.png b/textures/thirsty_steel_canteen_32.png
deleted file mode 100644
index 024daf0..0000000
Binary files a/textures/thirsty_steel_canteen_32.png and /dev/null differ