diff --git a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt
index f9f4452..b5f3f0d 100644
--- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt
+++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt
@@ -469,7 +469,7 @@
 			id: "30A6EDDF25A5E5F8"
 			shape: "gear"
 			size: 1.3d
-			subtitle: "The main &1IV&r Material!"
+			subtitle: "The main &9IV&r Material!"
 			tasks: [
 				{
 					id: "4BEA3166CD486845"
@@ -563,7 +563,7 @@
 			description: [
 				"&aTungstensteel Coils&r raise the Heat Capacity to a scorching &d4,500K&r."
 				""
-				"This will be required in &1IV&r, but as always, you should still get this earlier for the &6Coil bonuses&r."
+				"These will be required in &9IV&r, but as always, you should still get them earlier for the &6Coil bonuses&r."
 			]
 			icon: "gtceu:tungstensteel_coil_block"
 			id: "069FD86133D7D582"
@@ -1128,15 +1128,13 @@
 					type: "item"
 				}
 				{
-					amount: 1000L
-					fluid: "gtceu:uranium_hexafluoride"
-					id: "59D6B7142C0174BA"
+					id: "19027B3E2E43BAFF"
+					item: "gtceu:uranium_hexafluoride_bucket"
 					optional_task: true
-					title: "Uranium Hexafluoride"
-					type: "fluid"
+					type: "item"
 				}
 				{
-					id: "39E343FCB7B1646D"
+					id: "63142D5387BB1D3E"
 					item: "gtceu:uranium_dust"
 					type: "item"
 				}
@@ -1179,10 +1177,9 @@
 					type: "item"
 				}
 				{
-					amount: 1000L
-					fluid: "gtceu:radon"
-					id: "1C084B65DE6E73E8"
-					type: "fluid"
+					id: "1797D435B5058938"
+					item: "gtceu:radon_bucket"
+					type: "item"
 				}
 			]
 			title: "Radon"
@@ -1243,10 +1240,9 @@
 			shape: "rsquare"
 			size: 0.66d
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:epichlorohydrin"
-				id: "6F7D0A5B17A27928"
-				type: "fluid"
+				id: "45620325962A91D0"
+				item: "gtceu:epichlorohydrin_bucket"
+				type: "item"
 			}]
 			title: "Epichlorohydrin"
 			x: 2.25d
@@ -1281,10 +1277,9 @@
 			shape: "rsquare"
 			size: 0.66d
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:phenol"
-				id: "6255085946669894"
-				type: "fluid"
+				id: "5F713348547742D9"
+				item: "gtceu:phenol_bucket"
+				type: "item"
 			}]
 			title: "Phenol"
 			x: 2.25d
@@ -1307,10 +1302,9 @@
 			shape: "rsquare"
 			size: 0.66d
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:acetone"
-				id: "1E3E5800E5C37353"
-				type: "fluid"
+				id: "78BFA0425B39316A"
+				item: "gtceu:acetone_bucket"
+				type: "item"
 			}]
 			title: "Acetone"
 			x: 2.25d
@@ -1332,13 +1326,6 @@
 			size: 0.75d
 			subtitle: "An alternate rubber"
 			tasks: [
-				{
-					amount: 1296L
-					fluid: "gtceu:silicone_rubber"
-					id: "3C29253DA5DAF778"
-					optional_task: true
-					type: "fluid"
-				}
 				{
 					id: "3E2FBCED1C782E7C"
 					item: {
@@ -1410,10 +1397,9 @@
 			shape: "rsquare"
 			size: 0.66d
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:gasoline"
-				id: "020DE8D27206C260"
-				type: "fluid"
+				id: "2D073A538A19BCDD"
+				item: "gtceu:gasoline_bucket"
+				type: "item"
 			}]
 			title: "Gasoline"
 			x: 1.125d
@@ -1432,10 +1418,9 @@
 			shape: "rsquare"
 			size: 0.66d
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:high_octane_gasoline"
-				id: "19A221C5CEFBFBFD"
-				type: "fluid"
+				id: "5C03BCF778B6293A"
+				item: "gtceu:high_octane_gasoline_bucket"
+				type: "item"
 			}]
 			title: "High Octane Gasoline"
 			x: 0.0d
@@ -1492,28 +1477,24 @@
 			size: 0.66d
 			tasks: [
 				{
-					amount: 1000000L
-					fluid: "gtceu:oxygen"
-					id: "1EE14254AE07512F"
-					type: "fluid"
+					id: "692E848C43205905"
+					item: "gtceu:oxygen_bucket"
+					type: "item"
 				}
 				{
-					amount: 1000000L
-					fluid: "gtceu:nitrogen"
-					id: "5B8A8FE5DEFE0671"
-					type: "fluid"
+					id: "1EF11FF81D5E6135"
+					item: "gtceu:nitrogen_bucket"
+					type: "item"
 				}
 				{
-					amount: 64000L
-					fluid: "gtceu:helium"
-					id: "3ED5E362F1E5D701"
-					type: "fluid"
+					id: "2654CD00A7193574"
+					item: "gtceu:helium_bucket"
+					type: "item"
 				}
 				{
-					amount: 32000L
-					fluid: "gtceu:argon"
-					id: "67F58B2FC8210270"
-					type: "fluid"
+					id: "2C54EC0AABA91D39"
+					item: "gtceu:argon_bucket"
+					type: "item"
 				}
 			]
 			title: "True Distillation: Air"
