diff --git a/mods/spouts.js b/mods/spouts.js
index 8175a271..21581ace 100644
--- a/mods/spouts.js
+++ b/mods/spouts.js
@@ -1,58 +1,68 @@
-urlParams = new URLSearchParams(window.location.search);
+var modName = "mods/spouts.js";
+var runAfterAutogenMod = "mods/runAfterAutogen and onload restructure.js";
 
-if(urlParams.get('spoutIncludeRandom') !== null) { //if the variable exists at all
-    spoutIncludeRandom = true
-} else { //if it doesn't (and it returns null)
-    spoutIncludeRandom = false
-}
+if(enabledMods.includes(runAfterAutogenMod)) {
+	urlParams = new URLSearchParams(window.location.search);
 
-function _randomInt(max) {
-    if(max >= 0) {
-        return Math.floor(Math.random() * (max + 1))
-    } else {
-        return 0 - Math.floor(Math.random() * (Math.abs(max) + 1))
-    }
-}
+	if(urlParams.get('spoutIncludeRandom') !== null) { //if the variable exists at all
+		spoutIncludeRandom = true
+	} else { //if it doesn't (and it returns null)
+		spoutIncludeRandom = false
+	}
 
-excludedSpoutElements = ["ketchup", "liquid_cloner", "fire_cloner"]
-includedSpouts = ["ketchup_spout", "spout", "udder", "torch", "sun"]
-
-runAfterLoad(function() {
-    liquidArray = Object.keys(elements).filter(function(e) {
-        return (elements[e].state == "liquid" || elements[e].state == "gas" || elements[e].movable) && !excludedSpoutElements.includes(elements[e]);
-    });
-    for(i = 0; i < liquidArray.length; i++) {
-        elements[`${liquidArray[i]}_spout`] = {
-            color: elements[liquidArray[i]].color,
-            behavior: [
-                `XX|CR:${liquidArray[i]}|XX`,
-                `CR:${liquidArray[i]}|XX|CR:${liquidArray[i]}`,
-                `XX|CR:${liquidArray[i]}|XX`,
-            ],
-            category: "spouts",
-            temp: elements[liquidArray[i]].temp,
-            hardness: 1,
-        };
-        if(spoutIncludeRandom) {
-			elements[liquidArray[i]].excludeRandom ? elements[`${liquidArray[i]}_spout`].excludeRandom = true : elements[`${liquidArray[i]}_spout`].excludeRandom = false;
+	function _randomInt(max) {
+		if(max >= 0) {
+			return Math.floor(Math.random() * (max + 1))
 		} else {
-			elements[`${liquidArray[i]}_spout`].excludeRandom = true;
-		};
-	};
-	spoutChoices = Object.keys(elements).filter(function(e) {
-		return elements[e].category == "spouts" || includedSpouts.includes(elements[e]);
-	});
-	spoutChoices = spoutChoices.filter(function(e) {
-		return !elements[e.slice(0,-6)].excludeRandom;
-	});
-});
+			return 0 - Math.floor(Math.random() * (Math.abs(max) + 1))
+		}
+	}
 
-elements.random_spout = {
-	color: ["#3e5f8a","#a334ec","#ea96f9","#a6ecf6","#70ebc8","#d9286b","#7eed91","#a18b30"],
-	behavior: behaviors.WALL,
-	category: "special",
-	excludeRandom: true,
-	tick: function(pixel) {
-		changePixel(pixel,spoutChoices[Math.floor(Math.random() * spoutChoices.length)])
-	},
+	excludedSpoutElements = ["ketchup", "liquid_cloner", "fire_cloner"]
+	includedSpouts = ["ketchup_spout", "spout", "udder", "torch", "sun"]
+
+	runAfterAutogen(function() {
+		liquidArray = Object.keys(elements).filter(function(e) {
+			return (elements[e].state == "liquid" || elements[e].state == "gas" || elements[e].movable) && !excludedSpoutElements.includes(elements[e]);
+		});
+		for(i = 0; i < liquidArray.length; i++) {
+			elements[`${liquidArray[i]}_spout`] = {
+				color: elements[liquidArray[i]].color,
+				colorObject: elements[liquidArray[i]].colorObject,
+				behavior: [
+					["XX",`CR:${liquidArray[i]}`,"XX"],
+					[`CR:${liquidArray[i]}`,"XX",`CR:${liquidArray[i]}`],
+					["XX",`CR:${liquidArray[i]}`,"XX"]
+				],
+				category: "spouts",
+				temp: elements[liquidArray[i]].temp,
+				hardness: 1,
+			};
+			if(spoutIncludeRandom) {
+				elements[liquidArray[i]].excludeRandom ? elements[`${liquidArray[i]}_spout`].excludeRandom = true : elements[`${liquidArray[i]}_spout`].excludeRandom = false;
+			} else {
+				elements[`${liquidArray[i]}_spout`].excludeRandom = true;
+			};
+		};
+		spoutChoices = Object.keys(elements).filter(function(e) {
+			return elements[e].category == "spouts" || includedSpouts.includes(elements[e]);
+		});
+		spoutChoices = spoutChoices.filter(function(e) {
+			return !elements[e.slice(0,-6)].excludeRandom;
+		});
+	});
+
+	elements.random_spout = {
+		color: ["#3e5f8a","#a334ec","#ea96f9","#a6ecf6","#70ebc8","#d9286b","#7eed91","#a18b30"],
+		behavior: behaviors.WALL,
+		category: "special",
+		excludeRandom: true,
+		tick: function(pixel) {
+			changePixel(pixel,spoutChoices[Math.floor(Math.random() * spoutChoices.length)])
+		},
+	};
+} else {
+	alert(`The ${runAfterAutogenMod} mod is required and has been automatically inserted (reload for this to take effect).`)
+	enabledMods.splice(enabledMods.indexOf(modName),0,runAfterAutogenMod)
+	localStorage.setItem("enabledMods", JSON.stringify(enabledMods));
 };