diff --git a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java
index 0998e030f..b4d9b13cc 100644
--- a/src/minecraft/biomesoplenty/configuration/BOPBiomes.java
+++ b/src/minecraft/biomesoplenty/configuration/BOPBiomes.java
@@ -113,74 +113,75 @@ public class BOPBiomes {
 		//Initialize new world type
 		WTBiomesOP = new WTBiomesOP();
 		
-		//biome dictionary
-		BiomeDictionary.registerBiomeType(Biomes.alps.get(), Type.FROZEN);
-		BiomeDictionary.registerBiomeType(Biomes.arctic.get(), Type.FROZEN);
-		BiomeDictionary.registerBiomeType(Biomes.badlands.get(), Type.DESERT);
+		//Biome Dictionary
+		BiomeDictionary.registerBiomeType(Biomes.alps.get(), Type.FROZEN, Type.MOUNTAIN);
+		BiomeDictionary.registerBiomeType(Biomes.arctic.get(), Type.FROZEN, Type.FOREST, Type.HILLS);
+		BiomeDictionary.registerBiomeType(Biomes.badlands.get(), Type.DESERT, Type.WASTELAND);
 		BiomeDictionary.registerBiomeType(Biomes.bambooForest.get(), Type.JUNGLE);
 		BiomeDictionary.registerBiomeType(Biomes.bayou.get(), Type.SWAMP);
 		BiomeDictionary.registerBiomeType(Biomes.birchForest.get(), Type.FOREST);
 		BiomeDictionary.registerBiomeType(Biomes.bog.get(), Type.SWAMP);
 		BiomeDictionary.registerBiomeType(Biomes.borealForest.get(), Type.FOREST);
-		BiomeDictionary.registerBiomeType(Biomes.canyon.get(), Type.DESERT);
+		BiomeDictionary.registerBiomeType(Biomes.canyon.get(), Type.DESERT, Type.MOUNTAIN, Type.HILLS);
 		BiomeDictionary.registerBiomeType(Biomes.chaparral.get(), Type.PLAINS);
-		BiomeDictionary.registerBiomeType(Biomes.cherryBlossomGrove.get(), Type.MAGICAL);
-		BiomeDictionary.registerBiomeType(Biomes.coniferousForest.get(), Type.FOREST);
-		BiomeDictionary.registerBiomeType(Biomes.crag.get(), Type.WASTELAND);
-		BiomeDictionary.registerBiomeType(Biomes.deadForest.get(), Type.WASTELAND);
-		BiomeDictionary.registerBiomeType(Biomes.deadlands.get(), Type.WASTELAND);
+		BiomeDictionary.registerBiomeType(Biomes.cherryBlossomGrove.get(), Type.MAGICAL, Type.FOREST);
+		BiomeDictionary.registerBiomeType(Biomes.coniferousForest.get(), Type.FOREST, Type.HILLS);
+		BiomeDictionary.registerBiomeType(Biomes.crag.get(), Type.WASTELAND, Type.MOUNTAIN);
+		BiomeDictionary.registerBiomeType(Biomes.deadForest.get(), Type.WASTELAND, Type.FOREST);
+		BiomeDictionary.registerBiomeType(Biomes.deadlands.get(), Type.WASTELAND, Type.NETHER);
 		BiomeDictionary.registerBiomeType(Biomes.deadSwamp.get(), Type.SWAMP);
-		BiomeDictionary.registerBiomeType(Biomes.deciduousForest.get(), Type.FOREST);
+		BiomeDictionary.registerBiomeType(Biomes.deciduousForest.get(), Type.FOREST, Type.HILLS);
 		BiomeDictionary.registerBiomeType(Biomes.drylands.get(), Type.DESERT);
-		BiomeDictionary.registerBiomeType(Biomes.dunes.get(), Type.BEACH);
-		BiomeDictionary.registerBiomeType(Biomes.fen.get(), Type.FOREST);
+		BiomeDictionary.registerBiomeType(Biomes.dunes.get(), Type.BEACH, Type.DESERT);
+		BiomeDictionary.registerBiomeType(Biomes.fen.get(), Type.FOREST, Type.SWAMP);
 		BiomeDictionary.registerBiomeType(Biomes.field.get(), Type.PLAINS);
-		BiomeDictionary.registerBiomeType(Biomes.frostForest.get(), Type.FROZEN);
-		BiomeDictionary.registerBiomeType(Biomes.fungiForest.get(), Type.MAGICAL);
-		BiomeDictionary.registerBiomeType(Biomes.garden.get(), Type.MAGICAL);
-		BiomeDictionary.registerBiomeType(Biomes.glacier.get(), Type.FROZEN);
+		BiomeDictionary.registerBiomeType(Biomes.frostForest.get(), Type.FROZEN, Type.FOREST);
+		BiomeDictionary.registerBiomeType(Biomes.fungiForest.get(), Type.MAGICAL, Type.MUSHROOM, Type.FOREST, Type.SWAMP);
+		BiomeDictionary.registerBiomeType(Biomes.garden.get(), Type.MAGICAL, Type.PLAINS);
+		BiomeDictionary.registerBiomeType(Biomes.glacier.get(), Type.FROZEN, Type.HILLS);
 		BiomeDictionary.registerBiomeType(Biomes.grassland.get(), Type.PLAINS);
 		BiomeDictionary.registerBiomeType(Biomes.grove.get(), Type.FOREST);
 		BiomeDictionary.registerBiomeType(Biomes.heathland.get(), Type.PLAINS);
 		BiomeDictionary.registerBiomeType(Biomes.highland.get(), Type.HILLS, Type.MOUNTAIN);
-		BiomeDictionary.registerBiomeType(Biomes.iceSheet.get(), Type.FROZEN);
-		BiomeDictionary.registerBiomeType(Biomes.icyHills.get(), Type.FROZEN);
+		BiomeDictionary.registerBiomeType(Biomes.iceSheet.get(), Type.FROZEN, Type.WASTELAND);
+		BiomeDictionary.registerBiomeType(Biomes.icyHills.get(), Type.FROZEN, Type.HILLS);
 		BiomeDictionary.registerBiomeType(Biomes.jadeCliffs.get(), Type.FOREST, Type.MOUNTAIN);
-		BiomeDictionary.registerBiomeType(Biomes.lushDesert.get(), Type.DESERT);
+		BiomeDictionary.registerBiomeType(Biomes.lushDesert.get(), Type.DESERT, Type.PLAINS);
 		BiomeDictionary.registerBiomeType(Biomes.lushSwamp.get(), Type.SWAMP);
 		BiomeDictionary.registerBiomeType(Biomes.mangrove.get(), Type.WATER);
 		BiomeDictionary.registerBiomeType(Biomes.mapleWoods.get(), Type.FOREST);
-		BiomeDictionary.registerBiomeType(Biomes.marsh.get(), Type.SWAMP);
-		BiomeDictionary.registerBiomeType(Biomes.meadow.get(), Type.FOREST);
-		BiomeDictionary.registerBiomeType(Biomes.mesa.get(), Type.DESERT);
-		BiomeDictionary.registerBiomeType(Biomes.moor.get(), Type.PLAINS);
+		BiomeDictionary.registerBiomeType(Biomes.marsh.get(), Type.SWAMP, Type.WATER);
+		BiomeDictionary.registerBiomeType(Biomes.meadow.get(), Type.FOREST, Type.PLAINS);
+		BiomeDictionary.registerBiomeType(Biomes.mesa.get(), Type.DESERT, Type.WASTELAND);
+		BiomeDictionary.registerBiomeType(Biomes.moor.get(), Type.PLAINS, Type.HILLS);
 		BiomeDictionary.registerBiomeType(Biomes.mountain.get(), Type.MOUNTAIN, Type.HILLS);
-		BiomeDictionary.registerBiomeType(Biomes.mysticGrove.get(), Type.MAGICAL);
-		BiomeDictionary.registerBiomeType(Biomes.oasis.get(), Type.DESERT);
-		BiomeDictionary.registerBiomeType(Biomes.ominousWoods.get(), Type.NETHER);
-		BiomeDictionary.registerBiomeType(Biomes.orchard.get(), Type.FOREST);
-		BiomeDictionary.registerBiomeType(Biomes.outback.get(), Type.DESERT);
+		BiomeDictionary.registerBiomeType(Biomes.mysticGrove.get(), Type.MAGICAL, Type.FOREST);
+		BiomeDictionary.registerBiomeType(Biomes.oasis.get(), Type.DESERT, Type.PLAINS);
+		BiomeDictionary.registerBiomeType(Biomes.ominousWoods.get(), Type.NETHER, Type.MAGICAL);
+		BiomeDictionary.registerBiomeType(Biomes.orchard.get(), Type.FOREST, Type.PLAINS);
+		BiomeDictionary.registerBiomeType(Biomes.outback.get(), Type.DESERT, Type.PLAINS);
 		BiomeDictionary.registerBiomeType(Biomes.pasture.get(), Type.PLAINS);
 		BiomeDictionary.registerBiomeType(Biomes.prairie.get(), Type.PLAINS);
-		BiomeDictionary.registerBiomeType(Biomes.promisedLand.get(), Type.WASTELAND);
+		BiomeDictionary.registerBiomeType(Biomes.promisedLand.get(), Type.FOREST, Type.MAGICAL);
 		BiomeDictionary.registerBiomeType(Biomes.quagmire.get(), Type.WASTELAND);
-		BiomeDictionary.registerBiomeType(Biomes.rainforest.get(), Type.JUNGLE);
+		BiomeDictionary.registerBiomeType(Biomes.rainforest.get(), Type.JUNGLE, Type.HILLS, Type.FOREST);
 		BiomeDictionary.registerBiomeType(Biomes.redwoodForest.get(), Type.FOREST);
+		BiomeDictionary.registerBiomeType(Biomes.sacredSprings.get(), Type.MOUNTAIN, Type.FOREST);
 		BiomeDictionary.registerBiomeType(Biomes.savanna.get(), Type.DESERT);
-		BiomeDictionary.registerBiomeType(Biomes.sacredSprings.get(), Type.DESERT);
-		BiomeDictionary.registerBiomeType(Biomes.scrubland.get(), Type.DESERT);
+		BiomeDictionary.registerBiomeType(Biomes.scrubland.get(), Type.DESERT, Type.PLAINS);
 		BiomeDictionary.registerBiomeType(Biomes.seasonalForest.get(), Type.FOREST);
 		BiomeDictionary.registerBiomeType(Biomes.shield.get(), Type.FOREST);
 		BiomeDictionary.registerBiomeType(Biomes.shrubland.get(), Type.PLAINS);
 		BiomeDictionary.registerBiomeType(Biomes.snowyWoods.get(), Type.FROZEN);
 		BiomeDictionary.registerBiomeType(Biomes.spruceWoods.get(), Type.FOREST);
-		BiomeDictionary.registerBiomeType(Biomes.swampwoods.get(), Type.SWAMP);
-		BiomeDictionary.registerBiomeType(Biomes.temperateRainforest.get(), Type.FOREST);
-		BiomeDictionary.registerBiomeType(Biomes.thicket.get(), Type.PLAINS);
+		BiomeDictionary.registerBiomeType(Biomes.steppe.get(), Type.PLAINS, Type.WASTELAND);
+		BiomeDictionary.registerBiomeType(Biomes.swampwoods.get(), Type.SWAMP, Type.FOREST);
+		BiomeDictionary.registerBiomeType(Biomes.temperateRainforest.get(), Type.FOREST, Type.HILLS);
+		BiomeDictionary.registerBiomeType(Biomes.thicket.get(), Type.PLAINS, Type.FOREST);
 		BiomeDictionary.registerBiomeType(Biomes.tropicalRainforest.get(), Type.JUNGLE);
 		BiomeDictionary.registerBiomeType(Biomes.tropics.get(), Type.JUNGLE);
 		BiomeDictionary.registerBiomeType(Biomes.tundra.get(), Type.FROZEN);
-		BiomeDictionary.registerBiomeType(Biomes.volcano.get(), Type.WASTELAND);
+		BiomeDictionary.registerBiomeType(Biomes.volcano.get(), Type.WASTELAND, Type.MOUNTAIN, Type.NETHER);
 		BiomeDictionary.registerBiomeType(Biomes.wasteland.get(), Type.WASTELAND);
 		BiomeDictionary.registerBiomeType(Biomes.wetland.get(), Type.SWAMP);
 		BiomeDictionary.registerBiomeType(Biomes.woodland.get(), Type.FOREST);