@@ -1564,28 +1545,24 @@
 			size: 0.66d
 			tasks: [
 				{
-					amount: 40000L
-					fluid: "gtceu:benzene"
-					id: "6584A238101E369D"
-					type: "fluid"
+					id: "1B0AD1105DEBBBC2"
+					item: "gtceu:benzene_bucket"
+					type: "item"
 				}
 				{
-					amount: 10000L
-					fluid: "gtceu:butadiene"
-					id: "1698E9791C31C10E"
-					type: "fluid"
+					id: "109534199B99AD2A"
+					item: "gtceu:butadiene_bucket"
+					type: "item"
 				}
 				{
-					amount: 64000L
-					fluid: "gtceu:ethylene"
-					id: "4274E80169CCBDE5"
-					type: "fluid"
+					id: "33D42013817BF007"
+					item: "gtceu:ethylene_bucket"
+					type: "item"
 				}
 				{
-					amount: 64000L
-					fluid: "gtceu:methane"
-					id: "3CB67401C15B84A7"
-					type: "fluid"
+					id: "0A3EED37CD163A73"
+					item: "gtceu:methane_bucket"
+					type: "item"
 				}
 			]
 			title: "True Distillation: Fuel"
@@ -1620,53 +1597,39 @@
 			size: 0.66d
 			tasks: [
 				{
-					amount: 16000L
-					fluid: "gtceu:phenol"
-					id: "09C91BF9591202CC"
-					title: "Phenol"
-					type: "fluid"
+					id: "50A51E293CF77CDC"
+					item: "gtceu:phenol_bucket"
+					type: "item"
 				}
 				{
-					amount: 64000L
-					fluid: "gtceu:benzene"
-					id: "2272D1322991506C"
-					title: "Benzene"
-					type: "fluid"
+					id: "1A3F5CC1F2AE86D7"
+					item: "gtceu:benzene_bucket"
+					type: "item"
 				}
 				{
-					amount: 16000L
-					fluid: "gtceu:toluene"
-					id: "6B0F17B12A7E541A"
-					title: "Toluene"
-					type: "fluid"
+					id: "69FFE6E6FD6E2198"
+					item: "gtceu:toluene_bucket"
+					type: "item"
 				}
 				{
-					amount: 32000L
-					fluid: "gtceu:dimethylbenzene"
-					id: "0D90630744975DF9"
-					title: "Dimethylbenzene"
-					type: "fluid"
+					id: "4CEA0DC5DED2BC42"
+					item: "gtceu:dimethylbenzene_bucket"
+					type: "item"
 				}
 				{
-					amount: 16000L
-					fluid: "gtceu:acetic_acid"
-					id: "40A54366F789C104"
-					title: "Acetic Acid"
-					type: "fluid"
+					id: "6649B70C143E163A"
+					item: "gtceu:acetic_acid_bucket"
+					type: "item"
 				}
 				{
-					amount: 32000L
-					fluid: "gtceu:methanol"
-					id: "7064FF6DA67EFC0B"
-					title: "Methanol"
-					type: "fluid"
+					id: "73AEFD316B4C5605"
+					item: "gtceu:methanol_bucket"
+					type: "item"
 				}
 				{
-					amount: 8000L
-					fluid: "gtceu:acetone"
-					id: "209CCB68CBB8E9CD"
-					title: "Acetone"
-					type: "fluid"
+					id: "50ACCD4B9ACD8C13"
+					item: "gtceu:acetone_bucket"
+					type: "item"
 				}
 			]
 			title: "True Distillation: Organic"
@@ -1792,6 +1755,52 @@
 			x: 7.875d
 			y: 5.625d
 		}
+		{
+			dependencies: [
+				"4AFD3073C731A1E4"
+				"7FA0ACB7F161F378"
+			]
+			description: [
+				"Need to handle &6multiple&r fluid inputs and outputs? Look no further - these &aFluid Hatches&r can handle more than one fluid at once!"
+				""
+				"These cannot be used in a &bDistillation Tower&r, but may be particularly useful in &5Large Chemical Reactors&r."
+			]
+			id: "6BB13E775A579F2E"
+			shape: "rsquare"
+			size: 0.66d
+			tasks: [{
+				id: "3B898812B1C35440"
+				item: {
+					Count: 1b
+					id: "itemfilters:or"
+					tag: {
+						items: [
+							{
+								Count: 1b
+								id: "gtceu:ev_input_hatch_4x"
+							}
+							{
+								Count: 1b
+								id: "gtceu:ev_input_hatch_9x"
+							}
+							{
+								Count: 1b
+								id: "gtceu:ev_output_hatch_4x"
+							}
+							{
+								Count: 1b
+								id: "gtceu:ev_output_hatch_9x"
+							}
+						]
+					}
+				}
+				title: "Multiple Fluid Hatches"
+				type: "item"
+			}]
+			title: "Multiple Fluid Hatches"
+			x: 6.75d
+			y: 5.625d
+		}
 	]
 	subtitle: ["Improve your infrastructure and parallelise your setups"]
 	title: "&5EV&r - Extreme Voltage"
diff --git a/config/ftbquests/quests/chapters/gtceu.snbt b/config/ftbquests/quests/chapters/gtceu.snbt
index 25b0024..61f1c45 100644
--- a/config/ftbquests/quests/chapters/gtceu.snbt
+++ b/config/ftbquests/quests/chapters/gtceu.snbt
@@ -8,6 +8,9 @@
 		id: "gtceu:iron_wrench"
 		tag: {
 			Damage: 0
+			GT.Tool: {
+				Damage: 0
+			}
 		}
 	}
 	id: "2F8B0AFE317363C9"
