diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0da798c4f4..5b321e64f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Allowed collecting nearby blocks without aiming at them
 - Made voxygen wait until singleplayer server is initialized before attempting to connect, removing the chance for it to give up on connecting if the server takes a while to start
 - Log where userdata folder is located
+- Switched to a Whittaker map for better tree spawning patterns
+- Switched to procedural snow cover on trees
+- Significantly improved terrain generation performance
 
 ### Removed
 
diff --git a/assets/voxygen/element/map/dungeon.png b/assets/voxygen/element/map/dungeon.png
new file mode 100644
index 0000000000..b4a78b954a
Binary files /dev/null and b/assets/voxygen/element/map/dungeon.png differ
diff --git a/assets/voxygen/element/map/town.png b/assets/voxygen/element/map/town.png
new file mode 100644
index 0000000000..a20bdf9fd0
Binary files /dev/null and b/assets/voxygen/element/map/town.png differ
diff --git a/assets/world/manifests/snow_pines.ron b/assets/world/manifests/snow_pines.ron
deleted file mode 100644
index a70cdad690..0000000000
--- a/assets/world/manifests/snow_pines.ron
+++ /dev/null
@@ -1,36 +0,0 @@
-#![enable(unwrap_newtypes)]
-
-[
-    (
-        specifier: "world.tree.snow_pine.1",
-        center: (15, 15, 14)
-    ),
-    (
-        specifier: "world.tree.snow_pine.2",
-        center: (15, 15, 14)
-    ),
-    (
-        specifier: "world.tree.snow_pine.3",
-        center: (17, 15, 12)
-    ),
-    (
-        specifier: "world.tree.snow_pine.4",
-        center: (10, 8, 12)
-    ),
-    (
-        specifier: "world.tree.snow_pine.5",
-        center: (12, 12, 12)
-    ),
-    (
-        specifier: "world.tree.snow_pine.6",
-        center: (11, 10, 12)
-    ),
-    (
-        specifier: "world.tree.snow_pine.7",
-        center: (16, 15, 12)
-    ),
-    (
-        specifier: "world.tree.snow_pine.8",
-        center: (12, 10, 12)
-    ),
-]
diff --git a/assets/world/tree/snow_pine/1.vox b/assets/world/tree/snow_pine/1.vox
deleted file mode 100644
index 67057c11f5..0000000000
Binary files a/assets/world/tree/snow_pine/1.vox and /dev/null differ
diff --git a/assets/world/tree/snow_pine/2.vox b/assets/world/tree/snow_pine/2.vox
deleted file mode 100644
index 12d259ef95..0000000000
Binary files a/assets/world/tree/snow_pine/2.vox and /dev/null differ
diff --git a/assets/world/tree/snow_pine/3.vox b/assets/world/tree/snow_pine/3.vox
deleted file mode 100644
index bbda6299d8..0000000000
Binary files a/assets/world/tree/snow_pine/3.vox and /dev/null differ
diff --git a/assets/world/tree/snow_pine/4.vox b/assets/world/tree/snow_pine/4.vox
deleted file mode 100644
index 51a06177b9..0000000000
Binary files a/assets/world/tree/snow_pine/4.vox and /dev/null differ
diff --git a/assets/world/tree/snow_pine/5.vox b/assets/world/tree/snow_pine/5.vox
deleted file mode 100644
index 4fe9caa970..0000000000
Binary files a/assets/world/tree/snow_pine/5.vox and /dev/null differ
diff --git a/assets/world/tree/snow_pine/6.vox b/assets/world/tree/snow_pine/6.vox
deleted file mode 100644
index e69378345f..0000000000
Binary files a/assets/world/tree/snow_pine/6.vox and /dev/null differ
diff --git a/assets/world/tree/snow_pine/7.vox b/assets/world/tree/snow_pine/7.vox
deleted file mode 100644
index 427b9646e3..0000000000
Binary files a/assets/world/tree/snow_pine/7.vox and /dev/null differ
diff --git a/assets/world/tree/snow_pine/8.vox b/assets/world/tree/snow_pine/8.vox
deleted file mode 100644
index b2144f2528..0000000000
Binary files a/assets/world/tree/snow_pine/8.vox and /dev/null differ
diff --git a/world/src/layer/tree.rs b/world/src/layer/tree.rs
index 2cba78e938..1ff70b4815 100644
--- a/world/src/layer/tree.rs
+++ b/world/src/layer/tree.rs
@@ -18,7 +18,6 @@ lazy_static! {
     pub static ref OAK_STUMPS: Vec<Arc<Structure>> = Structure::load_group("oak_stumps");
     pub static ref PINES: Vec<Arc<Structure>> = Structure::load_group("pines");
     pub static ref PALMS: Vec<Arc<Structure>> = Structure::load_group("palms");
-    // pub static ref SNOW_PINES: Vec<Arc<Structure>> = Structure::load_group("snow_pines");
     pub static ref ACACIAS: Vec<Arc<Structure>> = Structure::load_group("acacias");
     pub static ref FRUIT_TREES: Vec<Arc<Structure>> = Structure::load_group("fruit_trees");
     pub static ref BIRCHES: Vec<Arc<Structure>> = Structure::load_group("birch");
@@ -70,14 +69,17 @@ pub fn apply_trees_to(canvas: &mut Canvas) {
                             }
                         } else {
                             match col.forest_kind {
-                                ForestKind::Palm => &PALMS,
-                                ForestKind::Savannah => &ACACIAS,
                                 ForestKind::Oak if QUIRKY_RAND.get(seed) % 16 == 7 => &OAK_STUMPS,
                                 ForestKind::Oak if QUIRKY_RAND.get(seed) % 19 == 7 => &FRUIT_TREES,
-                                ForestKind::Oak if QUIRKY_RAND.get(seed) % 14 == 7 => &BIRCHES,
+                                ForestKind::Oak | ForestKind::Pine
+                                    if QUIRKY_RAND.get(seed) % 14 == 7 =>
+                                {
+                                    &BIRCHES
+                                },
+                                ForestKind::Palm => &PALMS,
+                                ForestKind::Savannah => &ACACIAS,
                                 ForestKind::Oak => &OAKS,
                                 ForestKind::Pine => &PINES,
-                                // ForestKind::SnowPine => &SNOW_PINES,
                                 ForestKind::Mangrove => &MANGROVE_TREES,
                             }
                         };