diff --git a/mods/granite.js b/mods/granite.js
deleted file mode 100644
index 6ac54008..00000000
--- a/mods/granite.js
+++ /dev/null
@@ -1,76 +0,0 @@
-elements.granite = {
-    color: ["#F3C3AD", "#F0AB75", "#DDA888", "#BD927E", "#998473", "#5C5E53", "#BD8366"],
-    behavior: behaviors.WALL,
-    category: "land",
-    tempHigh: 1215,
-    density: 2691,
-    hardness: 0.75,
-    breakInto: "granite_gravel",
-};
-
-elements.granite_gravel = {
-    color: ["#E3B39D", "#E09B65", "#CD9878", "#AD826E", "#897463", "#4C4E43", "#AD7356", "#F3C3AD", "#F0AB75", "#DDA888", "#BD927E", "#998473", "#5C5E53", "#BD8366", "#FFD3BD", "#FFBB85", "#EDB898", "#CDA28E", "#A99483", "#6C6E63", "#CD9376"],
-    behavior: behaviors.POWDER,
-    category: "land",
-    tempHigh: 1215,
-    stateHigh: "molten_granite",
-    density: 1320,
-};
-
-elements.molten_granite = {
-  "reactions": {
-    "magma": { "elem1": "molten_andesite", "elem2": "molten_andesite" },
-    "ash": { "elem1": null, "elem2": "molten_slag" },
-    "dust": { "elem1": null, "elem2": "molten_slag" },
-  },
-  "name": "granitic_magma",
-  "color": ["#FFF457", "#FF9257", "#FF9200", "#FFD63B", "#FFAB3B", "#FF8000", "#FFD244", "#FFA844", "#FF7E00", "#FFB73F", "#FF923F", "#FF6E00", "#FFA53A", "#FF843A", "#FF6300", "#B8762A", "#B85E2A", "#B84700", "#FFA433", "#FF8333", "#FF6200"],
-  "behavior": behaviors.MOLTEN,
-  "temp": 1215,
-  "tempLow": 1115,
-  "stateLow": "granite",
-  "viscosity": 10000,
-  "hidden": true,
-  "state": "liquid",
-  "category": "molten",
-  "density": 2421.9
-};
-
-elements.andesite = {
-    color: ["#6F7575", "#C5C9CB", "#818787", "#797F7F", "#B5B9BA", "#6D7371", "#909696"],
-    behavior: behaviors.WALL,
-    category: "land",
-    tempHigh: 1215,
-    density: 2474, //it varies very widely, so I made the last 2 digits up.
-    hardness: 0.75,
-    breakInto: "andesite_gravel",
-};
-
-elements.andesite_gravel = {
-    color: ['#5f6565', '#b5b9bb', '#717777', '#696f6f', '#a5a9aa', '#5d6361', '#808686', '#6f7575', '#c5c9cb', '#818787', '#797f7f', '#b5b9ba', '#6d7371', '#909696', '#7f8585', '#d5d9db', '#919797', '#898f8f', '#c5c9ca', '#7d8381', '#a0a6a6'],
-    behavior: behaviors.POWDER,
-    category: "land",
-    tempHigh: 1260,
-    stateHigh: "molten_andesite",
-    density: 1214, //approximated from granite values
-};
-
-elements.molten_andesite = {
-    "reactions": {
-        "ash": { "elem1": null, "elem2": "molten_slag" },
-        "dust": { "elem1": null, "elem2": "molten_slag" },
-    },
-    "name": "andesitic_magma",
-    "color": ["#de923b", "#de753b", "#de5800", "#fffb66", "#ffc966", "#ff9700", "#ffa944", "#ff8744", "#ff6500", "#f29f40", "#f27f40", "#f25f00", "#ffe75d", "#ffb95d", "#ff8b00", "#da9039", "#da7339", "#da5600", "#ffbc4b", "#ff964b", "#ff7100"],
-    "behavior": behaviors.MOLTEN,
-    "temp": 1215,
-    "tempLow": 1115,
-    "stateLow": "andesite",
-    "viscosity": 10000,
-    "hidden": true,
-    "state": "liquid",
-    "category": "molten",
-    "density": 2226.6
-}
-
-elements.magma.name = "basaltic_magma" //because it cools into basalt
diff --git a/mods/iean.js b/mods/iean.js
index ce1ddaa1..5a44e7f0 100644
--- a/mods/iean.js
+++ b/mods/iean.js
@@ -100,7 +100,7 @@ elements.cough_syrup = {
 }
 
 elements.lean = {
-    density: (3*1037+1200)*4, //https://www.quora.com/How-do-I-make-a-cup-of-lean-And-how-many-millilteres-of-cough-syrup-usually-goes-into-a-standard-cup-of-lean ignoring ice and other things
+    density: (3*1037+1200)/4, //https://www.quora.com/How-do-I-make-a-cup-of-lean-And-how-many-millilteres-of-cough-syrup-usually-goes-into-a-standard-cup-of-lean ignoring ice and other things
     viscosity: 4, //made up
     color: "#a527db",
     behavior: [
diff --git a/mods/igneous_rocks.js b/mods/igneous_rocks.js
new file mode 100644
index 00000000..d7b116bd
--- /dev/null
+++ b/mods/igneous_rocks.js
@@ -0,0 +1,299 @@
+/*
+TODO:
+porphyritic, vesicular, vitreous, fragmental rocks (if they exist, and i might make some up if they don't)
+other rocks that fit these categories??
+more density decrease steps
+sandstone, sedimentary and metamorphic rocks in general
+*/
+
+//Phaneritic
+
+    //Felsic: granite
+elements.granite = {
+    color: ["#F3C3AD", "#F0AB75", "#DDA888", "#BD927E", "#998473", "#5C5E53", "#BD8366"],
+    behavior: behaviors.WALL,
+    category: "land",
+    tempHigh: 1215,
+    stateHigh: "felsic_magma",
+    density: 2691,
+    hardness: 0.75,
+    breakInto: "granite_gravel",
+};
+
+elements.granite_gravel = {
+    color: ["#E3B39D", "#E09B65", "#CD9878", "#AD826E", "#897463", "#4C4E43", "#AD7356", "#F3C3AD", "#F0AB75", "#DDA888", "#BD927E", "#998473", "#5C5E53", "#BD8366", "#FFD3BD", "#FFBB85", "#EDB898", "#CDA28E", "#A99483", "#6C6E63", "#CD9376"],
+    behavior: behaviors.POWDER,
+    category: "land",
+    tempHigh: 1215,
+    stateHigh: "felsic_magma",
+    density: 1320,
+};
+
+elements.felsic_magma = {
+  "reactions": {
+    "magma": { "elem1": "intermediate_magma", "elem2": "intermediate_magma" },
+    "ash": { "elem1": null, "elem2": "molten_slag" },
+    "dust": { "elem1": null, "elem2": "molten_slag" },
+  },
+  "name": "felsic magma",
+  "color": ["#FFF457", "#FF9257", "#FF9200", "#FFD63B", "#FFAB3B", "#FF8000", "#FFD244", "#FFA844", "#FF7E00", "#FFB73F", "#FF923F", "#FF6E00", "#FFA53A", "#FF843A", "#FF6300", "#B8762A", "#B85E2A", "#B84700", "#FFA433", "#FF8333", "#FF6200"],
+  "behavior": behaviors.MOLTEN,
+  "temp": 1215,
+  "tempLow": 800,
+  "stateLow": ["rhyolite","rhyolite","rhyolite","granite"],
+  "viscosity": 100000000,
+  "hidden": true,
+  "state": "liquid",
+  "category": "molten",
+  "density": 2421.9
+};
+
+    //Intermediate felsic: granodiorite (such a creative name)
+elements.granodiorite = {
+    color: ["#B1AB9D", "#262001", "#A6A292", "#D6C5BC", "#F2F2F2", "#DED8C2", "#978871", "#A8AAA7"], //From image: By Rudolf Pohl - Own work, CC BY-SA 3.0, https://commons.wikimedia.org/w/index.php?curid=7788350
+    behavior: behaviors.WALL,
+    category: "land",
+    tempHigh: 1050, //poorly searchable term, little findable information, idk if accurate
+    stateHigh: "if_magma",
+    density: 2644, //last 2 digits made up again
+    hardness: 0.75,
+    breakInto: "granodiorite_gravel",
+};
+
+elements.granodiorite_gravel = {
+    color: ["#A19B8D", "#161000", "#969282", "#C6B5AC", "#E2E2E2", "#CEC8B2", "#877861", "#989A97", "#B1AB9D", "#262001", "#A6A292", "#D6C5BC", "#F2F2F2", "#DED8C2", "#978871", "#A8AAA7", "#C1BBAD", "#363011", "#B6B2A2", "#E6D5CC", "#FFFFFF", "#EEE8D2", "#A79881", "#B8BAB7"], //placeholder
+    behavior: behaviors.POWDER,
+    category: "land",
+    tempHigh: 1050,
+    stateHigh: "if_magma",
+    density: 1296,
+};
+
+elements.if_magma = {
+  "reactions": {
+    "magma": { "elem1": "intermediate_magma", "elem2": "intermediate_magma" },
+    "ash": { "elem1": null, "elem2": "molten_slag" },
+    "dust": { "elem1": null, "elem2": "molten_slag" },
+  },
+  "name": "intermediate felsic magma",
+  "color": ["#FFD64F", "#FFAB4F", "#FF8000", "#7C5831", "#7C5031", "#7C5830", "#FFCB49", "#FFA249", "#FF7A00", "#FFF65E", "#FFC55E", "#FF9400", "#FFFF79", "#FFF279", "#FFB600", "#FFFF61", "#FFD861", "#FFA200", "#FFAA39", "#FF8839", "#FF6600", "#FFD554", "#FFAA54", "#FF8000"],
+  "behavior": behaviors.MOLTEN,
+  "temp": 1200,
+  "tempLow": 1050,
+  "stateLow": ["dacite","dacite","dacite","granodiorite"],
+  "viscosity": 18700000, //10^average of logarithms
+  "hidden": true,
+  "state": "liquid",
+  "category": "molten",
+  "density": 2320, //averaged lower values
+};
+
+    //Intermediate: diorite
+elements.diorite = {
+    color: ["#E1E1E1","#B0A696","#707271","#434459","#242424"], //Extracted from image and blended
+    //By Michael C. Rygel - Own work, CC BY-SA 3.0, https://commons.wikimedia.org/w/index.php?curid=31124755
+    behavior: behaviors.WALL,
+    category: "land",
+    tempHigh: 1300,
+    stateHigh: "intermediate_magma",
+    density: 2822, //last 2 digits made up.
+    hardness: 0.70, //bs'd from MH rel to granite
+    breakInto: "diorite_gravel",
+};
+
+elements.diorite_gravel = {
+    color: ["#F1F1F1","#E1E1E1","#D1D1D1","#C0B6A6","#B0A696","#A09686","#808281","#707271","#606261","#535469","#434459","#333449","#343434","#242424","#141414"],
+    behavior: behaviors.POWDER,
+    category: "land",
+    tempHigh: 1260,
+    stateHigh: "intermediate_magma",
+    density: 1717, //approximated from granite values
+};
+
+elements.intermediate_magma = {
+    "reactions": {
+        "ash": { "elem1": null, "elem2": "molten_slag" },
+        "dust": { "elem1": null, "elem2": "molten_slag" },
+    },
+    "name": "intermediate magma",
+    "color": ["#FFFF70", "#FFE170", "#FFA800", "#FFCF4B", "#FFA64B", "#FF7C00", "#E08E38", "#E07238", "#E05500", "#86552C", "#86442C", "#863300", "#482D12", "#482412", "#481B00"],
+    "behavior": behaviors.MOLTEN,
+    "temp": 1215,
+    "tempLow": 1115,
+    "stateLow": ["andesite", "andesite", "andesite", "diorite"],
+    "viscosity": 350000,
+    "hidden": true,
+    "state": "liquid",
+    "category": "molten",
+    "density": 2450,
+}
+
+    //Mafic: gabbro
+elements.magma.name = "mafic magma" //because it cools into basalt
+//the vanilla viscosity checks out
+elements.rock.name = "gabbro" //based on it melting into mostly basalt, I am assuming that this is mafic magma cooling quickly, and thus assuming that the remainder is magma cooling more slowly into a phaneritic rock, and that woudld be gabbro
+elements.magma.density = 2650
+
+    //Ultramafic: peridotite
+elements.peridotite = {
+    color: ["#908557","#A29E78","#7F8044","#C6BC87","#8C8656","#7C7C40","#837840","#8B8B69"],
+    behavior: behaviors.WALL,
+    category: "land",
+    tempHigh: 1400,
+    stateHigh: "ultramafic_magma",
+    density: 3347, //appr from https://agupubs.onlinelibrary.wiley.com/doi/abs/10.1029/GL003i009p00509#:~:text=Abstract,and%20the%20bulk%20rock%20analyses.
+    hardness: 0.76,
+    breakInto: "peridotite_gravel",
+};
+
+elements.peridotite_gravel = {
+    color: ["#807547","#928e68","#6f7034","#b6ac77","#7c7646","#6c6c30","#736830","#7b7b59","#908557","#a29e78","#7f8044","#c6bc87","#8c8656","#7c7c40","#837840","#8b8b69","#a09567","#b2ae88","#8f9054","#d6cc97","#9c9666","#8c8c50","#938850","#9b9b79"],
+    behavior: behaviors.POWDER,
+    category: "land",
+    tempHigh: 1400,
+    stateHigh: "ultramafic_magma",
+    density: 1681,
+};
+
+elements.ultramafic_magma = {
+  "reactions": {
+    "ash": { "elem1": null, "elem2": "molten_slag" },
+    "dust": { "elem1": null, "elem2": "molten_slag" },
+  },
+  "name": "ultramafic magma",
+  "color": ["#ffa62b","#ff852b","#ff6300","#ffc53c","#ff9e3c","#ff7600","#fea022","#fe8022","#fe6000","#ffeb43","#ffbc43","#ff8d00","#ffa72b","#ff862b","#ff6400","#f89b20","#f87c20","#f85d00","#ff9620","#ff7820","#ff5a00","#ffad34","#ff8b34","#ff6800"],
+  "behavior": behaviors.MOLTEN,
+  "temp": 1500,
+  "tempLow": 1390,
+  "stateLow": ["peridotite","komatiite","komatiite","komatiite"],
+  "viscosity": 100,
+  "hidden": true,
+  "state": "liquid",
+  "category": "molten",
+  "density": 2800
+};
+
+//Aphanitic
+
+    //Felsic: rhyolite
+elements.rhyolite = {
+    color: ["#A67153","#BF967E","#D9B5A0","#8C533E","#C99F86","#C5997E","#BB8A69"],
+    // also from one of Michael C. Rygel's images
+    behavior: behaviors.WALL,
+    category: "land",
+    tempHigh: 800,
+    stateHigh: "felsic_magma",
+    density: 2555, //very wide range
+    hardness: 0.75,
+    breakInto: "rhyolite_gravel",
+};
+
+elements.rhyolite_gravel = {
+    color: ["#B68163","#A67153","#966143","#CFA68E","#BF967E","#AF866E","#E9C5B0","#D9B5A0","#C9A590","#9C634E","#8C533E","#7C432E","#D9AF96","#C99F86","#B98F76","#D5A98E","#C5997E","#B5896E","#CB9A79","#BB8A69","#DB7A59"],
+    behavior: behaviors.POWDER,
+    category: "land",
+    tempHigh: 800,
+    stateHigh: "felsic_magma",
+    density: 1254, //approximated from granite values
+};
+
+    //Intermediate felsic: dacite
+elements.dacite = {
+    color: ["#D9CCC5", "#F2E9E4", "#877670", "#A69B97"],
+    behavior: behaviors.WALL,
+    category: "land",
+    tempHigh: 1050,
+    stateHigh: "if_magma",
+    density: 2654, //https://books.google.ca/books?id=ObUPAAAAIAAJ&pg=PA181&lpg=PA181&dq=dacite+specific+gravity&source=bl&ots=qn8B4sirWi&sig=Wp_MHqPuUGPNQobcuNP5c5wqkpU&hl=en&sa=X&ei=cimtUaH8Eab7yAH8joDABQ#v=onepage&q=dacite%20specific%20gravity&f=false
+    hardness: 0.75,
+    breakInto: "dacite_gravel",
+};
+
+elements.dacite_gravel = {
+    color: ["#C9BCB5", "#E2D9D4", "#776660", "#968B87", "#D9CCC5", "#F2E9E4", "#877670", "#A69B97", "#E9DCD5", "#FFF9F4", "#978680", "#B6ABA7"], //placeholder
+    behavior: behaviors.POWDER,
+    category: "land",
+    tempHigh: 1050,
+    stateHigh: "if_magma",
+    density: 1300,
+};
+
+    //Intermediate: andesite
+elements.andesite = {
+    color: ["#6F7575", "#C5C9CB", "#818787", "#797F7F", "#B5B9BA", "#6D7371", "#909696"],
+    behavior: behaviors.WALL,
+    category: "land",
+    tempHigh: 1215,
+    stateHigh: "intermediate_magma",
+    density: 2474, //it varies very widely, so I made the last 2 digits up.
+    hardness: 0.75,
+    breakInto: "andesite_gravel",
+};
+
+elements.andesite_gravel = {
+    color: ['#5f6565', '#b5b9bb', '#717777', '#696f6f', '#a5a9aa', '#5d6361', '#808686', '#6f7575', '#c5c9cb', '#818787', '#797f7f', '#b5b9ba', '#6d7371', '#909696', '#7f8585', '#d5d9db', '#919797', '#898f8f', '#c5c9ca', '#7d8381', '#a0a6a6'],
+    behavior: behaviors.POWDER,
+    category: "land",
+    tempHigh: 1260,
+    stateHigh: "intermediate_magma",
+    density: 1214, //approximated from granite values
+};
+
+    //Mafic: basalt
+//No changes from vanilla
+
+    //Ultramafic: komatiite
+elements.komatiite = {
+    color: ["#AEB5AE","#A9B8B5","#7B8881","#858B87","#949F97","#505B55"],
+    behavior: behaviors.WALL,
+    category: "land",
+    tempHigh: 1600,
+    stateHigh: "ultramafic_magma",
+    density: 3100, //approximate density extrapolated from intermediate and mafic density
+    //the magma's density is more well-known but there's nothing on the solid rock
+    hardness: 0.75,
+    breakInto: "komatiite_gravel",
+};
+
+elements.komatiite_gravel = {
+    color: ["#9ea59e","#99a8a5","#6b7871","#757b77","#848f87","#404b45","#aeb5ae","#a9b8b5","#7b8881","#858b87","#949f97","#505b55","#bec5be","#b9c8c5","#8b9891","#959b97","#a4afa7","#606b65"],
+    behavior: behaviors.POWDER,
+    category: "land",
+    tempHigh: 1600,
+    stateHigh: "ultramafic_magma",
+    density: 1650, //approximated from granite values
+};
+
+//Vesicular
+
+    //Felsic: pumice
+//Pumice
+
+    //Intermediate felsic: ???
+//???
+
+//Intermediate: scoria
+//Scoria
+
+    //Mafic: still scoria
+//Also scoria
+
+    //Ultramafic: ???
+//???
+
+//Glassy
+
+    //Felsic: obsidian
+//Obsidian
+
+    //Intermediate felsic: ???
+//???
+
+     //Intermediate: ???
+//???
+
+    //Mafic: ???
+//???
+
+    //Ultramafic: ???
+//???
diff --git a/mods/random_liquids.js b/mods/random_liquids.js
index cbc813ed..0d813d89 100644
--- a/mods/random_liquids.js
+++ b/mods/random_liquids.js
@@ -116,11 +116,11 @@ function _rgbToHex(color) {
         //console.log("Splitting string")
         color = color.split(",");
         //console.log("Getting R");
-        var red = parseInt(color[0].substring(4))
+        var red = parseFloat(color[0].substring(4))
         //console.log("Getting G");
-        var green = parseInt(color[1])
+        var green = parseFloat(color[1])
         //console.log("Getting B");
-        var blue = parseInt(color[2].slice(0,-1)) 
+        var blue = parseFloat(color[2].slice(0,-1)) 
         //console.log("Rounding R");
         red = Math.round(red);
         //console.log("Rounding G");
diff --git a/mods/random_rocks.js b/mods/random_rocks.js
index a16ca4d3..b62aaba7 100644
--- a/mods/random_rocks.js
+++ b/mods/random_rocks.js
@@ -117,15 +117,15 @@ function _rgbToHex(color) {
         };
         //console.log("Concatenating");
         return "#" + red + green + blue;
-    } else if(typeof(color) == "string") { //Expects string like "rgb(20,137,4)". Also doesn't round properly for some reason...
+    } else if(typeof(color) == "string") { //Expects string like "rgb(20,137,4)".
         //console.log("Splitting string")
         color = color.split(",");
         //console.log("Getting R");
-        var red = parseInt(color[0].substring(4))
+        var red = parseFloat(color[0].substring(4))
         //console.log("Getting G");
-        var green = parseInt(color[1])
+        var green = parseFloat(color[1])
         //console.log("Getting B");
-        var blue = parseInt(color[2].slice(0,-1)) 
+        var blue = parseFloat(color[2].slice(0,-1)) 
         //console.log("Rounding R");
         red = Math.round(red);
         //console.log("Rounding G");
diff --git a/mods/randomness.js b/mods/randomness.js
index deea1cff..bc02149f 100644
--- a/mods/randomness.js
+++ b/mods/randomness.js
@@ -1,4 +1,4 @@
-//lily made some stupid things
+//i made some stupid things
 
 //TPT reference
 elements.warp = {
@@ -849,13 +849,13 @@ elements.rainbow_magma = {
     behavior: behaviors.MOLTEN,
     temp: 1300,
     tempLow: 1271,
-    stateLow: ["rainbow_stone_2", "rainbow_stone_2", "rainbow_stone_2", "rainbow_stone_2", "rainbow_stone"],
+    stateLow: ["rainbow_stone_2", "rainbow_stone_2", "rainbow_stone"],
     category: "liquids",
     state: "solid",
     density: 2562,
     hardness: 0.7,
     breakInto: "rainbow_magma",
-    viscosity: 11000,
+    viscosity: 3452400,
 };
 
 elements.rainbow_stone_2 = {