@@ -45,9 +48,9 @@
 			description: [
 				"&o\"My adventure starts with some tree punching!? Huh, I thought GregTech was supposed to shake things up a bit...\"&r"
 				""
-				"If you're familiar with GregTech, you may be aware of its &cmany nerfs&r to vanilla recipes. GTCEu does include its fair share - take a look at the crafting recipes for &eBuckets&r or &ePaper&r. However, we'll ease off in earlygame, and 1 Log will give you 4 Planks. &aRejoice!&r"
+				"If you're familiar with GregTech, you may be aware of its &cmany nerfs&r to vanilla recipes. GTCEu does include its fair share - take a look at the crafting recipes for &eBuckets&r or &ePaper&r. However, we'll ease off the insanity in earlygame, and 1 Log will give you 4 Planks. &aRejoice!&r"
 				""
-				"Here, take this Prospector. You can use it to scan for ores underground - this should give you a small boost."
+				"Here, take this &6Prospector&r. You can use it to scan for ores underground - this should give you a small boost."
 			]
 			icon: "minecraft:oak_log"
 			id: "0EAF2C5B5EB755C5"
@@ -153,7 +156,7 @@
 				""
 				"The full extent of ore generation is explained in the Tips and Tricks tab, but here is what you need to know:"
 				""
-				"&9-&r Ore veins generate in a &4Grid&r. Every vein is &9spaced by 3 chunks&r from one to another in a cardinal direction."
+				"&9-&r Ore veins generate in a &4Grid&r. Every vein is &9spaced by (approximately) 3 chunks&r from one to another in a cardinal direction."
 				""
 				"&9-&r It's a good practice to make &dWaypoints&r (default &4B&r) for every vein you find, and to label their type. You may want to come back to the vein several times."
 			]
@@ -186,6 +189,9 @@
 				id: "gtceu:steel_axe"
 				tag: {
 					Damage: 0
+					GT.Tool: {
+						Damage: 0
+					}
 				}
 			}
 			id: "13354F24F80F65FB"
@@ -280,6 +286,9 @@
 					id: "gtceu:steel_hammer"
 					tag: {
 						Damage: 0
+						GT.Tool: {
+							Damage: 0
+						}
 					}
 				}
 				id: "1A4DDB914D7D2F3C"
@@ -313,6 +322,9 @@
 				id: "gtceu:steel_mining_hammer"
 				tag: {
 					Damage: 0
+					GT.Tool: {
+						Damage: 0
+					}
 				}
 			}
 			id: "4A365A7CC9E374F9"
@@ -325,6 +337,9 @@
 					id: "gtceu:steel_mining_hammer"
 					tag: {
 						Damage: 0
+						GT.Tool: {
+							Damage: 0
+						}
 					}
 				}
 				id: "4F372C393ADC6CE2"
@@ -432,6 +447,9 @@
 				id: "gtceu:iron_wrench"
 				tag: {
 					Damage: 0
+					GT.Tool: {
+						Damage: 0
+					}
 				}
 			}
 			id: "2001CB4968D3E0A2"
@@ -511,6 +529,9 @@
 				id: "gtceu:iron_screwdriver"
 				tag: {
 					Damage: 0
+					GT.Tool: {
+						Damage: 0
+					}
 				}
 			}
 			id: "5C3501DD3B4788FA"
@@ -785,6 +806,11 @@
 			]
 			icon: "minecraft:structure_void"
 			id: "1283B4D7B5D82193"
+			rewards: [{
+				id: "460EC827273306A5"
+				item: "storagedrawers:quantify_key"
+				type: "item"
+			}]
 			shape: "rsquare"
 			size: 0.66d
 			subtitle: "Omw to install DecoCraft"
@@ -840,6 +866,9 @@
 						id: "gtceu:iron_shovel"
 						tag: {
 							Damage: 0
+							GT.Tool: {
+								Damage: 0
+							}
 						}
 					}
 					type: "item"
@@ -851,6 +880,9 @@
 						id: "gtceu:iron_axe"
 						tag: {
 							Damage: 0
+							GT.Tool: {
+								Damage: 0
+							}
 						}
 					}
 					type: "item"
diff --git a/config/ftbquests/quests/chapters/heating_coils.snbt b/config/ftbquests/quests/chapters/heating_coils.snbt
index 6f41435..e263bbb 100644
--- a/config/ftbquests/quests/chapters/heating_coils.snbt
+++ b/config/ftbquests/quests/chapters/heating_coils.snbt
@@ -131,17 +131,21 @@
 		}
 		{
 			dependencies: ["6958029B5514D4EC"]
+			description: ["Nichrome will require your &aElectric Blast Furnace&r to be at least &6HV&r, with &bKanthal&r coils to boot."]
 			id: "1CBA5477CB7C45E7"
 			shape: "rsquare"
 			size: 0.66d
+			subtitle: "Operation Nichrome Dome"
 			tasks: [{
 				id: "1104AC52E0A0A472"
 				item: "gtceu:nichrome_ingot"
 				type: "item"
 			}]
+			title: "Nichrome"
 			x: 0.5d
 			y: -6.5d
 		}
 	]
+	subtitle: ["Coil Headed"]
 	title: "Heating Coils"
 }
