diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json
index c239016f7..068854311 100644
--- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json
@@ -1,56 +1,76 @@
 {
-	"name": "Drinks",
+	"name": "Drink Effects",
 	"icon": "firmalife:olivine_wine_bottle",
 	"category": "tfc:mechanics",
-	"priority": false,
-	"sortnum": 17,
 	"read_by_default": true,
 	"pages": [
 		{
-		"type": "patchouli:text",
-			"text": "This section covers various drinkable items added by the modpack, hopefully aiding you in your quest of not dying.$(br2)These drinks have various useful effects, as well as keeping you hydrated."
+			"type": "patchouli:text",
+			"text": "Potions and magic don't exist in the world of TerraFirmaCraft, but there's plenty of other drinks that can provide similar effects!$(br2)This entry serves as a list of all the different effects, and as a bonus, they all keep you hydrated too."
+		},
+		{
+			"type": "patchouli:spotlight",
+			"title": "Drink containers",
+			"text": "You can drink things out of a $(l:getting_started/pottery#jug)Jug$(), $(l:waterflasks/recipes)Flask$(), or $(l:mechanics/glassworking_applications#glass_bottle)Glass Bottle$(). Jugs only hold enough for 1 drink and break easily. Glass bottles only hold a few drinks, and also have a chance of breaking. Flasks can hold even more and slowly use durability instead, except the $(item)Red Steel Flask$() which holds 20 drinks and never breaks.",
+			"item": "tfc:ceramic/jug,tfc:silica_glass_bottle,tfc:olivine_glass_bottle,tfc:hematitic_glass_bottle,tfc:volcanic_glass_bottle,waterflasks:leather_flask,waterflasks:iron_flask,waterflasks:red_steel_flask"
 		},
 		{
 			"type": "patchouli:spotlight",
 			"title": "Aged Alcohol",
-			"text": "$(thing)Aged Alcohol$() will give potion buffs, some of which you might find useful.$(br2)You can drink them with a $(l:getting_started/pottery#jug)Jug$() or $(l:waterflasks/recipes)Flask$().",
+			"text": "$(thing)Aged Alcohols$() are prepared by ageing normal alcohol, which itself is made by leaving various fruits, flours, or other ingredients in a barrel with water. As a bonus, they effect your speech in chat!",
 			"item": "tfcagedalcohol:bucket/aged_beer,tfcagedalcohol:bucket/aged_cider,tfcagedalcohol:bucket/aged_rum,tfcagedalcohol:bucket/aged_sake,tfcagedalcohol:bucket/aged_vodka,tfcagedalcohol:bucket/aged_whiskey,tfcagedalcohol:bucket/aged_corn_whiskey,tfcagedalcohol:bucket/aged_rye_whiskey"
 		},
 		{
 			"type": "patchouli:text",
-			"text": "Aged Beer: Absorption II (20:00)$(br2)Aged Cider: Speed (5:20)$(br2)Aged Rum: Speed II (2:40)$(br2)Aged Sake: Resistance (5:20)$(br2)Aged Vodka: Resistance II (2:40)$(br2)Aged Corn Whiskey: Haste (5:20)$(br2)Aged Rye Whiskey: Haste (5:20)$(br2)Aged Whiskey: Haste II (2:40)$(br2)Aged Mead: Regeneration (5:20)"
+			"text": "$(li)Aged Beer: Absorption II (20:00)$(li)Aged Cider: Speed (5:20)$(li)Aged Rum: Speed II (2:40)$(li)Aged Sake: Resistance (5:20)$(li)Aged Vodka: Resistance II (2:40)$(li)Aged Corn Whiskey: Haste (5:20)$(li)Aged Rye Whiskey: Haste (5:20)$(li)Aged Whiskey: Haste II (2:40)$(li)Aged Mead: Regeneration (5:20)"
 		},
 		{
-			"type": "patchouli:spotlight",
-			"title": "Milks",
-			"text": "$(thing)Milk$() can be aquired from most female livestock by simply right clicking them with a bucket once familiarity is at a high enough level.$(br2)While not providing any buffs, it provides dairy nutrition and can still quench thrist, as well as later be made into cheese.",
-			"item": "minecraft:milk_bucket,firmalife:bucket/yak_milk,firmalife:bucket/goat_milk,tfc_gurman:ox_milk_bucket,tfc_gurman:sheep_milk_bucket,tfc_gurman:alpaca_milk_bucket"
+			"type": "patchouli:text",
+			"title": "Wine",
+			"text": "$(thing)Wine$() is another kind of alcohol that's made in a different way than the others. It's a complex but rewarding process that can't be automated in a machine. Check the $(l:firmalife/wine)Winemaking$() entry to learn how to craft it.",
+			"item": "firmalife:bucket/red_wine,firmalife:bucket/white_wine,firmalife:bucket/rose_wine,firmalife:bucket/sparkling_wine,firmalife:bucket/dessert_wine"
+		},
+		{
+			"type": "patchouli:text",
+			"text": "$(li)Red Wine: Strength (5:20)$(li)White Wine: Wither Resistance (5:20)$(li)Rose Wine: Swim Speed (5:20)$(li)Sparkling Wine: Jump Boost II (5:20)$(li)Dessert Wine: Knockback Resistance (5:20)"
 		},
 		{
 			"type": "patchouli:spotlight",
 			"title": "Teas",
-			"text": "$(thing)Teas$() can be brewed using dried versions of certain plants.$(br2)They provide short but useful buffs and warm your body temperature by 4 degrees.",
+			"text": "$(thing)Teas$() can be brewed using dried versions of certain plants.$(br2)They provide short but useful buffs and warm your body temperature by 4 degrees. Perfect for winters!",
 			"item": "tfc_gurman:tea_mint_bucket,tfc_gurman:tea_chamomile_bucket,tfc_gurman:tea_rosehip_bucket,tfc_gurman:tea_nettle_bucket"
 		},
 		{
 			"type": "patchouli:text",
-			"text": "Mint Tea: Regeneration (0:30)$(br2)Chamomile Tea: Resistance (0:30)$(br2)Rosehip Tea: Absorption (0:30)$(br2)Nettle Tea: Slow Falling (0:30)"
+			"text": "$(li)Mint Tea: Regeneration II (0:30)$(li)Chamomile Tea: Resistance II (0:30)$(li)Rosehip Tea: Absorption (0:30)$(li)Nettle Tea: Slow Falling (0:30)"
 		},
-			{
+		{
 			"type": "patchouli:spotlight",
 			"title": "Treats",
 			"text": "This is a category for more misc drinks with delicious taste and special effects. Enjoy!",
-			"item": "tfc_gurman:cocoa_bucket,tfc_gurman:coffee_bucket,tfc_gurman:nalivka_bucket,tfc_gurman:kvass_bucket,tfc_gurman:compote_bucket"
+			"item": "tfc_gurman:cocoa_bucket,tfc_gurman:coffee_bucket,tfc_gurman:nalivka_bucket,tfc_gurman:kvass_bucket,tfc_gurman:compote_bucket,tfc_gurman:lemonade_bucket"
 		},
 		{
 			"type": "patchouli:text",
-			"text": "Cocoa: Haste (0:30), warms you by 4 degrees$(br2)Coffee: Speed (0:30). warms you by 4 degrees$(br2)Lemonade: Haste (0:30), cools you by 2 degrees$(br2)Nalivka: Strength (2:40), cools you by 2 degrees$(br2)Kvass: Strength (1:20), cools you by 2 degrees$(br2)Compote: Jump Boost II (0:30)"
+			"text": "$(li)Cocoa: Haste (0:30), warms you by 4 degrees$(li)Coffee: Speed (0:30), warms you by 4 degrees$(li)Lemonade: Haste (0:30), cools you by 2 degrees$(li)Nalivka: Strength (2:40), cools you by 2 degrees$(li)Kvass: Strength (1:20), cools you by 2 degrees$(li)Compote: Jump Boost II (0:30)"
+		},
+		{
+			"type": "patchouli:spotlight",
+			"title": "Milks",
+			"text": "$(thing)Milk$() can be aquired from most female livestock by simply right clicking them with a wood or metal bucket once familiarity is at a high enough level. (If the milking isn't working, make sure the buckets aren't stacked!)$(br)While it doesn't provide any buffs, it provides dairy nutrition if drank after eating, and can later be made into cheese.",
+			"item": "minecraft:milk_bucket,firmalife:bucket/yak_milk,firmalife:bucket/goat_milk,tfc_gurman:ox_milk_bucket,tfc_gurman:sheep_milk_bucket,tfc_gurman:alpaca_milk_bucket"
 		},
 		{
 			"title": "Spring Water",
 			"text": "Drinking $(thing)Spring Water$() warms you up by 4 degrees and applies a small regeneration effect while standing in it, as well as warming you.",
 			"item": "tfc:bucket/spring_water",
 			"type": "patchouli:spotlight"
+		},
+		{
+			"title": "Sea Water",
+			"text": "Drinking $(thing)Sea Water$() does not hydrate you and will make you more thirsty instead. A hot body temperature can also make you more thirsty. Lost at sea? Look upwards when it's raining for some easy hydration!",
+			"type": "patchouli:spotlight",
+			"item": "tfc:bucket/salt_water"
 		}
 	]
 }
diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js
index a15aee3b7..638d976a6 100644
--- a/kubejs/client_scripts/tooltips.js
+++ b/kubejs/client_scripts/tooltips.js
@@ -389,11 +389,11 @@ const registerTooltips = (event) => {
 		text.add(2, Text.translate('tfg.tooltip.warming_foods'));
 	})
 	event.addAdvanced(['tfc_gurman:tea_mint_bucket'], (item, advanced, text) => {
-		text.add(1, Text.translate("effect.minecraft.regeneration").append(Text.of(" (00:30)")).blue());
+		text.add(1, Text.translate("effect.minecraft.regeneration").append(Text.of(" II (00:30)")).blue());
 		text.add(2, Text.translate('tfg.tooltip.warming_foods'));
 	})
 	event.addAdvanced(['tfc_gurman:tea_chamomile_bucket'], (item, advanced, text) => {
-		text.add(1, Text.translate("effect.minecraft.resistance").append(Text.of(" (00:30)")).blue());
+		text.add(1, Text.translate("effect.minecraft.resistance").append(Text.of(" II (00:30)")).blue());
 		text.add(2, Text.translate('tfg.tooltip.warming_foods'));
 	})
 	event.addAdvanced(['tfc_gurman:tea_nettle_bucket'], (item, advanced, text) => {
diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json
index f1de9b399..6e8dda27f 100644
--- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json
+++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_chamomile.json
@@ -5,7 +5,7 @@
 		{
 			"type": "minecraft:resistance",
 			"duration": 600,
-			"amplifier": 0
+			"amplifier": 1
 		},
 		{
 			"type": "tfg:warming",
diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json b/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json
index f5a181be8..e96941a4c 100644
--- a/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json
+++ b/kubejs/data/tfc_gurman/tfc/drinkables/tea_mint.json
@@ -5,7 +5,7 @@
 		{
 			"type": "minecraft:regeneration",
 			"duration": 600,
-			"amplifier": 0
+			"amplifier": 1
 		},
 		{
 			"type": "tfg:warming",