diff --git a/config/ftbquests/quests/chapters/hv__high_voltage.snbt b/config/ftbquests/quests/chapters/hv__high_voltage.snbt
index 9c88679..6ac7adf 100644
--- a/config/ftbquests/quests/chapters/hv__high_voltage.snbt
+++ b/config/ftbquests/quests/chapters/hv__high_voltage.snbt
@@ -397,14 +397,13 @@
 					type: "item"
 				}
 				{
-					amount: 1000L
-					fluid: "gtceu:sodium_potassium"
-					id: "2DF33EF0321AB809"
+					id: "3CB30E3B0B6353C2"
+					item: "gtceu:sodium_potassium_bucket"
 					optional_task: true
-					type: "fluid"
+					type: "item"
 				}
 				{
-					id: "22E204ADB8257706"
+					id: "1ABDABD68D1C6E50"
 					item: "gtceu:hv_energy_input_hatch"
 					type: "item"
 				}
@@ -491,10 +490,9 @@
 			id: "727075AAF9F91FAE"
 			size: 0.75d
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:titanium_tetrachloride"
-				id: "7C9AC37E86D3398F"
-				type: "fluid"
+				id: "334DB53CC12726B0"
+				item: "gtceu:titanium_tetrachloride_bucket"
+				type: "item"
 			}]
 			title: "Almost Titanium²"
 			x: 5.625d
@@ -825,10 +823,9 @@
 			shape: "rsquare"
 			size: 0.66d
 			tasks: [{
-				amount: 16000L
-				fluid: "gtceu:fluorine"
-				id: "27DBF159ADE55257"
-				type: "fluid"
+				id: "4ABE8033182CF48D"
+				item: "gtceu:fluorine_bucket"
+				type: "item"
 			}]
 			title: "Fluorine"
 			x: 5.625d
@@ -860,21 +857,19 @@
 			subtitle: "A.K.A - Teflon"
 			tasks: [
 				{
-					amount: 1000L
-					fluid: "gtceu:hydrofluoric_acid"
-					id: "39D0D1DEEFAD2830"
+					id: "24886FDFB1DE74E0"
+					item: "gtceu:hydrofluoric_acid_bucket"
 					optional_task: true
-					type: "fluid"
+					type: "item"
 				}
 				{
-					amount: 1000L
-					fluid: "gtceu:chloroform"
-					id: "28B5614D97C82AB8"
+					id: "690DEB428063A459"
+					item: "gtceu:chloroform_bucket"
 					optional_task: true
-					type: "fluid"
+					type: "item"
 				}
 				{
-					id: "62C0D8E62DC90BD5"
+					id: "3B4E4FCF434149E8"
 					item: "gtceu:polytetrafluoroethylene_plate"
 					type: "item"
 				}
@@ -904,10 +899,9 @@
 			shape: "rsquare"
 			size: 0.66d
 			tasks: [{
-				amount: 40000L
-				fluid: "gtceu:nitrobenzene"
-				id: "0BC043068EE4C69A"
-				type: "fluid"
+				id: "2A28EC2D53F6AF99"
+				item: "gtceu:nitrobenzene_bucket"
+				type: "item"
 			}]
 			title: "Benzene Nitro"
 			x: 9.0d
@@ -988,13 +982,6 @@
 			id: "2B7B214EDE0B45A2"
 			size: 0.75d
 			tasks: [
-				{
-					amount: 1000L
-					fluid: "gtceu:toluene"
-					id: "1B1BAB5824FA20A9"
-					optional_task: true
-					type: "fluid"
-				}
 				{
 					id: "1CB85F57BA45252D"
 					item: "gtceu:gelled_toluene"
@@ -1091,6 +1078,7 @@
 				{
 					id: "2CD60F6FFD4C1DFF"
 					item: "gtceu:hv_laser_engraver"
+					optional_task: true
 					type: "item"
 				}
 			]
@@ -1148,10 +1136,9 @@
 			size: 0.75d
 			subtitle: "This won't eat your skin"
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:nitric_acid"
-				id: "30DA5B5D735254AD"
-				type: "fluid"
+				id: "0C851DC9BF5BBC3D"
+				item: "gtceu:nitric_acid_bucket"
+				type: "item"
 			}]
 			title: "Nitric Acid"
 			x: 6.75d
@@ -1179,10 +1166,9 @@
 			size: 0.66d
 			subtitle: "This is to go further beyond"
 			tasks: [{
-				amount: 50000L
-				fluid: "gtceu:cetane_boosted_diesel"
-				id: "150FF5579CA17796"
-				type: "fluid"
+				id: "122E070F32AB100B"
+				item: "gtceu:cetane_boosted_diesel_bucket"
+				type: "item"
 			}]
 			title: "Cetane-boosted Diesel"
 			x: 7.875d
@@ -1283,8 +1269,11 @@
 				"&aAmmonia&r is &doptional&r in &6HV&r."
 				""
 				"You may use it in the production of:"
+				""
 				"&9-&r Nitric Acid, although we don't recommend this."
+				""
 				"&9-&r Rocket Fuel, required for Nether Stars in &1IV&r."
+				""
 				"&9-&r Polybenzimidazole (now THAT'S a tongue twister!) in &1IV&r."
 				""
 				"The \"least painful\" recipe should be the one in the &3HV Chemical Reactor&r. Make sure your &aHydrogen&r production (mostly from &aWater electrolysis&r) is enough to support the demand."
@@ -1296,10 +1285,9 @@
 			shape: "rsquare"
 			size: 0.66d
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:ammonia"
-				id: "5D4330FDC189D42D"
-				type: "fluid"
+				id: "54C9440D952AD14D"
+				item: "gtceu:ammonia_bucket"
+				type: "item"
 			}]
 			title: "Ammonia"
 			x: 6.75d
diff --git a/config/ftbquests/quests/chapters/iv__insane_voltage.snbt b/config/ftbquests/quests/chapters/iv__insane_voltage.snbt
index 260827f..f840324 100644
--- a/config/ftbquests/quests/chapters/iv__insane_voltage.snbt
+++ b/config/ftbquests/quests/chapters/iv__insane_voltage.snbt
@@ -190,13 +190,6 @@
 			size: 0.75d
 			subtitle: "GTCEu's toughest polymer!"
 			tasks: [
-				{
-					amount: 1000L
-					fluid: "gtceu:polybenzimidazole"
-					id: "5971118ED25AC71A"
-					optional_task: true
-					type: "fluid"
-				}
 				{
 					id: "7C5D37940A0C8409"
 					item: "gtceu:polybenzimidazole_ingot"
@@ -714,11 +707,11 @@
 			description: [
 				"This part of the chain starts by obtaining some &aRarest Metal Mixture&r."
 				""
-				"You'll need at least an &1IV&r &3Large Chemical Reactor&r, but the average power draw isn't too bad."
+				"You'll need at least an &9IV&r &3Large Chemical Reactor&r, but the average power draw isn't too bad."
 				""
 				"&dChlorine&r is fully looped, and &dHydrogen&r is slightly negative (&ounless you put Acidic Osmium Solution in the Distillation Tower and electrolyze the water back... on second thoughts, don't do that&r)."
 				""
-				"&aIridium&r is required to progress through &1IV&r, so get your PGS line automated ASAP!"
+				"&aIridium&r is required to progress through &9IV&r, so get your PGS line automated ASAP!"
 			]
 			icon: "gtceu:iridium_ingot"
 			id: "216E5A3574AC08BF"
@@ -961,11 +954,11 @@
 			id: "1B520580219AFAE9"
 			shape: "rsquare"
 			size: 0.66d
+			subtitle: "Honey, where are my Microverse Projectors?"
 			tasks: [{
-				amount: 6000L
-				fluid: "gtceu:rocket_fuel"
-				id: "040946A4E48F28E8"
-				type: "fluid"
+				id: "659880DCA297ED7A"
+				item: "gtceu:rocket_fuel_bucket"
+				type: "item"
 			}]
 			title: "Rocket Fuel"
 			x: 6.0d
@@ -1083,5 +1076,5 @@
 		}
 	]
 	subtitle: ["Automate everything and learn how to assemble"]
-	title: "&1IV&r - Insane Voltage"
+	title: "&9IV&r - Insane Voltage"
 }
diff --git a/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt b/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt
index 06d18cc..d6e25c7 100644
--- a/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt
+++ b/config/ftbquests/quests/chapters/luv__ludicrous_voltage.snbt
@@ -130,10 +130,9 @@
 			size: 0.66d
 			subtitle: "Absolutely beneficial for the environment"
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:pcb_coolant"
-				id: "32BCECCE276F913D"
-				type: "fluid"
+				id: "10FAF765725C7790"
+				item: "gtceu:pcb_coolant_bucket"
+				type: "item"
 			}]
 			title: "Dielectric PCB Coolant"
 			x: 2.25d
@@ -409,10 +408,9 @@
 			size: 0.75d
 			subtitle: "Do not touch the acid"
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:fluoroantimonic_acid"
-				id: "0495EEA395A1B5EC"
-				type: "fluid"
+				id: "1D674C3951223E8C"
+				item: "gtceu:fluoroantimonic_acid_bucket"
+				type: "item"
 			}]
 			title: "Naquadah Chain"
 			x: 1.125d
diff --git a/config/ftbquests/quests/chapters/lv__low_voltage.snbt b/config/ftbquests/quests/chapters/lv__low_voltage.snbt
index 5c63e9f..cc9bdfe 100644
--- a/config/ftbquests/quests/chapters/lv__low_voltage.snbt
+++ b/config/ftbquests/quests/chapters/lv__low_voltage.snbt
@@ -1063,7 +1063,7 @@
 				""
 				"You could then make use of an &3Assembler&r to use your molten Rubber for &aCables&r. This isn't important for Tin Cables, but better cables will &eneed&r to be made in the Assembler."
 				""
-				"&eNote:&r Submit a fluid by having it stored in &lany&r tank in your inventory. A Drum is the perfect candidate."
+				"&eNote:&r Submit a fluid by having it stored in a &lbucket&r in your inventory. Sorry - it's an FTB Quests quirk."
 			]
 			icon: "gtceu:lv_chemical_reactor"
 			id: "3D98819A799D2E64"
@@ -1076,10 +1076,9 @@
 					type: "item"
 				}
 				{
-					amount: 1296L
-					fluid: "gtceu:rubber"
-					id: "75DD10F659BA5406"
-					type: "fluid"
+					id: "52581CFF25BC339F"
+					item: "gtceu:rubber_bucket"
+					type: "item"
 				}
 			]
 			title: "Basic Chemical Reactor"
@@ -1558,7 +1557,7 @@
 				""
 				"The fourth best source according to us (!) is &ato not void&r it, EVER! Any Oxygen obtained from any source is worth something and should be stored in Tanks."
 				""
-				"&eNote:&r Submit a fluid by having it stored in &lany&r tank in your inventory. A bucket will also work."
+				"&eNote:&r Submit a fluid by having it stored in a &lbucket&r in your inventory. Sorry - it's an FTB Quests quirk."
 			]
 			icon: "gtceu:oxygen_bucket"
 			id: "1A77CA35F054F988"
@@ -1566,10 +1565,9 @@
 			size: 0.66d
 			subtitle: "Achtually, it's Dioxygen..."
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:oxygen"
-				id: "70F00C67C9698A78"
-				type: "fluid"
+				id: "1F76ED94CDBD13E1"
+				item: "gtceu:oxygen_bucket"
+				type: "item"
 			}]
 			title: "Breath of Fresh Oxygen"
 			x: -1.125d
@@ -1582,7 +1580,7 @@
 				""
 				"Give yourself a headstart and get on producing Glue. You can use it to make &6cheaper Resistors&r, as well as &6cheaper Circuit Boards&r in the &3Assembling Machine&r (and it is especially useful &oin the near future&r)."
 				""
-				"&eNote:&r Submit a fluid by having it stored in &lany&r tank in your inventory. A bucket will also work."
+				"&eNote:&r Submit a fluid by having it stored in a &lbucket&r in your inventory. Sorry - it's an FTB Quests quirk."
 			]
 			icon: "gtceu:glue_bucket"
 			id: "0EAC071414AEC07E"
@@ -1595,10 +1593,9 @@
 			size: 0.75d
 			subtitle: "Extractor? I hardly knew 'er!"
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:glue"
-				id: "3DD156ECA99FFA11"
-				type: "fluid"
+				id: "284F6584EEEF3AD6"
+				item: "gtceu:glue_bucket"
+				type: "item"
 			}]
 			title: "Glued"
 			x: 0.0d
diff --git a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt
index aa42f2a..e9a35eb 100644
--- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt
+++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt
@@ -90,10 +90,9 @@
 			size: 0.66d
 			subtitle: "Plants aren't industrial enough!"
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:biomass"
-				id: "538F04658EF11F2B"
-				type: "fluid"
+				id: "4FBD476EB6B6DD04"
+				item: "gtceu:biomass_bucket"
+				type: "item"
 			}]
 			title: "Biomass"
 			x: 0.0d
@@ -121,11 +120,10 @@
 					type: "item"
 				}
 				{
-					amount: 1000L
-					fluid: "gtceu:lubricant"
-					id: "1C0C8D71AF8C41C2"
+					id: "1CB0F32E8293B5D7"
+					item: "gtceu:lubricant_bucket"
 					optional_task: true
-					type: "fluid"
+					type: "item"
 				}
 			]
 			title: "Local Brewery selling Booze"
@@ -152,10 +150,9 @@
 			size: 0.75d
 			subtitle: "One of many hydrocarbons"
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:ethylene"
-				id: "3A731EA79DC53FF3"
-				type: "fluid"
+				id: "29191DABA0ACE155"
+				item: "gtceu:ethylene_bucket"
+				type: "item"
 			}]
 			title: "Ethylene"
 			x: 1.125d
@@ -179,10 +176,9 @@
 			size: 0.66d
 			subtitle: "Yo, wait - that's alcohol!"
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:ethanol"
-				id: "32A6A0A1AD2420B5"
-				type: "fluid"
+				id: "6D7350EA7AB6CF25"
+				item: "gtceu:ethanol_bucket"
+				type: "item"
 			}]
 			title: "Ethanol"
 			x: 0.0d
@@ -204,16 +200,15 @@
 			size: 0.66d
 			tasks: [
 				{
-					amount: 1000L
-					fluid: "gtceu:sulfuric_naphtha"
-					id: "52B84DA79A608865"
-					type: "fluid"
+					id: "01BF2D557A9EF2B0"
+					item: "gtceu:sulfuric_naphtha_bucket"
+					optional_task: true
+					type: "item"
 				}
 				{
-					amount: 1000L
-					fluid: "gtceu:naphtha"
-					id: "688B65D39AB8C533"
-					type: "fluid"
+					id: "75B40C6A92BB88B5"
+					item: "gtceu:naphtha_bucket"
+					type: "item"
 				}
 			]
 			title: "Naphtha"
@@ -238,10 +233,9 @@
 			size: 0.66d
 			subtitle: "Fuel and oil cracking can get complicated..."
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:severely_steam_cracked_naphtha"
-				id: "7CC9EB9D859AC860"
-				type: "fluid"
+				id: "5687D81E6BFDC7E0"
+				item: "gtceu:severely_steam_cracked_naphtha_bucket"
+				type: "item"
 			}]
 			title: "Fuel Cracking"
 			x: 0.0d
@@ -934,6 +928,7 @@
 				{
 					id: "2EACE2CF99B4B3D3"
 					item: "gtceu:ram_wafer"
+					optional_task: true
 					type: "item"
 				}
 				{
@@ -1392,16 +1387,14 @@
 			subtitle: "Let's etch some Copper off Circuit Boards!"
 			tasks: [
 				{
-					amount: 1000L
-					fluid: "gtceu:sodium_persulfate"
-					id: "4DB5BD79EF3A89CD"
-					type: "fluid"
+					id: "118468CD578081CF"
+					item: "gtceu:sodium_persulfate_bucket"
+					type: "item"
 				}
 				{
-					amount: 1000L
-					fluid: "gtceu:iron_iii_chloride"
-					id: "1A3BFA0BCD0FE977"
-					type: "fluid"
+					id: "1B7EDF573783D986"
+					item: "gtceu:iron_iii_chloride_bucket"
+					type: "item"
 				}
 			]
 			title: "Sodium Persulfate / Iron III Chloride"
@@ -1430,10 +1423,9 @@
 			shape: "square"
 			size: 0.75d
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:sulfuric_acid"
-				id: "3A6BB63D057CB4C1"
-				type: "fluid"
+				id: "06B5F04DEFC12458"
+				item: "gtceu:sulfuric_acid_bucket"
+				type: "item"
 			}]
 			title: "Sulfuric Acid"
 			x: 1.125d
@@ -1461,10 +1453,9 @@
 			id: "64CACABB48635904"
 			size: 0.66d
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:hydrochloric_acid"
-				id: "0E914778748C954B"
-				type: "fluid"
+				id: "34147C1DD7B8DE55"
+				item: "gtceu:hydrochloric_acid_bucket"
+				type: "item"
 			}]
 			title: "Hydrochloric Acid"
 			x: 3.375d
@@ -1706,10 +1697,9 @@
 					type: "item"
 				}
 				{
-					amount: 32000L
-					fluid: "gtceu:oil"
-					id: "1DAA9C9BBD9118E3"
-					type: "fluid"
+					id: "23448126F81BDA89"
+					item: "gtceu:oil_bucket"
+					type: "item"
 				}
 			]
 			title: "US Simulator"
@@ -1751,15 +1741,8 @@
 				{
 					id: "1838F842C9D12880"
 					item: "gtceu:oilsands_dust"
-					optional_task: true
 					type: "item"
 				}
-				{
-					amount: 16000L
-					fluid: "gtceu:oil"
-					id: "0FBA08831B6ACC88"
-					type: "fluid"
-				}
 			]
 			title: "America Simulator"
 			x: -2.25d
@@ -1844,22 +1827,19 @@
 			subtitle: "Whoever smelt it..."
 			tasks: [
 				{
-					amount: 8000L
-					fluid: "gtceu:refinery_gas"
-					id: "38CB42385A6EC17A"
-					type: "fluid"
+					id: "027B41ACE1566E28"
+					item: "gtceu:refinery_gas_bucket"
+					type: "item"
 				}
 				{
-					amount: 32000L
-					fluid: "gtceu:methane"
-					id: "4AB130A15CFC7A56"
-					type: "fluid"
+					id: "0ABB837337D9CAF9"
+					item: "gtceu:methane_bucket"
+					type: "item"
 				}
 				{
-					amount: 32000L
-					fluid: "gtceu:lpg"
-					id: "79FEB48F1A4555C4"
-					type: "fluid"
+					id: "401B9B85969AE681"
+					item: "gtceu:lpg_bucket"
+					type: "item"
 				}
 			]
 			title: "The Church of Natural Farts"
@@ -1885,10 +1865,9 @@
 			id: "00E1A728E6F6D6A0"
 			size: 0.66d
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:benzene"
-				id: "7A452201C64FBB89"
-				type: "fluid"
+				id: "4E9EBCCCC7BBAFDD"
+				item: "gtceu:benzene_bucket"
+				type: "item"
 			}]
 			title: "The Church of Benzene"
 			x: -2.25d
@@ -1910,16 +1889,15 @@
 			size: 0.66d
 			tasks: [
 				{
-					amount: 1000L
-					fluid: "gtceu:sulfuric_light_fuel"
-					id: "236B5EB787DBCE64"
-					type: "fluid"
+					id: "6E4D818CE088D7D4"
+					item: "gtceu:sulfuric_light_fuel_bucket"
+					optional_task: true
+					type: "item"
 				}
 				{
-					amount: 1000L
-					fluid: "gtceu:light_fuel"
-					id: "4ED6B22C7B662325"
-					type: "fluid"
+					id: "36D70C00EF5171D6"
+					item: "gtceu:light_fuel_bucket"
+					type: "item"
 				}
 			]
 			title: "Light Fuel"
@@ -1964,10 +1942,9 @@
 			size: 0.66d
 			subtitle: "Mother, how is diesel made?"
 			tasks: [{
-				amount: 30000L
-				fluid: "gtceu:diesel"
-				id: "24373463B7296EE0"
-				type: "fluid"
+				id: "10BAA54947D975AF"
+				item: "gtceu:diesel_bucket"
+				type: "item"
 			}]
 			title: "The Church of Diesel"
 			x: -2.25d
diff --git a/config/ftbquests/quests/chapters/ore_generation.snbt b/config/ftbquests/quests/chapters/ore_generation.snbt
index 5a96c0d..7817960 100644
--- a/config/ftbquests/quests/chapters/ore_generation.snbt
+++ b/config/ftbquests/quests/chapters/ore_generation.snbt
@@ -64,15 +64,13 @@
 				"{@pagebreak}"
 				"It's a good practice to make &dWaypoints&r to every vein you find, and to label their type. You may want to come back to it several times."
 				""
-				"Each Ore vein is always &d7 blocks&r tall, and ores generate in 4 different patterns:"
+				"A typical Ore vein is &d7 blocks&r tall, and ores generate in 4 different patterns:"
 				"- The &9Top Ore&r generates in the higher 4 layers of the vein."
 				"- The &9Bottom Ore&r generates in the lower 3 layers of the vein."
 				"- The &9Between Ore&r generates in the middle 3 layers of the vein."
 				"- The &9Sporadic Ore&r generates anywhere in the vein. There will be the least amount of this ore in a vein."
 				""
 				"The same ore type can be in 2 different generation patterns, such as in Cassiterite veins."
-				""
-				"In &6LV&r Age, you can craft an Ore Prospector to assist yourself in finding ores."
 			]
 			icon: "gtceu:cobalt_ore"
 			id: "41730E340B3D8EDA"
@@ -1315,5 +1313,6 @@
 			y: 3.0d
 		}
 	]
+	subtitle: ["Ores galore, and so much more"]
 	title: "Ore Generation"
 }
diff --git a/config/ftbquests/quests/chapters/steam_age.snbt b/config/ftbquests/quests/chapters/steam_age.snbt
index d48f2a4..202bdc0 100644
--- a/config/ftbquests/quests/chapters/steam_age.snbt
+++ b/config/ftbquests/quests/chapters/steam_age.snbt
@@ -104,10 +104,13 @@
 				""
 				"The &3Liquid Boiler&r burns either &dLava&r or &dCreosote&r."
 				""
+				"The &3Solar Boiler&r burns nothing - it's fueled by the sun."
+				""
 				"Looking for a recommendation? Honestly, either goes, as both boilers are equivalent in generation. Craft the boiler that best suits your preferred resource."
 				""
 				"Get &eeither&r of the two proposed boilers to complete this quest."
 			]
+			icon: "gtceu:hp_steam_solid_boiler"
 			id: "2FD75E4BD95F6645"
 			rewards: [
 				{
@@ -132,7 +135,7 @@
 			shape: "square"
 			size: 0.75d
 			tasks: [{
-				id: "527DBAE609FF5B13"
+				id: "0DC74FB54995F3F1"
 				item: {
 					Count: 1b
 					id: "itemfilters:or"
@@ -146,10 +149,14 @@
 								Count: 1b
 								id: "gtceu:hp_steam_liquid_boiler"
 							}
+							{
+								Count: 1b
+								id: "gtceu:hp_steam_solar_boiler"
+							}
 						]
 					}
 				}
-				title: "Any boiler works here."
+				title: "High Pressure Boilers"
 				type: "item"
 			}]
 			title: "High Pressure"
@@ -268,7 +275,7 @@
 				""
 				"The &4Nether&r has more veins to mine, and with those veins, new ores to discover. Check the Ore Tab to learn more about the Nether Veins."
 				""
-				"Additionally, &6Nether Ores are worth two Overworld Ores&r if mined with &3Silk Touch&r."
+				"Additionally, &6Nether Ores are worth two Overworld Ores&r if mined with &3Silk Touch&r. It'd be great if you could craft the book directly, huh? ;)"
 				"{@pagebreak}"
 				"&4Nether&r veins will take more effort to find - and are more dangerous to mine - than &2Overworld&r veins. Keep on top of your mining by using Waypoints."
 				""
@@ -286,6 +293,9 @@
 						id: "gtceu:red_steel_pickaxe"
 						tag: {
 							Damage: 0
+							GT.Tool: {
+								Damage: 0
+							}
 						}
 					}
 					type: "item"
@@ -633,6 +643,7 @@
 				{
 					id: "04946F2F0923EFFE"
 					item: "gtceu:rubber_ingot"
+					optional_task: true
 					type: "item"
 				}
 				{
@@ -1092,6 +1103,9 @@
 							id: "minecraft:efficiency"
 							lvl: 1s
 						}]
+						GT.Tool: {
+							Damage: 0
+						}
 					}
 				}
 				type: "item"
diff --git a/config/ftbquests/quests/chapters/tips_and_tricks_2.snbt b/config/ftbquests/quests/chapters/tips_and_tricks_2.snbt
index 4c2d301..41fc1b5 100644
--- a/config/ftbquests/quests/chapters/tips_and_tricks_2.snbt
+++ b/config/ftbquests/quests/chapters/tips_and_tricks_2.snbt
@@ -744,5 +744,6 @@
 			y: 0.0d
 		}
 	]
+	subtitle: ["For the Modern Minecrafter"]
 	title: "Tips and Tricks"
 }
diff --git a/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt b/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt
index 81edf93..3d24102 100644
--- a/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt
+++ b/config/ftbquests/quests/chapters/uv__ultimate_voltage.snbt
@@ -58,6 +58,9 @@
 				id: "gtceu:iron_wrench"
 				tag: {
 					Damage: 0
+					GT.Tool: {
+						Damage: 0
+					}
 				}
 			}
 			id: "6E8F257261F93501"
diff --git a/config/ftbquests/quests/chapters/zpm__zero_point_module.snbt b/config/ftbquests/quests/chapters/zpm__zero_point_module.snbt
index 30c78d5..0e26096 100644
--- a/config/ftbquests/quests/chapters/zpm__zero_point_module.snbt
+++ b/config/ftbquests/quests/chapters/zpm__zero_point_module.snbt
@@ -333,10 +333,9 @@
 			size: 0.75d
 			subtitle: "The final processing line, at last!"
 			tasks: [{
-				amount: 1000L
-				fluid: "gtceu:sterilized_growth_medium"
-				id: "090D7595FCB21B63"
-				type: "fluid"
+				id: "5FFC06116E025936"
+				item: "gtceu:sterilized_growth_medium_bucket"
+				type: "item"
 			}]
 			title: "Sterilized Growth Medium"
 			x: -0.375d